Revert "DEG-140 [feat] 일시정지 기능 추가"
This reverts commit fe521317c1c5533137a571ce717fa2e504286296.
This commit is contained in:
parent
5f8080ff9c
commit
a946eed728
BIN
Assets/KSH/ReDungeon.unity
(Stored with Git LFS)
BIN
Assets/KSH/ReDungeon.unity
(Stored with Git LFS)
Binary file not shown.
@ -13,17 +13,7 @@ public class MenuPanelController : PanelController
|
|||||||
popupPanel.GetComponent<PopupPanelController>().Show("정말 나가시겠습니까?",
|
popupPanel.GetComponent<PopupPanelController>().Show("정말 나가시겠습니까?",
|
||||||
() =>
|
() =>
|
||||||
{
|
{
|
||||||
GameManager.Instance.ResumeGame();
|
//todo: 메인으로 가거나 하우징 으로 감
|
||||||
if (SceneManager.GetActiveScene().name == "ReDungeon")
|
|
||||||
{
|
|
||||||
GameManager.Instance.ChangeToHomeScene();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SceneManager.GetActiveScene().name == "ReHousing")
|
|
||||||
{
|
|
||||||
//todo: 메인화면
|
|
||||||
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
() =>
|
() =>
|
||||||
{
|
{
|
||||||
@ -39,7 +29,6 @@ public class MenuPanelController : PanelController
|
|||||||
|
|
||||||
public void OnClickBackButton()
|
public void OnClickBackButton()
|
||||||
{
|
{
|
||||||
GameManager.Instance.ResumeGame();
|
|
||||||
Hide();
|
Hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ public class PanelController : MonoBehaviour
|
|||||||
public void Show()
|
public void Show()
|
||||||
{
|
{
|
||||||
if (_canvasGroup == null) return;
|
if (_canvasGroup == null) return;
|
||||||
_canvasGroup.DOFade(1, 0.5f).SetUpdate(true);
|
_canvasGroup.DOFade(1, 0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Hide(bool doDestroy = true)
|
public void Hide(bool doDestroy = true)
|
||||||
|
@ -6,7 +6,7 @@ public class PauseButton : MonoBehaviour
|
|||||||
{
|
{
|
||||||
public void OnClicked()
|
public void OnClicked()
|
||||||
{
|
{
|
||||||
GameManager.Instance.PauseGame();
|
//todo: 게임 일시정지 필요
|
||||||
var menuPanel = GameManager.Instance.PanelManager.GetPanel("MenuPanel");
|
var menuPanel = GameManager.Instance.PanelManager.GetPanel("MenuPanel");
|
||||||
menuPanel.GetComponent<MenuPanelController>().Show();
|
menuPanel.GetComponent<MenuPanelController>().Show();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user