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

[Fix] 병합 충돌

Browse Source
This commit is contained in:
HaeinLEE 2025-05-15 09:32:02 +09:00
parent d3c250a983
commit d941326d61
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,8 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
private PanelManager panelManager; private PanelManager panelManager;
public PanelManager PanelManager => panelManager; public PanelManager PanelManager => panelManager;
private TutorialManager tutorialManager;
private void Start() private void Start()
{ {
// 오디오 초기화 // 오디오 초기화
@ -91,24 +93,45 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
TriggerTimeEnding(); TriggerTimeEnding();
} }
} }
public void ChangeToMainScene()
{
SceneManager.LoadScene("Main");
}
public void ChangeToGameScene() public void ChangeToGameScene()
{ {
tryStageCount++; // 던전 시도 횟수 증가 tryStageCount++; // 던전 시도 횟수 증가
InteractionController interactionController = FindObjectOfType<InteractionController>(); InteractionController interactionController = FindObjectOfType<InteractionController>();
interactionController.ReSetAfterWorkEvent(); interactionController.ReSetAfterWorkEvent();
SceneManager.LoadScene("ReDungeon"); // 던전 Scene var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>();
switchingPanel.FadeAndSceneLoad("ReDungeon"); // 던전 Scene
HandleSceneAudio("Dungeon"); HandleSceneAudio("Dungeon");
} }
public void ChangeToHomeScene() 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) // 아예 메인에서 시작 시 튜토리얼 출력
StartNPCDialogue(GamePhase.Intro); // StartCoroutine(StartTutorialCoroutine());
if (tryStageCount >= 3) FailEnd(); // 엔딩 if (tryStageCount >= 3) FailEnd(); // 엔딩
} }
public IEnumerator StartTutorialCoroutine()
{
yield return new WaitForSeconds(0.5f);
if(tutorialManager == null)
tutorialManager = FindObjectOfType<TutorialManager>();
PlayerStats.Instance.HideBubble();
tutorialManager.StartTutorial(() => PlayerStats.Instance.ShowBubble());
}
// TODO: Open Setting Panel 등 Panel 처리 // TODO: Open Setting Panel 등 Panel 처리
protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode) protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode)
@ -135,6 +158,7 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
if (save?.dungeonSave != null) if (save?.dungeonSave != null)
{ {
stageLevel = Mathf.Clamp(save.dungeonSave.stageLevel,1,2); stageLevel = Mathf.Clamp(save.dungeonSave.stageLevel,1,2);
tryStageCount = Mathf.Clamp(save.dungeonSave.tryStageCount,0,3);
} }
if (save?.homeSave != null) if (save?.homeSave != null)
@ -150,6 +174,7 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
dungeonSave = new DungeonSave() dungeonSave = new DungeonSave()
{ {
stageLevel = Mathf.Clamp(this.stageLevel,1,2), stageLevel = Mathf.Clamp(this.stageLevel,1,2),
tryStageCount = Mathf.Clamp(this.tryStageCount,0,3),
}, },
homeSave = new HomeSave homeSave = new HomeSave