Merge pull request #73 from FellowshipOfTheGame/develop

Fix return to title screen from game pause menu
FellowshipOfTheGame · Jun 5, 2023 · 7910700 · 7910700
2 parents 2cbc266 + ca06f27
commit 7910700
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using UnityEngine;