fix: changing styling, layering and size of settingPanelCanvasUITK UI elements; fixing naming and button execution in scripts

Elfi0Kuhndorf · Elfi0Kuhndorf · commit 1e011733a8e4 · 2025-02-21T14:48:33.000+01:00
diff --git a/Assets/Prefabs/UI/UIToolkit/SettingsPanelCanvasUITK.prefab b/Assets/Prefabs/UI/UIToolkit/SettingsPanelCanvasUITK.prefab
@@ -49,7 +49,7 @@ MonoBehaviour:
   m_PanelSettings: {fileID: 11400000, guid: 30704bc49d34869449e8bfdb3ab57841, type: 2}
   m_ParentUI: {fileID: 0}
   sourceAsset: {fileID: 9197481963319205126, guid: b3d4e0fc4dc0779409b489ef4872ba77, type: 3}
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_WorldSpaceSizeMode: 1
   m_WorldSpaceWidth: 1920
   m_WorldSpaceHeight: 1080
diff --git a/Assets/Prefabs/UI/UIToolkit/USS/GeneralUI.uss b/Assets/Prefabs/UI/UIToolkit/USS/GeneralUI.uss
@@ -48,10 +48,26 @@
     border-left-width: 0;
     width: 408px;
     height: 90px;
+    -unity-text-align: middle-center;
 }
 
 .menuButton:active {
     -unity-font-definition: url("project://database/Assets/TextMesh%20Pro/Fonts/Bungee-Regular.ttf?fileID=12800000&guid=b8a509d3b3ce60847bbafb5a38462ecf&type=3#Bungee-Regular");
     color: rgb(247, 213, 32);
-    -unity-background-image-tint-color: rgb(128, 128, 128);
+    -unity-background-image-tint-color: rgb(144, 144, 144);
+}
+
+.menuButton:disabled {
+    background-image: url("project://database/Assets/Textures/UI/ui_btn_blank.png?fileID=2800000&guid=41948b4cc6087644b983dce55b466d50&type=3#ui_btn_blank");
+    -unity-font-definition: url("project://database/Assets/TextMesh%20Pro/Fonts/Bungee-Regular.ttf?fileID=12800000&guid=b8a509d3b3ce60847bbafb5a38462ecf&type=3#Bungee-Regular");
+    color: rgb(247, 213, 32);
+    font-size: 190%;
+    background-color: rgba(0, 0, 0, 0);
+    border-top-width: 0;
+    border-right-width: 0;
+    border-bottom-width: 0;
+    border-left-width: 0;
+    width: 408px;
+    height: 90px;
+    -unity-background-image-tint-color: rgb(164, 164, 164);
 }
diff --git a/Assets/Prefabs/UI/UIToolkit/USS/SettingsPanelCanvas.uss b/Assets/Prefabs/UI/UIToolkit/USS/SettingsPanelCanvas.uss
@@ -54,5 +54,5 @@
     height: 376px;
     position: absolute;
     top: -156px;
-    right: 111px;
+    right: -764px;
 }
diff --git a/Assets/Prefabs/UI/UIToolkit/UXML/SettingsPanelCanvas.uxml b/Assets/Prefabs/UI/UIToolkit/UXML/SettingsPanelCanvas.uxml
@@ -5,7 +5,7 @@
         <engine:Button name="quitButton" class="simpleButton ExitButton exitButton" style="background-size: 70% 70%; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0;" />
         <engine:Button name="settingsButton" class="settingsButton" style="background-size: 70% 70%; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0;" />
     </engine:VisualElement>
-    <engine:VisualElement name="root" style="flex-grow: 1;">
+    <engine:VisualElement name="root" style="flex-grow: 1; width: 335px; height: 103px;">
         <engine:VisualElement name="settingsPanelRoot" class="panel" style="scale: 0.8 0.8;">
             <engine:Button name="closeButton" class="ExitButton exitButton" style="position: absolute; top: -10px; right: -64px; background-size: 90% 90%; visibility: visible; overflow: visible;" />
             <engine:Label text="Settings" name="settingsLabel" class="settingsLabel label" style="margin-bottom: 8px;" />
diff --git a/Assets/Scenes/PostGame.unity b/Assets/Scenes/PostGame.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e534777638d85f5d4ae6fb3694efe209e4e7208e38811cd2479d1aacbc8029e
-size 36125
+oid sha256:62f3d6e8211c3f6077a052be1427d998c2e87db9ae673cf3207195e58b03d0dd
+size 36846
diff --git a/Assets/Scripts/Gameplay/GameState/NetworkPostGame.cs b/Assets/Scripts/Gameplay/GameState/NetworkPostGame.cs
@@ -1,6 +1,7 @@
 using System;
 using Unity.BossRoom.Gameplay.UI;
 using Unity.Netcode;
