Compare commits
7 Commits
b09110f8c1
...
e4bfba9780
Author | SHA1 | Date | |
---|---|---|---|
e4bfba9780 | |||
|
7823d44746 | ||
|
a946eed728 | ||
|
5f8080ff9c | ||
|
8b1b1c1a15 | ||
|
47d19aa428 | ||
|
fe521317c1 |
@ -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();
|
||||
}
|
||||
}
|
||||
|
@ -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)
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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()
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user