From 4a39c430ab8f71fdd1ac7b21ac61ddc39f23c0e9 Mon Sep 17 00:00:00 2001
From: Julius <juliusfe@stud.ntnu.no>
Date: Thu, 10 Nov 2022 22:05:14 +0100
Subject: [PATCH] Small logic changes and cleaning
---
MrBigsock/Assets/Code/UI/ControlScheme.cs | 10 +++++-----
MrBigsock/Assets/Code/UI/EndScreen.cs | 2 +-
MrBigsock/Assets/Code/UI/MainMenuScript.cs | 13 ++-----------
MrBigsock/Assets/Code/UI/PlayerMenu.cs | 2 +-
4 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/MrBigsock/Assets/Code/UI/ControlScheme.cs b/MrBigsock/Assets/Code/UI/ControlScheme.cs
index 08f4322e..2c1f2f59 100644
--- a/MrBigsock/Assets/Code/UI/ControlScheme.cs
+++ b/MrBigsock/Assets/Code/UI/ControlScheme.cs
@@ -13,16 +13,16 @@ namespace BigSock.UI
originalTime = Time.timeScale;
Time.timeScale = 0;
}
- public void ExitMenu()
- {
- Destroy(gameObject);
-
- }
public void OnDestroy()
{
Time.timeScale = originalTime;
}
+ public void ExitMenu()
+ {
+ Destroy(gameObject);
+
+ }
}
}
diff --git a/MrBigsock/Assets/Code/UI/EndScreen.cs b/MrBigsock/Assets/Code/UI/EndScreen.cs
index b1c35a55..ef04d464 100644
--- a/MrBigsock/Assets/Code/UI/EndScreen.cs
+++ b/MrBigsock/Assets/Code/UI/EndScreen.cs
@@ -24,7 +24,7 @@ public class EndScreen : MonoBehaviour
public void TryAgain()
{
-
+ Destroy(gameObject);
SceneManager.LoadScene("MainMenu");
}
}
diff --git a/MrBigsock/Assets/Code/UI/MainMenuScript.cs b/MrBigsock/Assets/Code/UI/MainMenuScript.cs
index 973b5245..b4d307a4 100644
--- a/MrBigsock/Assets/Code/UI/MainMenuScript.cs
+++ b/MrBigsock/Assets/Code/UI/MainMenuScript.cs
@@ -11,21 +11,12 @@ public class MainMenuScript : MonoBehaviour
public string firstLevel;
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
+
public void StartGame()
{
SceneManager.LoadScene(firstLevel);
+ Time.timeScale = 1;
}
public void OpenOptions()
diff --git a/MrBigsock/Assets/Code/UI/PlayerMenu.cs b/MrBigsock/Assets/Code/UI/PlayerMenu.cs
index 34df35c1..e71c7bf3 100644
--- a/MrBigsock/Assets/Code/UI/PlayerMenu.cs
+++ b/MrBigsock/Assets/Code/UI/PlayerMenu.cs
@@ -20,7 +20,7 @@ namespace BigSock.UI
public void OnDestroy()
{
- Time.timeScale = originalTime;
+ Time.timeScale = 1;
}
}
}
--
GitLab