diff --git a/Assets/Scripts/CustomGamePlayer.cs b/Assets/Scripts/CustomGamePlayer.cs index b42487f..f68e6a1 100644 --- a/Assets/Scripts/CustomGamePlayer.cs +++ b/Assets/Scripts/CustomGamePlayer.cs @@ -675,19 +675,8 @@ public class CustomGamePlayer : MonoBehaviour internal void TogglePause() { - if (CustomGamePlayerPauseMenu.Instance != null && CustomGamePlayerPauseMenu.Instance.statsMenu.activeSelf) - { - CustomGamePlayerPauseMenu.Instance.statsMenuExitButton.onClick.Invoke(); - return; - } - if (pausePanel.activeSelf) - { - DisablePause(); - } - else - { - EnablePause(); - } + if (pausePanel.activeSelf) DisablePause(); + else EnablePause(); } internal void EnablePause() @@ -700,12 +689,21 @@ public class CustomGamePlayer : MonoBehaviour 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; Cursor.visible = false; Cursor.lockState = CursorLockMode.Locked; backgroundMusic.GetComponent().ResumeMusic(); pausePanel.SetActive(false); - if (CustomGamePlayerPauseMenu.Instance.editingUI == true) CustomGamePlayerPauseMenu.Instance.ToggleEditingUI(); } void OnApplicationPause(bool pause) diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs index 0d2bda8..52b1e26 100644 --- a/Assets/Scripts/GamePlayer.cs +++ b/Assets/Scripts/GamePlayer.cs @@ -690,19 +690,8 @@ public class GamePlayer : MonoBehaviour internal void TogglePause() { - if (GamePlayerPauseMenu.Instance != null && GamePlayerPauseMenu.Instance.statsMenu.activeSelf) - { - GamePlayerPauseMenu.Instance.statsMenuExitButton.onClick.Invoke(); - return; - } - if (pausePanel.activeSelf) - { - DisablePause(); - } - else - { - EnablePause(); - } + if (pausePanel.activeSelf) DisablePause(); + else EnablePause(); } internal void EnablePause() @@ -715,12 +704,21 @@ public class GamePlayer : MonoBehaviour 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; Cursor.visible = false; Cursor.lockState = CursorLockMode.Locked; backgroundMusic.GetComponent().ResumeMusic(); pausePanel.SetActive(false); - if (GamePlayerPauseMenu.Instance.editingUI == true) GamePlayerPauseMenu.Instance.ToggleEditingUI(); } void OnApplicationPause(bool pause)