adding UITK panel prefab to postgamestate DI

Author: fernando-cortez

Assets/Prefabs/UI/UIToolkit/SettingsPanelCanvasUITK.prefab

@@ -76,7 +76,6 @@ GameObject:
   m_Component:
   - component: {fileID: 8673277459071735180}
   - component: {fileID: 8607712241056528212}
-  - component: {fileID: 4923764729715591813}
   m_Layer: 5
   m_Name: UIQuitPanel
   m_TagString: Untagged
@@ -112,19 +111,3 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_QuitMode: 0
---- !u!114 &4923764729715591813
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4153888348426691229}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b2c62ac3bcd44fb9e09835581422057, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  parentReference:
-    TypeName: Unity.BossRoom.ApplicationLifecycle.ApplicationController
-  autoRun: 1
-  autoInjectGameObjects: []

Assets/Scenes/PostGame.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f6d043b0d737b156218d82153c0068bda1b8af7cf40d1acdf13adc7356e6ae8
-size 34859
+oid sha256:ae9c4812e399a6ce3223651153d72979b7eee23921f506c9a8cfc4cd72d01a91
+size 33226

Assets/Scripts/Gameplay/UI/OldUISettingsCanvas.cs

@@ -1,45 +1,48 @@
-using System; 
+using System;
 using UnityEngine;
 
-namespace Unity.BossRoom.Gameplay.UI 
-{ 
+namespace Unity.BossRoom.Gameplay.UI
+{
     /// <summary>
     /// Controls the special Canvas that has the settings icon and the settings window.
     /// The window itself is controlled by UISettingsPanel; the button is controlled here.
     /// </summary>
-  public class OldUISettingsCanvas : MonoBehaviour { [SerializeField] private GameObject m_SettingsPanelRoot;
-      
+    public class OldUISettingsCanvas : MonoBehaviour
+    {
         [SerializeField]
-    GameObject m_QuitPanelRoot;
+        private GameObject m_SettingsPanelRoot;
 
-    void Awake()
-    {
-        // hide the settings window at startup (this is just to handle the common case where an artist forgets to disable the window in the prefab)
-        DisablePanels();
-    }
+        [SerializeField]
+        GameObject m_QuitPanelRoot;
 
-    void DisablePanels()
-    {
-        m_SettingsPanelRoot.SetActive(false);
-        m_QuitPanelRoot.SetActive(false);
-    }
+        void Awake()
+        {
+            // hide the settings window at startup (this is just to handle the common case where an artist forgets to disable the window in the prefab)
+            DisablePanels();
+        }
 
-    /// <summary>
-    /// Called directly by the settings button in the UI prefab
-    /// </summary>
-    public void OnClickSettingsButton()
-    {
-        m_SettingsPanelRoot.SetActive(!m_SettingsPanelRoot.activeSelf);
-        m_QuitPanelRoot.SetActive(false);
-    }
+        void DisablePanels()
+        {
+            m_SettingsPanelRoot.SetActive(false);
+            m_QuitPanelRoot.SetActive(false);
+        }
 
-    /// <summary>
-    /// Called directly by the quit button in the UI prefab
-    /// </summary>
-    public void OnClickQuitButton()
-    {
-        m_QuitPanelRoot.SetActive(!m_QuitPanelRoot.activeSelf);
-        m_SettingsPanelRoot.SetActive(false);
+        /// <summary>
+        /// Called directly by the settings button in the UI prefab
+        /// </summary>
+        public void OnClickSettingsButton()
+        {
+            m_SettingsPanelRoot.SetActive(!m_SettingsPanelRoot.activeSelf);
+            m_QuitPanelRoot.SetActive(false);
+        }
+
+        /// <summary>
+        /// Called directly by the quit button in the UI prefab
+        /// </summary>
+        public void OnClickQuitButton()
+        {
+            m_QuitPanelRoot.SetActive(!m_QuitPanelRoot.activeSelf);
+            m_SettingsPanelRoot.SetActive(false);
+        }
     }
-  }
 }

Assets/Scripts/Gameplay/UI/UISettingsCanvas.cs

@@ -34,7 +34,7 @@ void Awake()
             // Retrieve the root VisualElement from the UIDocument
             var root = uiDocument.rootVisualElement;
             // get UIQuitPanel component which is attached to the same GameObject
-            uiQuitPanel = GetComponent<UIQuitPanel>();
+            uiQuitPanel = GetComponentInChildren<UIQuitPanel>();
             // Query the panels by their names or assigned USS classes
             settingsPanelRoot = root.Q<VisualElement>("settingsPanelRoot");
             quitPanelRoot = root.Q<VisualElement>("quitPanelRoot");