Adding CanvasGroup to PopupPanel

Author: LPLafontaineB

Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab

@@ -1117,6 +1117,7 @@ GameObject:
   - component: {fileID: 6918681726633036010}
   - component: {fileID: 2602198259095850982}
   - component: {fileID: 7399699007816123072}
+  - component: {fileID: 1849608714128437920}
   m_Layer: 5
   m_Name: PopupPanel
   m_TagString: Untagged
@@ -1198,6 +1199,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_TitleText: {fileID: 4728902606848342875}
   m_MainText: {fileID: 3801577438371952926}
+  m_CanvasGroup: {fileID: 1849608714128437920}
+--- !u!225 &1849608714128437920
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5680680656091823962}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &6154749339973089473
 GameObject:
   m_ObjectHideFlags: 0

Assets/BossRoom/Scripts/Client/UI/PopupPanel.cs

@@ -26,6 +26,8 @@ public PopupPanelData(string titleText, string mainText)
         TextMeshProUGUI m_TitleText;
         [SerializeField]
         TextMeshProUGUI m_MainText;
+        [SerializeField]
+        CanvasGroup m_CanvasGroup;
 
         Stack<PopupPanelData> m_PopupStack = new Stack<PopupPanelData>();
 
@@ -35,7 +37,7 @@ void Awake()
         {
             if (s_Instance != null) throw new Exception("Invalid state, instance is not null");
             s_Instance = this;
-            ResetState();
+            Hide();
         }
 
         void OnDestroy()
@@ -45,21 +47,15 @@ void OnDestroy()
 
         public void OnConfirmClick()
         {
-            ResetState();
+            m_PopupStack.Pop();
             if (m_PopupStack.Count > 0)
             {
-                SetupPopupPanel(m_PopupStack.Pop());
+                SetupPopupPanel(m_PopupStack.Peek());
+            }
+            else
+            {
+                Hide();
             }
-        }
-
-        /// <summary>
-        /// Helper method to help us reset all state for the popup.
-        /// </summary>
-        void ResetState()
-        {
-            m_TitleText.text = string.Empty;
-            m_MainText.text = string.Empty;
-            gameObject.SetActive(false);
         }
 
         /// <summary>
@@ -87,12 +83,24 @@ void StackPopupPanel(PopupPanelData data)
 
         void SetupPopupPanel(PopupPanelData data)
         {
-            ResetState();
-
             m_TitleText.text = data.TitleText;
             m_MainText.text = data.MainText;
 
-            gameObject.SetActive(true);
+            Show();
+        }
+
+
+
+        void Show()
+        {
+            m_CanvasGroup.alpha = 1f;
+            m_CanvasGroup.blocksRaycasts = true;
+        }
+
+        void Hide()
+        {
+            m_CanvasGroup.alpha = 0f;
+            m_CanvasGroup.blocksRaycasts = false;
         }
     }
 }