fix: Sync paused variable

jcs090218 · May 4, 2024 · ef17a3d · ef17a3d
1 parent ac1eaf4
commit ef17a3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Assets/JCSUnity/Scripts/Managers/JCS_GameManager.cs b/Assets/JCSUnity/Scripts/Managers/JCS_GameManager.cs
@@ -23,11 +23,6 @@ public class JCS_GameManager : JCS_Manager<JCS_GameManager>
 
         [Separator("Check Variable (JCS_GameManager)")]
 
-        [Tooltip("Is the game pasue?")]
-        [SerializeField]
-        [ReadOnly]
-        private bool mGamePause = false;
-
         [Tooltip("Is game done initialize?")]
         [SerializeField]
         [ReadOnly]
@@ -40,23 +35,21 @@ public class JCS_GameManager : JCS_Manager<JCS_GameManager>
         public bool GAME_DONE_INITIALIZE { get { return this.mGameDoneInitialize; } }
         public bool GAME_PAUSE
         {
-            get { return this.mGamePause; }
+            get { return JCS_PauseManager.instance.Paused; }
             set
             {
+                var pm = JCS_PauseManager.instance;
+
                 // check if need the game pause the same as the value previously
                 // set. In order to save some perforce by enable/disable all the
                 // JCS_PauseAction in the game.
-                if (mGamePause != value)
+                if (pm.Paused != value)
                 {
-                    var pm = JCS_PauseManager.instance;
-
                     if (value)
                         pm.Pause();
                     else
                         pm.Unpause();
                 }
-
-                this.mGamePause = value;
             }
         }
         public JCS_Player Player { get { return this.mPlayer; } set { this.mPlayer = value; } }

diff --git a/Assets/JCSUnity/Scripts/Managers/JCS_PauseManager.cs b/Assets/JCSUnity/Scripts/Managers/JCS_PauseManager.cs
@@ -55,6 +55,10 @@ public class JCS_PauseManager : JCS_Manager<JCS_PauseManager>
 
         [Separator("Check Variables (JCS_PauseManager)")]
 
+        [Tooltip("Set to true if game is paused.")]
+        [SerializeField]
+        private bool mPaused = false;
+
         [Tooltip("Target time scale.")]
         [SerializeField]
         [ReadOnly]
@@ -98,6 +102,7 @@ public class JCS_PauseManager : JCS_Manager<JCS_PauseManager>
 
         /* Setter & Getter */
 
+        public bool Paused { get { return this.mPaused; } }
         public List<JCS_PauseAction> PausesActions { get { return this.mPauseActions; } }
         public float ResizePauseActionListTime { get { return this.mResizePauseActionListTime; } set { this.mResizePauseActionListTime = value; } }
         public float DefaultTimeScale { get { return this.mDefaultTimeScale; } set { this.mDefaultTimeScale = value; } }
@@ -213,6 +218,8 @@ public void PauseTheWholeGame(bool act = true)
 
             // resize the list once.
             RemoveNullRefInPauseActionList();
+
+            mPaused = act;
         }
 
         /// <summary>