From ca06f274d57688e9f51aa98490f435b31ba649bd Mon Sep 17 00:00:00 2001 From: Lucas Xavier Leite Date: Sun, 4 Jun 2023 22:41:17 -0300 Subject: [PATCH] Fix return to title screen from game pause menu --- .../Backend/DataStructs/RankingStructs.cs | 4 +-- Assets/Scripts/Managers/GameManager.cs | 3 +- Assets/Scripts/PauseMenu/PauseMenu.cs | 31 ++++++++++--------- Assets/Scripts/Ranking/RankingMenu.cs | 1 - 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Assets/Scripts/Backend/DataStructs/RankingStructs.cs b/Assets/Scripts/Backend/DataStructs/RankingStructs.cs index 5752103a..435160d8 100644 --- a/Assets/Scripts/Backend/DataStructs/RankingStructs.cs +++ b/Assets/Scripts/Backend/DataStructs/RankingStructs.cs @@ -1,6 +1,4 @@ -using UnityEngine.Serialization; - -[System.Serializable] +[System.Serializable] public struct RankingPlayerData { public string name; diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 10630b96..87809655 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -70,8 +70,7 @@ public void SetLevelProgress(float p) public void PassLevel(bool changeUI) { level++; - if (changeUI) - SetLevelView(); + if (changeUI) SetLevelView(); } public void SetLevelView() diff --git a/Assets/Scripts/PauseMenu/PauseMenu.cs b/Assets/Scripts/PauseMenu/PauseMenu.cs index 547110f0..7069225a 100644 --- a/Assets/Scripts/PauseMenu/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu/PauseMenu.cs @@ -1,10 +1,7 @@ -using System; using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; using TMPro; -using UnityEngine.UI; public class PauseMenu : MonoBehaviour { @@ -109,13 +106,24 @@ private IEnumerator CountPausedTime() public void FinishAndLoadMenu() { audioManager.PlaySFX("Button"); -#if !UNITY_EDITOR - StartCoroutine(FinishAndLoadMenuEnumerator()); -#else + + // Comment this region to set offline + + #region Online + + // StartCoroutine(FinishAndLoadMenuEnumerator()); + + #endregion Online + + // Uncomment this region to set offline + + #region Offline + Time.timeScale = 1f; isGamePaused = false; SceneManager.LoadScene(0); -#endif + + #endregion Offline } private IEnumerator FinishAndLoadMenuEnumerator() @@ -141,25 +149,18 @@ private IEnumerator FinishAndLoadMenuEnumerator() public void ReloadScene() { - // StartCoroutine(FinishAndLoadSceneEnumerator(SceneManager.GetActiveScene().buildIndex)); SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex); } - - // Quit the game + public void QuitGame() { - Debug.Log("Quit the game"); Application.Quit(); } - private float effecttmp; - public void Volume() { audioManager.PlaySFX("Button"); - menuLabelText.text = "VOLUME"; - volumePanel.SetActive(true); } } diff --git a/Assets/Scripts/Ranking/RankingMenu.cs b/Assets/Scripts/Ranking/RankingMenu.cs index c0027586..7aad5458 100644 --- a/Assets/Scripts/Ranking/RankingMenu.cs +++ b/Assets/Scripts/Ranking/RankingMenu.cs @@ -1,4 +1,3 @@ -using System; using System.Collections; using UnityEngine;