Berry-Dash/source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix escape not exiting from the edit ui mode but rather closing entirely in pause menu

Browse Source
This commit is contained in:
Travis
2026-01-26 08:00:14 -07:00
parent 0a9db35a02
commit 3cd762ee06
2 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/Scripts/CustomGamePlayer.cs
View File

@@ -675,19 +675,8 @@ public class CustomGamePlayer : MonoBehaviour
internal void TogglePause() internal void TogglePause()
{ {
if (CustomGamePlayerPauseMenu.Instance != null && CustomGamePlayerPauseMenu.Instance.statsMenu.activeSelf) if (pausePanel.activeSelf) DisablePause();
{ else EnablePause();
CustomGamePlayerPauseMenu.Instance.statsMenuExitButton.onClick.Invoke();
return;
}
if (pausePanel.activeSelf)
{
DisablePause();
}
else
{
EnablePause();
}
} }
internal void EnablePause() internal void EnablePause()
@@ -700,12 +689,21 @@ public class CustomGamePlayer : MonoBehaviour
internal void DisablePause() internal void DisablePause()
{ {
if (CustomGamePlayerPauseMenu.Instance.statsMenu.activeSelf)
{
CustomGamePlayerPauseMenu.Instance.statsMenuExitButton.onClick.Invoke();
return;
}
if (CustomGamePlayerPauseMenu.Instance.editingUI == true)
{
CustomGamePlayerPauseMenu.Instance.ToggleEditingUI();
return;
}
lastMoveTime = Time.time; lastMoveTime = Time.time;
Cursor.visible = false; Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked; Cursor.lockState = CursorLockMode.Locked;
backgroundMusic.GetComponent<GameMusicHandler>().ResumeMusic(); backgroundMusic.GetComponent<GameMusicHandler>().ResumeMusic();
pausePanel.SetActive(false); pausePanel.SetActive(false);
if (CustomGamePlayerPauseMenu.Instance.editingUI == true) CustomGamePlayerPauseMenu.Instance.ToggleEditingUI();
} }
void OnApplicationPause(bool pause) void OnApplicationPause(bool pause)

26
Assets/Scripts/GamePlayer.cs
View File

@@ -690,19 +690,8 @@ public class GamePlayer : MonoBehaviour
internal void TogglePause() internal void TogglePause()
{ {
if (GamePlayerPauseMenu.Instance != null && GamePlayerPauseMenu.Instance.statsMenu.activeSelf) if (pausePanel.activeSelf) DisablePause();
{ else EnablePause();
GamePlayerPauseMenu.Instance.statsMenuExitButton.onClick.Invoke();
return;
}
if (pausePanel.activeSelf)
{
DisablePause();
}
else
{
EnablePause();
}
} }
internal void EnablePause() internal void EnablePause()
@@ -715,12 +704,21 @@ public class GamePlayer : MonoBehaviour
internal void DisablePause() internal void DisablePause()
{ {
if (GamePlayerPauseMenu.Instance.statsMenu.activeSelf)
{
GamePlayerPauseMenu.Instance.statsMenuExitButton.onClick.Invoke();
return;
}
if (GamePlayerPauseMenu.Instance.editingUI == true)
{
GamePlayerPauseMenu.Instance.ToggleEditingUI();
return;
}
lastMoveTime = Time.time; lastMoveTime = Time.time;
Cursor.visible = false; Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked; Cursor.lockState = CursorLockMode.Locked;
backgroundMusic.GetComponent<GameMusicHandler>().ResumeMusic(); backgroundMusic.GetComponent<GameMusicHandler>().ResumeMusic();
pausePanel.SetActive(false); pausePanel.SetActive(false);
if (GamePlayerPauseMenu.Instance.editingUI == true) GamePlayerPauseMenu.Instance.ToggleEditingUI();
} }
void OnApplicationPause(bool pause) void OnApplicationPause(bool pause)