diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs index 50c9ced2..aeeabab8 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs @@ -11,8 +11,8 @@ namespace TON None, Empty, Title, - Ingame, Lobby, + Stage, } public class Main : SingletonBase
@@ -67,12 +67,12 @@ namespace TON case SceneType.Title: StartCoroutine(ChangeScene(onSceneChangeCompletedCallback)); break; - case SceneType.Ingame: - StartCoroutine(ChangeScene(onSceneChangeCompletedCallback)); - break; case SceneType.Lobby: StartCoroutine(ChangeScene(onSceneChangeCompletedCallback)); break; + case SceneType.Stage: + StartCoroutine(ChangeScene(onSceneChangeCompletedCallback)); + break; } } diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs b/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs deleted file mode 100644 index 44bfb2a1..00000000 --- a/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.SceneManagement; - -namespace TON -{ - public class IngameScene : SceneBase - { - - public override IEnumerator OnStart() - { - // Ingame 씬을 비동기로 로드한다. - AsyncOperation asyncLoad = SceneManager.LoadSceneAsync("Ingame", LoadSceneMode.Single); - - // 로드가 완료될 때 까지 yield return null 을 하면서 기다린다 - while (!asyncLoad.isDone) - { - yield return null; - } - - UIManager.Show(UIList.IngameUI); - UIManager.Show(UIList.ControllerUI); - - - string selectedCharacter = PlayerPrefs.GetString("SelectedCharacter", "DefaultCharacter"); - Debug.Log("선택된 캐릭터: " + selectedCharacter); - - // 선택된 캐릭터에 맞는 오브젝트를 생성하거나 적용하는 코드 작성 - } - public override IEnumerator OnEnd() - { - yield return null; - - UIManager.Hide(UIList.IngameUI); - UIManager.Hide(UIList.ControllerUI); - } - - void OnEscapeExecute() - { - // TODO : 게임 일시정지 UI 노출 시 수행 - // Time.timeScale = 0f; - // UIManager.Show(UIList.PausePopupUI); - } - } -} diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs.meta deleted file mode 100644 index f5e04ce8..00000000 --- a/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a468df02c01075748a9dd91a1d2ebfa8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: