fix: overlay scene being load multiple times, no. 2

Author: jcs090218

Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs

@@ -29,7 +29,9 @@ public class JCS_SceneManager : JCS_Manager<JCS_SceneManager>
         public Func<bool> onSwitchSceneIn = null;
         public Func<bool> onSwitchSceneOut = null;
 
-        private bool mIsEnteringSwitchScene = false;
+        private bool mSwitchSceneEntering = false;
+
+        private bool mIsEnteringNextScene = false;
 
         [Separator("Check Variables (JCS_SceneManager)")]
 
@@ -261,7 +263,7 @@ private void Start()
 
         private void Update()
         {
-            if (mIsEnteringSwitchScene)
+            if (mSwitchSceneEntering)
                 DoEnterSwitchScene();
             else
                 DoExitSwitchScene();
@@ -278,9 +280,6 @@ private void HandleAdditive()
                 if (mLoadedOverlaySceneNames.Contains(sceneName))
                     continue;
 
-                // Prevent scene loaded twice.
-                mLoadedOverlaySceneNames.Add(sceneName);
-
                 if (mOverlayUseAsync)
                     SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Additive);
                 else
@@ -306,6 +305,9 @@ private void OnOverlaySceneLoaded(Scene scene, LoadSceneMode mode)
 
             string sceneName = scene.name;
 
+            // Prevent scene loaded twice.
+            mLoadedOverlaySceneNames.Add(sceneName);
+
             // Execute event.
             if (mOnOverlaySceneLoaded.ContainsKey(sceneName))
                 RegisterOverlaySceneLoaded(sceneName, mOnOverlaySceneLoaded[sceneName]);
@@ -387,7 +389,7 @@ public void LoadScene(string sceneName, LoadSceneMode mode,
             }
 
             // Mark loading scene.
-            mIsEnteringSwitchScene = true;
+            mSwitchSceneEntering = true;
 
             switch (mSwitchSceneType)
             {
@@ -684,6 +686,11 @@ private void DoExitSwitchScene()
         /// </summary>
         private void EnterNextScene()
         {
+            if (mIsEnteringNextScene)
+                return;
+
+            mIsEnteringNextScene = true;
+
             // Don't set it to low, or else it will still be
             // not fade out when trying to load the next scnee.
             const float delay = 0.1f;