From fe521317c1c5533137a571ce717fa2e504286296 Mon Sep 17 00:00:00 2001
From: Lim0_C <dladudcks22@naver.com>
Date: Mon, 12 May 2025 14:09:45 +0900
Subject: [PATCH] =?UTF-8?q?DEG-140=20[feat]=20=EC=9D=BC=EC=8B=9C=EC=A0=95?=
 =?UTF-8?q?=EC=A7=80=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/KSH/ReDungeon.unity                |  4 ++--
 Assets/LYM/Scripts/MenuPanelController.cs | 15 +++++++++++++--
 Assets/LYM/Scripts/PanelController.cs     |  2 +-
 Assets/LYM/Scripts/PauseButton.cs         |  2 +-
 Assets/Scripts/Common/GameManager.cs      | 11 +++++++++++
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Assets/KSH/ReDungeon.unity b/Assets/KSH/ReDungeon.unity
index 36b826ee..c82a72a3 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:6073557e3f1e9b377c14c5b9a1284a3882642b13f32bfbc22bf38664308853dd
-size 2417036
+oid sha256:8cdd01e37120b7c4b8cbd0a993a7c28af5214354dbd7aea5cc43761d8e45206a
+size 2417367
diff --git a/Assets/LYM/Scripts/MenuPanelController.cs b/Assets/LYM/Scripts/MenuPanelController.cs
index 83546808..d2c66fd0 100644
--- a/Assets/LYM/Scripts/MenuPanelController.cs
+++ b/Assets/LYM/Scripts/MenuPanelController.cs
@@ -13,11 +13,21 @@ public class MenuPanelController : PanelController
         popupPanel.GetComponent<PopupPanelController>().Show("정말 나가시겠습니까?",
             () =>
             {
-                //todo: 메인으로 가거나 하우징 으로 감
+                GameManager.Instance.ResumeGame();
+                if (SceneManager.GetActiveScene().name == "ReDungeon")
+                {
+                    GameManager.Instance.ChangeToHomeScene();
+                }
+
+                if (SceneManager.GetActiveScene().name == "ReHousing")
+                {
+                    //todo: 메인화면
+                    
+                }
             },
             () =>
             {
-                //todo: 게임재개
+                GameManager.Instance.ResumeGame();
             });
     }
 
@@ -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<MenuPanelController>().Show();
     }
diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs
index a02bb9d3..9c18168c 100644
--- a/Assets/Scripts/Common/GameManager.cs
+++ b/Assets/Scripts/Common/GameManager.cs
@@ -62,6 +62,17 @@ public partial class GameManager : Singleton<GameManager>
         }
     }
     
+    //일시 정지
+    public void PauseGame()
+    {
+        Time.timeScale = 0;
+    }
+
+    public void ResumeGame()
+    {
+        Time.timeScale = 1;
+    }
+    
     public void ChangeToGameScene()
     {
         SceneManager.LoadScene("ReDungeon"); // 던전 Scene