diff --git a/Assets/Scripts/UI/Managers/UIManager.cs b/Assets/Scripts/UI/Managers/UIManager.cs index ba7b236..924ce18 100644 --- a/Assets/Scripts/UI/Managers/UIManager.cs +++ b/Assets/Scripts/UI/Managers/UIManager.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; public class UIManager : MonoBehaviour, IBase, IBootLoader, IDataLoader diff --git a/Assets/Scripts/UI/Pages/PopUp/PauseMenuPopup.cs b/Assets/Scripts/UI/Pages/PopUp/PauseMenuPopup.cs index 8325d76..4b402a8 100644 --- a/Assets/Scripts/UI/Pages/PopUp/PauseMenuPopup.cs +++ b/Assets/Scripts/UI/Pages/PopUp/PauseMenuPopup.cs @@ -8,42 +8,46 @@ public class PauseMenuPopup : PopupBase [SerializeField] private Button playBtn; [SerializeField] private Button exitBtn; - SoundManager soundManager; + private SoundManager soundManager; + private GameManager gameManager; private void OnEnable() { - playBtn.onClick.AddListener(OnClick_playBtn); - homeBtn.onClick.AddListener(OnClick_homeBtn); - exitBtn.onClick.AddListener(OnClick_exitBtn); + playBtn.onClick.AddListener(OnClick_PlayButton); + homeBtn.onClick.AddListener(OnClick_HomeButton); + exitBtn.onClick.AddListener(OnClick_ExitButton); } private void OnDisable() { - playBtn.onClick.RemoveListener(OnClick_playBtn); - homeBtn.onClick.RemoveListener(OnClick_homeBtn); - exitBtn.onClick.RemoveListener(OnClick_exitBtn); + playBtn.onClick.RemoveListener(OnClick_PlayButton); + homeBtn.onClick.RemoveListener(OnClick_HomeButton); + exitBtn.onClick.RemoveListener(OnClick_ExitButton); } - private void OnClick_playBtn() + private void OnClick_PlayButton() { + soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance() : soundManager; + soundManager?.PlayGameSoundClip(SoundType.ButtonClick); + + popupManager.HidePopup(popupType); + ScreenManager screenManager = InterfaceManager.Instance?.GetInterfaceInstance(); screenManager.ShowScreen(ScreenType.InGameHUDScreen); - - soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance() : soundManager; - soundManager?.PlayGameSoundClip(SoundType.ButtonClick); - - Hide(); } - private void OnClick_homeBtn() + private void OnClick_HomeButton() { - // TODO: Implement Home Button Functionality - soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance() : soundManager; soundManager?.PlayGameSoundClip(SoundType.ButtonClick); + + popupManager.HidePopup(popupType); + + gameManager = InterfaceManager.Instance?.GetInterfaceInstance(); + gameManager.OnGameStateChanged(GameState.InMenu); } - private void OnClick_exitBtn() + private void OnClick_ExitButton() { Application.Quit(); }