From 7823d44746f2c17f1e978fedbdb31e20179b31e9 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Mon, 12 May 2025 15:10:49 +0900 Subject: [PATCH] =?UTF-8?q?DEG-140=20[Fix]=20=EC=94=AC=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8=20=EB=B0=8F=20=EC=BD=94=EB=93=9C=20=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LYM/Scripts/MenuPanelController.cs | 13 ++++++++++++- Assets/LYM/Scripts/PanelController.cs | 2 +- Assets/LYM/Scripts/PauseButton.cs | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Assets/LYM/Scripts/MenuPanelController.cs b/Assets/LYM/Scripts/MenuPanelController.cs index 83546808..3dc711a7 100644 --- a/Assets/LYM/Scripts/MenuPanelController.cs +++ b/Assets/LYM/Scripts/MenuPanelController.cs @@ -13,7 +13,17 @@ public class MenuPanelController : PanelController popupPanel.GetComponent().Show("정말 나가시겠습니까?", () => { - //todo: 메인으로 가거나 하우징 으로 감 + GameManager.Instance.ResumeGame(); + if (SceneManager.GetActiveScene().name == "ReDungeon") + { + GameManager.Instance.ChangeToHomeScene(); + } + + if (SceneManager.GetActiveScene().name == "ReHousing") + { + //todo: 메인화면 + + } }, () => { @@ -29,6 +39,7 @@ public class MenuPanelController : PanelController public void OnClickBackButton() { + GameManager.Instance.ResumeGame(); Hide(); } } diff --git a/Assets/LYM/Scripts/PanelController.cs b/Assets/LYM/Scripts/PanelController.cs index bb31a025..6c7cf12d 100644 --- a/Assets/LYM/Scripts/PanelController.cs +++ b/Assets/LYM/Scripts/PanelController.cs @@ -20,7 +20,7 @@ public class PanelController : MonoBehaviour public void Show() { if (_canvasGroup == null) return; - _canvasGroup.DOFade(1, 0.5f); + _canvasGroup.DOFade(1, 0.5f).SetUpdate(true); } public void Hide(bool doDestroy = true) diff --git a/Assets/LYM/Scripts/PauseButton.cs b/Assets/LYM/Scripts/PauseButton.cs index 9a463e2f..1eeef520 100644 --- a/Assets/LYM/Scripts/PauseButton.cs +++ b/Assets/LYM/Scripts/PauseButton.cs @@ -6,7 +6,7 @@ public class PauseButton : MonoBehaviour { public void OnClicked() { - //todo: 게임 일시정지 필요 + GameManager.Instance.PauseGame(); var menuPanel = GameManager.Instance.PanelManager.GetPanel("MenuPanel"); menuPanel.GetComponent().Show(); }