chore: simplify switch scene options

jcs090218 · jcs090218 · commit 1be6203fe583 · 2025-10-10T20:36:40.000+08:00
diff --git a/Assets/JCSUnity/Scripts/Enums/JCS_SwitchSceneType.cs b/Assets/JCSUnity/Scripts/Enums/JCS_SwitchSceneType.cs
@@ -14,9 +14,9 @@ namespace JCSUnity
     /// </summary>
     public enum JCS_SwitchSceneType
     {
-        NONE,          /* 不做任何處理 */
-        CUSTOM,        /* 客製 */
-        BLACK_SCREEN,  /* 黑屏 */
-        SLIDE_SCREEN,  /* 滑屏 */
+        NONE,    /* 不做任何處理 */
+        CUSTOM,  /* 客製 */
+        FADE,    /* 黑屏 */
+        SLIDE,   /* 滑屏 */
     }
 }
diff --git a/Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs b/Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs
@@ -68,7 +68,7 @@ public class JCS_SceneManager : JCS_Manager<JCS_SceneManager>
 
         [Tooltip("Type/Method to switch the scene.")]
         [SerializeField]
-        private JCS_SwitchSceneType mSwitchSceneType = JCS_SwitchSceneType.BLACK_SCREEN;
+        private JCS_SwitchSceneType mSwitchSceneType = JCS_SwitchSceneType.FADE;
 
         [Header("Overlay")]
 
@@ -135,13 +135,13 @@ private void Awake()
 
             switch (mSwitchSceneType)
             {
-                case JCS_SwitchSceneType.BLACK_SCREEN:
+                case JCS_SwitchSceneType.FADE:
                     {
                         JCS_UtilFunctions.PopBlackScreen();
                     }
                     break;
 
-                case JCS_SwitchSceneType.SLIDE_SCREEN:
+                case JCS_SwitchSceneType.SLIDE:
                     {
                         JCS_UtilFunctions.PopBlackSlideScreen();
                     }
@@ -173,7 +173,7 @@ private void Start()
                         onSwitchSceneInit?.Invoke();
                     }
                     break;
-                case JCS_SwitchSceneType.BLACK_SCREEN:
+                case JCS_SwitchSceneType.FADE:
                     {
                         // get the current screen color.
                         mBlackScreen.localColor = ss.SCREEN_COLOR;
@@ -182,7 +182,7 @@ private void Start()
                     }
                     break;
 
-                case JCS_SwitchSceneType.SLIDE_SCREEN:
+                case JCS_SwitchSceneType.SLIDE:
                     {
                         mBlackSlideScreen.StartSlideOut(mAlign, fadeoutTime);
                     }
@@ -360,7 +360,7 @@ public void LoadScene(string sceneName, LoadSceneMode mode,
                     }
                     break;
 