+using UnityEngine;
 using VContainer;
 
 namespace Unity.BossRoom.Gameplay.GameState
@@ -11,15 +12,15 @@ public class NetworkPostGame : NetworkBehaviour
 
         [Inject]
         PostGameUI m_PostGameUI;
-        
+
         [Inject]
         PersistentGameState m_PersistentGameState;
 
         public override void OnNetworkSpawn()
         {
             // only hosts can restart the game, other players see a wait message
             m_PostGameUI.Initialize(IsHost);
-            
+
             if (IsServer)
             {
                 WinState.Value = m_PersistentGameState.WinState;
diff --git a/Assets/Scripts/Gameplay/UI/PostGameUI.cs b/Assets/Scripts/Gameplay/UI/PostGameUI.cs
@@ -14,33 +14,34 @@ public class PostGameUI : MonoBehaviour
     {
         [SerializeField]
         UIDocument m_PostGameUIDocument;
-        
-        [SerializeField]
-        UIDocument m_MessageFeedDocument;
 
         ServerPostGameState m_PostGameState;
-        
+
         Label m_WinEndMessage;
         Label m_LoseGameMessage;
         Button m_ReplayButton;
-        Button m_WaitOnHostMsg;
+        Button m_WaitOnHostButton;
+        Button m_MainMenuButton;
+
         VisualElement m_MessageFeed;
         ListView m_MessageList;
-        /*VisualElement m_SceneLight;
-        Color m_WinLightColor;
-        Color m_LoseLightColor;*/
 
         void Awake()
         {
             var root = m_PostGameUIDocument.rootVisualElement;
-            
+
             m_WinEndMessage = root.Q<Label>("gameWinText");
             m_LoseGameMessage = root.Q<Label>("gameLostText");
             m_ReplayButton = root.Q<Button>("playAgainBtn");
-            m_WaitOnHostMsg = root.Q<Button>("waitOnHostBtn");
-            
-            m_WinEndMessage.style.display = DisplayStyle.None;
-            m_LoseGameMessage.style.display = DisplayStyle.None;
+            m_WaitOnHostButton = root.Q<Button>("waitOnHostBtn");
+            m_MainMenuButton = root.Q<Button>("menuBtn");
+
+            m_WaitOnHostButton.SetEnabled(false);
+            m_ReplayButton.SetEnabled(true);
+            m_MainMenuButton.SetEnabled(true);
+
+            m_ReplayButton.clicked += OnPlayAgainClicked;
+            m_MainMenuButton.clicked += OnMainMenuClicked;
         }
 
         [Inject]
@@ -54,14 +55,16 @@ public void Initialize(bool isHost)
             // only hosts can restart the game, other players see a wait message
             if (isHost)
             {
-                m_ReplayButton.SetEnabled(true);
-                m_WaitOnHostMsg.SetEnabled(false);
+                m_ReplayButton.style.display = DisplayStyle.Flex;
+                m_WaitOnHostButton.style.display = DisplayStyle.None;
+                m_MainMenuButton.style.display = DisplayStyle.Flex;
             }
-            
+
             else
             {
-                m_ReplayButton.SetEnabled(false);
-                m_WaitOnHostMsg.SetEnabled(true);
+                m_ReplayButton.style.display = DisplayStyle.None;
+                m_WaitOnHostButton.style.display = DisplayStyle.Flex;
+                m_MainMenuButton.style.display = DisplayStyle.Flex;
             }
         }
 
@@ -88,14 +91,11 @@ void SetPostGameUI(WinState winState)
         {
             switch (winState)
             {
-                // Set end message and background color based last game outcome
                 case WinState.Win:
-                   // m_SceneLight.color = m_WinLightColor;
                     m_WinEndMessage.SetEnabled(true);
                     m_LoseGameMessage.SetEnabled(false);
                     break;
                 case WinState.Loss:
-                    //m_SceneLight.color = m_LoseLightColor;
                     m_WinEndMessage.SetEnabled(false);
                     m_LoseGameMessage.SetEnabled(true);
                     break;
@@ -115,4 +115,4 @@ public void OnMainMenuClicked()
             m_PostGameState.GoToMainMenu();
         }
     }
-}
+}
diff --git a/Assets/Scripts/Gameplay/UI/UISettingsCanvas.cs b/Assets/Scripts/Gameplay/UI/UISettingsCanvas.cs

Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,5 @@`
`54`	`54`	`height: 376px;`
`55`	`55`	`position: absolute;`
`56`	`56`	`top: -156px;`
`57`		`- right: 111px;`
	`57`	`+ right: -764px;`
`58`	`58`	`}`