diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs index 7cf75be3..69c435e1 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs @@ -13,6 +13,7 @@ namespace TON Title, Lobby, Stage, + Shop, } public class Main : SingletonBase
@@ -49,7 +50,7 @@ namespace TON bool isSceneChangeProgress = false; SceneBase currentSceneController = null; - SceneType currentSceneType = SceneType.None; + public SceneType currentSceneType = SceneType.None; public void ChangeScene(SceneType sceneType, System.Action onSceneChangeCompletedCallback = null) { if (isSceneChangeProgress) diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs index 6556a983..c50af75b 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs @@ -19,9 +19,10 @@ namespace TON // 상점 : 골드/생선 private void OnEnable() { - Scene activeScene = UnityEditor.SceneManagement.EditorSceneManager.GetActiveScene(); + // Scene activeScene = UnityEditor.SceneManagement.EditorSceneManager.GetActiveScene(); + SceneType activeScene = Main.Singleton.currentSceneType; - if (activeScene.name.Equals("Lobby")) + if (activeScene == SceneType.Lobby) { goldObject.SetActive(true); fishObject.SetActive(true); @@ -29,7 +30,7 @@ namespace TON settingObject.SetActive(true); parseObject.SetActive(false); } - else if (activeScene.name.StartsWith("Stage")) + else if (activeScene == SceneType.Stage) { goldObject.SetActive(false); fishObject.SetActive(false); @@ -37,7 +38,7 @@ namespace TON settingObject.SetActive(false); parseObject.SetActive(true); } - else if (activeScene.name.Equals("Shop")) + else if (activeScene == SceneType.Shop) { goldObject.SetActive(true); fishObject.SetActive(true);