From fe521317c1c5533137a571ce717fa2e504286296 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Mon, 12 May 2025 14:09:45 +0900 Subject: [PATCH 1/6] =?UTF-8?q?DEG-140=20[feat]=20=EC=9D=BC=EC=8B=9C?= =?UTF-8?q?=EC=A0=95=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().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().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 } } + //일시 정지 + public void PauseGame() + { + Time.timeScale = 0; + } + + public void ResumeGame() + { + Time.timeScale = 1; + } + public void ChangeToGameScene() { SceneManager.LoadScene("ReDungeon"); // 던전 Scene From 47d19aa428522cdfc5475bcd4369240e8dfaea40 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Mon, 12 May 2025 14:23:47 +0900 Subject: [PATCH 2/6] =?UTF-8?q?DEG-140=20[fix]=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LYM/Scripts/MenuPanelController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/LYM/Scripts/MenuPanelController.cs b/Assets/LYM/Scripts/MenuPanelController.cs index d2c66fd0..09c96c71 100644 --- a/Assets/LYM/Scripts/MenuPanelController.cs +++ b/Assets/LYM/Scripts/MenuPanelController.cs @@ -27,7 +27,7 @@ public class MenuPanelController : PanelController }, () => { - GameManager.Instance.ResumeGame(); + }); } From 8b1b1c1a15f57e261556bdb259501f80154a6bf4 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Mon, 12 May 2025 15:03:42 +0900 Subject: [PATCH 3/6] =?UTF-8?q?DEG-140=20[feat]=20=EC=9D=BC=EC=8B=9C?= =?UTF-8?q?=EC=A0=95=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/LYM/Scripts/MenuPanelController.cs | 2 +- Assets/LYM/Scripts/PanelController.cs | 2 +- Assets/LYM/Scripts/PauseButton.cs | 2 +- Assets/Scripts/Common/GameManager.cs | 11 ----------- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Assets/LYM/Scripts/MenuPanelController.cs b/Assets/LYM/Scripts/MenuPanelController.cs index 09c96c71..3dc711a7 100644 --- a/Assets/LYM/Scripts/MenuPanelController.cs +++ b/Assets/LYM/Scripts/MenuPanelController.cs @@ -27,7 +27,7 @@ public class MenuPanelController : PanelController }, () => { - + //todo: 게임재개 }); } 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(); } diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index 9c18168c..a02bb9d3 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -62,17 +62,6 @@ public partial class GameManager : Singleton } } - //일시 정지 - public void PauseGame() - { - Time.timeScale = 0; - } - - public void ResumeGame() - { - Time.timeScale = 1; - } - public void ChangeToGameScene() { SceneManager.LoadScene("ReDungeon"); // 던전 Scene From 5f8080ff9c28322c3853efe92c26fb8c68f96b98 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Mon, 12 May 2025 15:05:57 +0900 Subject: [PATCH 4/6] =?UTF-8?q?DEG-140=20[Feat]=20=EC=A7=84=EC=A7=9C=20?= =?UTF-8?q?=EC=9D=BC=EC=8B=9C=EC=A0=95=EC=A7=80=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LYM/Scripts/PanelController.cs | 2 +- Assets/LYM/Scripts/PauseButton.cs | 2 +- Assets/Scripts/Common/GameManager.cs | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) 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() { From a946eed72897685d20c6b7839e87f82501a1a000 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Mon, 12 May 2025 15:06:55 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"DEG-140=20[feat]=20=EC=9D=BC?= =?UTF-8?q?=EC=8B=9C=EC=A0=95=EC=A7=80=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fe521317c1c5533137a571ce717fa2e504286296. --- Assets/KSH/ReDungeon.unity | 4 ++-- Assets/LYM/Scripts/MenuPanelController.cs | 13 +------------ Assets/LYM/Scripts/PanelController.cs | 2 +- Assets/LYM/Scripts/PauseButton.cs | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) 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(); } From 7823d44746f2c17f1e978fedbdb31e20179b31e9 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Mon, 12 May 2025 15:10:49 +0900 Subject: [PATCH 6/6] =?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(); }