Compare commits

...

7 Commits

Author SHA1 Message Date
e4bfba9780 Merge pull request 'DEG-140 [feat] 일시정지 기능 추가' (!34) from DEG-140-게임-일시정지 into main
Reviewed-on: #34
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-12 06:12:04 +00:00
Lim0_C
7823d44746 DEG-140 [Fix] 씬 제외 및 코드 복구 2025-05-12 15:10:49 +09:00
Lim0_C
a946eed728 Revert "DEG-140 [feat] 일시정지 기능 추가"
This reverts commit fe521317c1c5533137a571ce717fa2e504286296.
2025-05-12 15:06:55 +09:00
Lim0_C
5f8080ff9c DEG-140 [Feat] 진짜 일시정지 기능 추가 2025-05-12 15:05:57 +09:00
Lim0_C
8b1b1c1a15 DEG-140 [feat] 일시정지 기능 추가 2025-05-12 15:03:42 +09:00
Lim0_C
47d19aa428 DEG-140 [fix] 불필요한 코드 삭제 2025-05-12 14:23:47 +09:00
Lim0_C
fe521317c1 DEG-140 [feat] 일시정지 기능 추가 2025-05-12 14:09:45 +09:00
4 changed files with 25 additions and 3 deletions

View File

@ -13,7 +13,17 @@ 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: 메인화면
}
},
() =>
{
@ -29,6 +39,7 @@ public class MenuPanelController : PanelController
public void OnClickBackButton()
{
GameManager.Instance.ResumeGame();
Hide();
}
}

View File

@ -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)

View File

@ -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();
}

View File

@ -49,6 +49,17 @@ public partial class GameManager : Singleton<GameManager>
#endregion
//일시 정지
public void PauseGame()
{
Time.timeScale = 0;
}
public void ResumeGame()
{
Time.timeScale = 1;
}
// 날짜 진행
public void AdvanceDay()
{