Degulleo/Degulleo3D
7
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Merge pull request 'DEG-147 로딩연동' (!66) from DEG-147-로딩연동 into main

Browse Source 
Reviewed-on: #66
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
This commit is contained in:
Lim0_C 2025-05-15 00:15:21 +00:00
commit 19bf97bfb2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Assets/Prefabs/ReHousing/SwitchingPanel.prefab → Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab
View File

0
Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta → Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab.meta
View File

6
Assets/Scripts/Common/GameManager.cs
View File

@ -102,13 +102,15 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
public void ChangeToGameScene() public void ChangeToGameScene()
{ {
tryStageCount++; // 던전 시도 횟수 증가 tryStageCount++; // 던전 시도 횟수 증가
SceneManager.LoadScene("ReDungeon"); // 던전 Scene var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>();
switchingPanel.FadeAndSceneLoad("ReDungeon"); // 던전 Scene
HandleSceneAudio("Dungeon"); HandleSceneAudio("Dungeon");
} }
public void ChangeToHomeScene(bool isNewStart = false) public void ChangeToHomeScene(bool isNewStart = false)
{ {
SceneManager.LoadScene("ReHousing"); // Home Scene var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>();
switchingPanel.FadeAndSceneLoad("ReHousing"); // Home Scene
HandleSceneAudio("Housing"); HandleSceneAudio("Housing");
if(isNewStart) // 아예 메인에서 시작 시 튜토리얼 출력 if(isNewStart) // 아예 메인에서 시작 시 튜토리얼 출력