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(); } diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index a02bb9d3..42b1b1a2 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -49,6 +49,17 @@ public partial class GameManager : Singleton #endregion + //일시 정지 + public void PauseGame() + { + Time.timeScale = 0; + } + + public void ResumeGame() + { + Time.timeScale = 1; + } + // 날짜 진행 public void AdvanceDay() {