Rollback: SceneTransform

GG-Studio-990001 · Oct 31, 2024 · ccf80a8 · ccf80a8
1 parent 7daf121
commit ccf80a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Assets/Scripts/Runtime/CH1/Pacmom/PMEnding.cs b/Assets/Scripts/Runtime/CH1/Pacmom/PMEnding.cs
@@ -89,7 +89,7 @@ public void ExitPacmom()
             _postProcessing.gameObject.SetActive(false);
 
             _sceneTransform = FindObjectOfType<SceneTransform>();
-            _sceneTransform.EscapeFromScene("CH1");
+            _sceneTransform.EscapeFromScene("CH1", true);
         }
     }
 }
diff --git a/Assets/Scripts/Runtime/ETC/SceneTransform.cs b/Assets/Scripts/Runtime/ETC/SceneTransform.cs
@@ -27,26 +27,26 @@ private void Awake()
             DontDestroyOnLoad(gameObject);
         }
 
-        public void ConnectToScene(string targetScene)
+        public void ConnectToScene(string targetScene, bool disablePlayerInput = false)
         {
             // 함수 호출 전 효과음 출력, 인풋 막기 필요
             _middleScene = _connectionScene;
             _targetScene = targetScene;
-            StartCoroutine(nameof(TranslateScene));
+            StartCoroutine(nameof(TranslateScene), disablePlayerInput);
         }
 
-        public void EscapeFromScene(string targetScene)
+        public void EscapeFromScene(string targetScene, bool disablePlayerInput = false)
         {
             Managers.Data.InGameKeyBinder.PlayerInputDisable();
 
             Managers.Sound.StopAllSound();
 
             _middleScene = _escapeScene;
             _targetScene = targetScene;
-            StartCoroutine(nameof(TranslateScene));
+            StartCoroutine(nameof(TranslateScene), disablePlayerInput);
         }
 
-        private IEnumerator TranslateScene()
+        private IEnumerator TranslateScene(bool disablePlayerInput = false)
         {
             // 비동기 방식을 쓰지 않으면 씬 로드나 언로드 중에 게임이 멈출 수 있다고 함
             Debug.Log("_targetScene: " + _targetScene);
@@ -86,7 +86,10 @@ private IEnumerator TranslateScene()
             // 중간 씬 언로드
             yield return SceneManager.UnloadSceneAsync(_middleScene);
 
-            Managers.Data.InGameKeyBinder.PlayerInputEnable();
+            if (!disablePlayerInput)
+            {
+                Managers.Data.InGameKeyBinder.PlayerInputEnable();
+            }
         }
 
         public void ConnectDirection()

diff --git a/Assets/Scripts/Runtime/Middle/ConnectionController.cs b/Assets/Scripts/Runtime/Middle/ConnectionController.cs
@@ -42,6 +42,7 @@ IEnumerator ActiveGlitch(bool isConnection)
             _volume.weight = 0.59f;
             yield return new WaitForSeconds(1f);
             _volume.weight = 0;
+            Managers.Data.InGameKeyBinder.PlayerInputEnable();
 
             if (isConnection)
             {