diff --git a/Assets/Prefabs/ReHousing/SwitchingPanel.prefab b/Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab similarity index 100% rename from Assets/Prefabs/ReHousing/SwitchingPanel.prefab rename to Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab diff --git a/Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta b/Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab.meta similarity index 100% rename from Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta rename to Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab.meta diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index 2cd7a8e3..3e819e6f 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -102,13 +102,15 @@ public partial class GameManager : Singleton,ISaveable public void ChangeToGameScene() { tryStageCount++; // 던전 시도 횟수 증가 - SceneManager.LoadScene("ReDungeon"); // 던전 Scene + var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent(); + switchingPanel.FadeAndSceneLoad("ReDungeon"); // 던전 Scene HandleSceneAudio("Dungeon"); } public void ChangeToHomeScene(bool isNewStart = false) { - SceneManager.LoadScene("ReHousing"); // Home Scene + var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent(); + switchingPanel.FadeAndSceneLoad("ReHousing"); // Home Scene HandleSceneAudio("Housing"); if(isNewStart) // 아예 메인에서 시작 시 튜토리얼 출력