diff --git a/Assets/KSH/ReDungeon.unity b/Assets/KSH/ReDungeon.unity index c82a72a3..36b826ee 100644 --- a/Assets/KSH/ReDungeon.unity +++ b/Assets/KSH/ReDungeon.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cdd01e37120b7c4b8cbd0a993a7c28af5214354dbd7aea5cc43761d8e45206a -size 2417367 +oid sha256:6073557e3f1e9b377c14c5b9a1284a3882642b13f32bfbc22bf38664308853dd +size 2417036 diff --git a/Assets/LYM/Scripts/MenuPanelController.cs b/Assets/LYM/Scripts/MenuPanelController.cs index 3dc711a7..83546808 100644 --- a/Assets/LYM/Scripts/MenuPanelController.cs +++ b/Assets/LYM/Scripts/MenuPanelController.cs @@ -13,17 +13,7 @@ public class MenuPanelController : PanelController popupPanel.GetComponent().Show("정말 나가시겠습니까?", () => { - GameManager.Instance.ResumeGame(); - if (SceneManager.GetActiveScene().name == "ReDungeon") - { - GameManager.Instance.ChangeToHomeScene(); - } - - if (SceneManager.GetActiveScene().name == "ReHousing") - { - //todo: 메인화면 - - } + //todo: 메인으로 가거나 하우징 으로 감 }, () => { @@ -39,7 +29,6 @@ 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 6c7cf12d..bb31a025 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).SetUpdate(true); + _canvasGroup.DOFade(1, 0.5f); } public void Hide(bool doDestroy = true) diff --git a/Assets/LYM/Scripts/PauseButton.cs b/Assets/LYM/Scripts/PauseButton.cs index 1eeef520..9a463e2f 100644 --- a/Assets/LYM/Scripts/PauseButton.cs +++ b/Assets/LYM/Scripts/PauseButton.cs @@ -6,7 +6,7 @@ public class PauseButton : MonoBehaviour { public void OnClicked() { - GameManager.Instance.PauseGame(); + //todo: 게임 일시정지 필요 var menuPanel = GameManager.Instance.PanelManager.GetPanel("MenuPanel"); menuPanel.GetComponent().Show(); }