fix: next scene name

Author: jcs090218

Assets/JCSUnity/Scripts/JCS_Logo.cs

@@ -20,7 +20,7 @@ public class JCS_Logo : MonoBehaviour
 
         [Separator("Runtime Variables (JCS_Logo)")]
 
-        [Tooltip("Next scene to load.")]
+        [Tooltip("Next scene to load; if empy, load the next scene instead.")]
         [SerializeField]
         private string mNextLevel = "JCS_AppCloseSimulate";
 
@@ -57,7 +57,21 @@ private void Update()
             mDelayTimer += JCS_Time.DeltaTime(mDeltaTimeType);
 
             if (mDelayTime < mDelayTimer)
-                JCS_SceneManager.instance.LoadScene(mNextLevel);
+            {
+                LoadLevel();
+            }
+        }
+
+        private void LoadLevel()
+        {
+            var sm = JCS_SceneManager.instance;
+
+            string sceneName = mNextLevel;
+
+            if (sceneName == "")
+                sceneName = sm.NextSceneName();
+
+            sm.LoadScene(sceneName);
         }
     }
 }

Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs

@@ -6,6 +6,7 @@
  * $Notice: See LICENSE.txt for modification and distribution information 
  *                   Copyright (c) 2016 by Shen, Jen-Chieh $
  */
+using System.IO;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using MyBox;
@@ -505,11 +506,14 @@ public void ReloadScene(float fadeInTime, Color screenColor, bool keepBGM)
         /// <summary>
         /// Return the next scene.
         /// </summary>
-        public Scene NextScene(int offset = 1)
+        public string NextSceneName(int offset = 1)
         {
             int nextIndex = SceneManager.GetActiveScene().buildIndex + offset;
 
-            return SceneManager.GetSceneByBuildIndex(nextIndex);
+            string pathToScene = SceneUtility.GetScenePathByBuildIndex(nextIndex);
+            string sceneName = Path.GetFileNameWithoutExtension(pathToScene);
+
+            return sceneName;
         }
 
         /// <summary>
@@ -600,7 +604,7 @@ public void LoadNextScene(Color screenColor, bool keepBGM)
         /// <param name="keepBGM"> Set to true if keep background music playing. </param>
         public void LoadNextScene(float fadeInTime, Color screenColor, bool keepBGM)
         {
-            string sceneName = NextScene().name;
+            string sceneName = NextSceneName();
 
             LoadScene(sceneName, fadeInTime, screenColor, keepBGM);
         }

Assets/JCSUnity/Scripts/UI/Button/Scene/JCS_LoadSceneButton.cs

@@ -73,7 +73,7 @@ public override void OnClick()
             else
             {
                 if (sceneName == "")
-                    sceneName = sm.NextScene().name;
+                    sceneName = sm.NextSceneName();
             }
 
             sm.LoadScene(sceneName, mScreenColor, mKeppBGM);

Assets/JCSUnity/Scripts/UI/Button/Scene/JCS_LoadSceneGamePadButton.cs

@@ -73,7 +73,7 @@ public override void OnClick()
             else
             {
                 if (sceneName == "")
-                    sceneName = sm.NextScene().name;
+                    sceneName = sm.NextSceneName();
             }
 
             sm.LoadScene(sceneName, mScreenColor, mKeppBGM);