From 6d1403a8cccf718da1264809a320d27f4408ef67 Mon Sep 17 00:00:00 2001 From: mikeleo03 <leonmichael463@gmail.com> Date: Thu, 9 May 2024 18:29:28 +0700 Subject: [PATCH] fix : pause behaviour --- Assets/Scenes/Main.unity | 1 + Assets/Scripts/Managers/PauseManager.cs | 38 +++++++++---------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index e184312..addb4c0 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1039,6 +1039,7 @@ MonoBehaviour: m_EditorClassIdentifier: paused: {fileID: 24500000, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2} unpaused: {fileID: 24500003, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2} + canvas: {fileID: 244922610} --- !u!114 &244922612 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/PauseManager.cs b/Assets/Scripts/Managers/PauseManager.cs index 9e7fd1b..1bf5257 100644 --- a/Assets/Scripts/Managers/PauseManager.cs +++ b/Assets/Scripts/Managers/PauseManager.cs @@ -10,8 +10,7 @@ public class PauseManager : MonoBehaviour { public AudioMixerSnapshot paused; public AudioMixerSnapshot unpaused; - - Canvas canvas; + [SerializeField] private Canvas canvas; void Start() { @@ -22,29 +21,18 @@ public class PauseManager : MonoBehaviour { { if (Input.GetKeyDown(KeyCode.Escape)) { - canvas.enabled = !canvas.enabled; - Pause(); - } - } - - public void Pause() - { - Time.timeScale = Time.timeScale == 0 ? 1 : 0; - Lowpass (); - - } - - void Lowpass() - { - if (Time.timeScale == 0) - { - paused.TransitionTo(.01f); - } - - else - - { - unpaused.TransitionTo(.01f); + if (canvas.isActiveAndEnabled == true) + { + canvas.enabled = false; + Time.timeScale = 1; + paused.TransitionTo(.01f); + } + else if (canvas.isActiveAndEnabled == false) + { + canvas.enabled = true; + Time.timeScale = 0; + unpaused.TransitionTo(.01f); + } } } -- GitLab