fix: scene transition order execution

Author: jcs090218

Assets/JCSUnity/Scripts/Effects/JCS_FadeObject.cs

@@ -131,24 +131,16 @@ private void Test()
 #endif
 
         /// <summary>
-        /// Is the fade object fade in?
+        /// Return true if the object is fade in.
         /// </summary>
-        /// <returns>
-        /// true : is fade in.
-        /// false : not fade in yet.
-        /// </returns>
         public bool IsFadeIn()
         {
             return (this.mAlpha >= mFadeInAmount);
         }
 
         /// <summary>
-        /// Is the fade object fade out?
+        /// Return true if the object is fade out.
         /// </summary>
-        /// <returns>
-        /// true : is fade out.
-        /// false : not fade out yet.
-        /// </returns>
         public bool IsFadeOut()
         {
             return (this.mAlpha <= mFadeOutAmount);

Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs

@@ -203,7 +203,10 @@ private void Start()
 
         private void Update()
         {
-            DoSwitchScene();
+            if (IsEnteringSwitchScene())
+                DoEnterSwitchScene();
+            else
+                DoExitSwitchScene();
         }
 
         #region Load Scene
@@ -433,7 +436,7 @@ public bool IsSwitchingScene()
         /// <summary>
         /// Do the async switch scene.
         /// </summary>
-        private void DoSwitchScene()
+        private void DoEnterSwitchScene()
         {
             var ss = JCS_SceneSettings.instance;
 
@@ -452,22 +455,51 @@ private void DoSwitchScene()
                                 AllowSceneActivation();
                             }
                         }
+                    }
+                    break;
 
-                        if (onSwitchSceneOut != null)
+                case JCS_SwitchSceneType.BLACK_SCREEN:
+                    {
+                        if (mBlackScreen.IsFadeIn())
                         {
-                            if (onSwitchSceneOut.Invoke())
-                                ss.SWITCHING_SCENE = false;
+                            AllowSceneActivation();
                         }
                     }
                     break;
 
-                case JCS_SwitchSceneType.BLACK_SCREEN:
+                case JCS_SwitchSceneType.SLIDE_SCREEN:
                     {
-                        if (mBlackScreen.IsFadeIn())
+                        if (mBlackSlideScreen.IsDoneSliding())
                         {
                             AllowSceneActivation();
                         }
+                    }
+                    break;
+            }
+        }
+
+        private void DoExitSwitchScene()
+        {
+            var ss = JCS_SceneSettings.instance;
+
+            // check if during the switch scene?
+            if (!ss.SWITCHING_SCENE)
+                return;
+
+            switch (mSwitchSceneType)
+            {
+                case JCS_SwitchSceneType.CUSTOM:
+                    {
+                        if (onSwitchSceneOut != null)
+                        {
+                            if (onSwitchSceneOut.Invoke())
+                                ss.SWITCHING_SCENE = false;
+                        }
+                    }
+                    break;
 
+                case JCS_SwitchSceneType.BLACK_SCREEN:
+                    {
                         if (mBlackScreen.IsFadeOut())
                         {
                             ss.SWITCHING_SCENE = false;
@@ -479,7 +511,7 @@ private void DoSwitchScene()
                     {
                         if (mBlackSlideScreen.IsDoneSliding())
                         {
-                            AllowSceneActivation();
+                            ss.SWITCHING_SCENE = false;
                         }
                     }
                     break;
@@ -494,5 +526,13 @@ private void AllowSceneActivation()
             // load the scene if is ready
             mAsyncOperation.allowSceneActivation = true;
         }
+
+        /// <summary>
+        /// Return true if we are still in the entering switch scene state.
+        /// </summary>
+        private bool IsEnteringSwitchScene()
+        {
+            return mAsyncOperation != null && !mAsyncOperation.allowSceneActivation;
+        }
     }
 }

Assets/JCSUnity/Scripts/UI/System/JCS_BlackScreen.cs

@@ -58,18 +58,16 @@ public void FadeOut(float time)
         }
 
         /// <summary>
-        /// Is the black screen fade in?
+        /// Return true if the black screen is fade in.
         /// </summary>
-        /// <returns></returns>
         public bool IsFadeIn()
         {
             return mFadeObject.IsFadeIn();
         }
 
         /// <summary>
-        /// Is the black screen fade out?
+        /// Return true if the black screen is fade out.
         /// </summary>
-        /// <returns></returns>
         public bool IsFadeOut()
         {
             return mFadeObject.IsFadeOut();