-                case JCS_SwitchSceneType.BLACK_SCREEN:
+                case JCS_SwitchSceneType.FADE:
                     {
                         // move to the last child in order
                         // to render the black screen in front of 
@@ -381,7 +381,7 @@ public void LoadScene(string sceneName, LoadSceneMode mode,
                     }
                     break;
 
-                case JCS_SwitchSceneType.SLIDE_SCREEN:
+                case JCS_SwitchSceneType.SLIDE:
                     {
                         mBlackSlideScreen.MoveToTheLastChild();
 
@@ -562,7 +562,7 @@ private void DoEnterSwitchScene()
                     }
                     break;
 
-                case JCS_SwitchSceneType.BLACK_SCREEN:
+                case JCS_SwitchSceneType.FADE:
                     {
                         if (mBlackScreen.IsFadeIn())
                         {
@@ -571,7 +571,7 @@ private void DoEnterSwitchScene()
                     }
                     break;
 
-                case JCS_SwitchSceneType.SLIDE_SCREEN:
+                case JCS_SwitchSceneType.SLIDE:
                     {
                         if (mBlackSlideScreen.IsDoneSliding())
                         {
@@ -602,7 +602,7 @@ private void DoExitSwitchScene()
                     }
                     break;
 
-                case JCS_SwitchSceneType.BLACK_SCREEN:
+                case JCS_SwitchSceneType.FADE:
                     {
                         if (mBlackScreen.IsFadeOut())
                         {
@@ -611,7 +611,7 @@ private void DoExitSwitchScene()
                     }
                     break;
 
-                case JCS_SwitchSceneType.SLIDE_SCREEN:
+                case JCS_SwitchSceneType.SLIDE:
                     {
                         if (mBlackSlideScreen.IsDoneSliding())
                         {

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ namespace JCSUnity`
`14`	`14`	`/// </summary>`
`15`	`15`	`public enum JCS_SwitchSceneType`
`16`	`16`	`{`
`17`		`- NONE, /* 不做任何處理 */`
`18`		`- CUSTOM, /* 客製 */`
`19`		`- BLACK_SCREEN, /* 黑屏 */`
`20`		`- SLIDE_SCREEN, /* 滑屏 */`
	`17`	`+ NONE, /* 不做任何處理 */`
	`18`	`+ CUSTOM, /* 客製 */`
	`19`	`+ FADE, /* 黑屏 */`
	`20`	`+ SLIDE, /* 滑屏 */`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public class JCS_SceneManager : JCS_Manager<JCS_SceneManager>`
`68`	`68`
`69`	`69`	`[Tooltip("Type/Method to switch the scene.")]`
`70`	`70`	`[SerializeField]`
`71`		`- private JCS_SwitchSceneType mSwitchSceneType = JCS_SwitchSceneType.BLACK_SCREEN;`
	`71`	`+ private JCS_SwitchSceneType mSwitchSceneType = JCS_SwitchSceneType.FADE;`
`72`	`72`
`73`	`73`	`[Header("Overlay")]`
`74`	`74`
`@@ -135,13 +135,13 @@ private void Awake()`
`135`	`135`
`136`	`136`	`switch (mSwitchSceneType)`
`137`	`137`	`{`
`138`		`- case JCS_SwitchSceneType.BLACK_SCREEN:`
	`138`	`+ case JCS_SwitchSceneType.FADE:`
`139`	`139`	`{`
`140`	`140`	`JCS_UtilFunctions.PopBlackScreen();`
`141`	`141`	`}`
`142`	`142`	`break;`
`143`	`143`
`144`		`- case JCS_SwitchSceneType.SLIDE_SCREEN:`
	`144`	`+ case JCS_SwitchSceneType.SLIDE:`
`145`	`145`	`{`
`146`	`146`	`JCS_UtilFunctions.PopBlackSlideScreen();`
`147`	`147`	`}`
`@@ -173,7 +173,7 @@ private void Start()`
`173`	`173`	`onSwitchSceneInit?.Invoke();`
`174`	`174`	`}`
`175`	`175`	`break;`
`176`		`- case JCS_SwitchSceneType.BLACK_SCREEN:`
	`176`	`+ case JCS_SwitchSceneType.FADE:`
`177`	`177`	`{`
`178`	`178`	`// get the current screen color.`
`179`	`179`	`mBlackScreen.localColor = ss.SCREEN_COLOR;`
`@@ -182,7 +182,7 @@ private void Start()`
`182`	`182`	`}`
`183`	`183`	`break;`
`184`	`184`
`185`		`- case JCS_SwitchSceneType.SLIDE_SCREEN:`
	`185`	`+ case JCS_SwitchSceneType.SLIDE:`
`186`	`186`	`{`
`187`	`187`	`mBlackSlideScreen.StartSlideOut(mAlign, fadeoutTime);`
`188`	`188`	`}`
`@@ -360,7 +360,7 @@ public void LoadScene(string sceneName, LoadSceneMode mode,`
`360`	`360`	`}`
`361`	`361`	`break;`
`362`	`362`
`363`		`- case JCS_SwitchSceneType.BLACK_SCREEN:`
	`363`	`+ case JCS_SwitchSceneType.FADE:`
`364`	`364`	`{`
`365`	`365`	`// move to the last child in order`
`366`	`366`	`// to render the black screen in front of`
`@@ -381,7 +381,7 @@ public void LoadScene(string sceneName, LoadSceneMode mode,`
`381`	`381`	`}`
`382`	`382`	`break;`
`383`	`383`
`384`		`- case JCS_SwitchSceneType.SLIDE_SCREEN:`
	`384`	`+ case JCS_SwitchSceneType.SLIDE:`
`385`	`385`	`{`
`386`	`386`	`mBlackSlideScreen.MoveToTheLastChild();`
`387`	`387`
`@@ -562,7 +562,7 @@ private void DoEnterSwitchScene()`
`562`	`562`	`}`
`563`	`563`	`break;`
`564`	`564`
`565`		`- case JCS_SwitchSceneType.BLACK_SCREEN:`
	`565`	`+ case JCS_SwitchSceneType.FADE:`
`566`	`566`	`{`
`567`	`567`	`if (mBlackScreen.IsFadeIn())`
`568`	`568`	`{`
`@@ -571,7 +571,7 @@ private void DoEnterSwitchScene()`
`571`	`571`	`}`
`572`	`572`	`break;`
`573`	`573`
`574`		`- case JCS_SwitchSceneType.SLIDE_SCREEN:`
	`574`	`+ case JCS_SwitchSceneType.SLIDE:`
`575`	`575`	`{`
`576`	`576`	`if (mBlackSlideScreen.IsDoneSliding())`
`577`	`577`	`{`
`@@ -602,7 +602,7 @@ private void DoExitSwitchScene()`
`602`	`602`	`}`
`603`	`603`	`break;`
`604`	`604`
`605`		`- case JCS_SwitchSceneType.BLACK_SCREEN:`
	`605`	`+ case JCS_SwitchSceneType.FADE:`
`606`	`606`	`{`
`607`	`607`	`if (mBlackScreen.IsFadeOut())`
`608`	`608`	`{`
`@@ -611,7 +611,7 @@ private void DoExitSwitchScene()`
`611`	`611`	`}`
`612`	`612`	`break;`
`613`	`613`
`614`		`- case JCS_SwitchSceneType.SLIDE_SCREEN:`
	`614`	`+ case JCS_SwitchSceneType.SLIDE:`
`615`	`615`	`{`
`616`	`616`	`if (mBlackSlideScreen.IsDoneSliding())`
`617`	`617`	`{`