fix(Scene): Switching scene flag

Author: jcs090218

Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs

@@ -19,14 +19,16 @@ public class JCS_SceneManager : JCS_Manager<JCS_SceneManager>
     {
         /* Variables */
 
-        private bool mSwitchSceneEffect = false;
-        private string mNextSceneName = "";
-
         // Async loading scene operation. (thread)
         private AsyncOperation mAsyncOperation = null;
 
         [Separator("Check Variables (JCS_SceneManager)")]
 
+        [Tooltip("Next scene name to load.")]
+        [SerializeField]
+        [ReadOnly]
+        private string mNextSceneName = "";
+
         [Tooltip("Black screen object to be assigned by the system.")]
         [SerializeField]
         [ReadOnly]
@@ -76,7 +78,7 @@ public class JCS_SceneManager : JCS_Manager<JCS_SceneManager>
         private float mSceneFadeOutTime = 1.0f;
 
         // fade the sound while switching the scene.
-        private JCS_FadeSound mJCSFadeSound = null;
+        private JCS_FadeSound mFadeSound = null;
 
         // Scene in the game so is dynamic instead of Unity's scene system's scene
         // Unity 自帶就有Scene這個物件. 在這個Unity Scene裡面自己宣告Scene
@@ -164,15 +166,15 @@ private void Start()
                 if (soundS.SMOOTH_SWITCH_SOUND_BETWEEN_SCENE)
                 {
                     // get the component.
-                    if (mJCSFadeSound == null)
-                        mJCSFadeSound = this.gameObject.AddComponent<JCS_FadeSound>();
+                    if (mFadeSound == null)
+                        mFadeSound = this.gameObject.AddComponent<JCS_FadeSound>();
 
                     // set the background audio source.
-                    mJCSFadeSound.SetAudioSource(
+                    mFadeSound.SetAudioSource(
                         soundM.GetBGMAudioSource());
 
                     // active the fade sound in effect.
-                    mJCSFadeSound.FadeIn(
+                    mFadeSound.FadeIn(
                         soundS.GetBGM_Volume(),
                         /* Fade in the sound base on the setting. */
                         soundS.GetSoundFadeInTimeBaseOnSetting());
@@ -302,8 +304,10 @@ public void LoadScene(string sceneName, float fadeInTime, Color screenColor, boo
             }
 #endif
 
+            var scenes = JCS_SceneSettings.instance;
+
             // if is loading already, dont load it agian
-            if (mSwitchSceneEffect)
+            if (scenes.SWITCHING_SCENE)
                 return;
 
             // set the next scene name
@@ -363,18 +367,18 @@ public void LoadScene(string sceneName, float fadeInTime, Color screenColor, boo
                 if (ss.SMOOTH_SWITCH_SOUND_BETWEEN_SCENE)
                 {
                     // get the component.
-                    if (mJCSFadeSound == null)
-                        mJCSFadeSound = this.gameObject.AddComponent<JCS_FadeSound>();
+                    if (mFadeSound == null)
+                        mFadeSound = this.gameObject.AddComponent<JCS_FadeSound>();
 
-                    mJCSFadeSound.SetAudioSource(JCS_SoundManager.instance.GetBGMAudioSource());
+                    mFadeSound.SetAudioSource(JCS_SoundManager.instance.GetBGMAudioSource());
 
                     // fade out sound to zero
-                    mJCSFadeSound.FadeOut(0, fadeInTime);
+                    mFadeSound.FadeOut(0, fadeInTime);
                 }
             }
 
             // start check to switch scene or not
-            mSwitchSceneEffect = true;
+            scenes.SWITCHING_SCENE = true;
         }
 
         /// <summary>
@@ -476,16 +480,18 @@ public void ReloadScene(float fadeInTime, Color screenColor, bool keepBGM)
         /// <returns> return result. </returns>
         public bool IsSwitchingScene()
         {
-            return this.mSwitchSceneEffect;
+            return JCS_SceneSettings.instance.SWITCHING_SCENE;
         }
 
         /// <summary>
         /// Do the async switch scene.
         /// </summary>
         private void DoSwitchScene()
         {
+            var scenes = JCS_SceneSettings.instance;
+
             // check if during the switch scene?
-            if (!mSwitchSceneEffect)
+            if (!scenes.SWITCHING_SCENE)
                 return;
 
             switch (mSwitchSceneType)
@@ -494,16 +500,16 @@ private void DoSwitchScene()
                     {
                         if (mBlackScreen.IsFadeIn())
                         {
-                            // No need this anymore, since we have the
-                            // to clean up everything before we load the scene.
-                            // we need this boolean to check weather the event can
-                            // spawn new "GameObject" when "OnDestroy" function was 
-                            // called in Unity.
-                            //mSwitchSceneEffect = false;
-
                             // load the scene if is ready
                             mAsyncOperation.allowSceneActivation = true;
                         }
+
+                        bool inNewScene = (mNextSceneName == "");
+
+                        if (inNewScene && mBlackScreen.IsFadeOut())
+                        {
+                            scenes.SWITCHING_SCENE = false;
+                        }
                     }
                     break;
 

Assets/JCSUnity/Scripts/Settings/JCS_SceneSettings.cs

@@ -18,6 +18,12 @@ public class JCS_SceneSettings : JCS_Settings<JCS_SceneSettings>
     {
         /* Variables */
 
+        [Separator("Check Variables (JCS_SceneSettings)")]
+
+        [Tooltip("True when is switching scene.")]
+        [ReadOnly]
+        public bool SWITCHING_SCENE = false;
+
         [Separator("Runtime Variables (JCS_SceneSettings)")]
 
         [Tooltip("General Scene fadout time. (For all scene)")]
@@ -91,6 +97,8 @@ public float SceneFadeInTimeBaseOnSetting()
         /// <param name="_new"> new instance </param>
         protected override void TransferData(JCS_SceneSettings _old, JCS_SceneSettings _new)
         {
+            _new.SWITCHING_SCENE = _old.SWITCHING_SCENE;
+
             _new.SCENE_FADEIN_TIME = _old.SCENE_FADEIN_TIME;
             _new.SCENE_FADEOUT_TIME = _old.SCENE_FADEOUT_TIME;
             _new.SCREEN_COLOR = _old.SCREEN_COLOR;

Assets/JCSUnity/Scripts/UI/Slider/JCS_SoundSlider.cs

@@ -8,6 +8,7 @@
  */
 using UnityEngine;
 using UnityEngine.UI;
+using MyBox;
 
 namespace JCSUnity
 {
@@ -21,7 +22,7 @@ public class JCS_SoundSlider : MonoBehaviour
 
         private Slider mSlider = null;
 
-        [Header("** Initialize Variables (JCS_SoundSlider) **")]
+        [Separator("Initialize Variables (JCS_SoundSlider)")]
 
         [Tooltip("Sound type you would like the slider to control.")]
         [SerializeField]
@@ -41,6 +42,11 @@ private void Awake()
 
         private void LateUpdate()
         {
+            var sm = JCS_SceneManager.instance;
+
+            if (sm.IsSwitchingScene())
+                return;
+
             float total = mSlider.maxValue - mSlider.minValue;  // Find total.
             float val = mSlider.value / total;                  // Convert to 0 to 1 scale.