From 2092ba912a8db8734980589d71e518e648807a06 Mon Sep 17 00:00:00 2001
From: Ivy <ivyjs@hendrix.edu>
Date: Sun, 2 May 2021 15:42:08 -0500
Subject: [PATCH] Added true pausing/resuming

---
 MuseumGame/Assets/Scenes/MainMenu.unity          | 3 ++-
 MuseumGame/Assets/Scripts/GameManager.cs         | 8 ++++----
 MuseumGame/UserSettings/EditorUserSettings.asset | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity
index a5b270f..7371e05 100644
--- a/MuseumGame/Assets/Scenes/MainMenu.unity
+++ b/MuseumGame/Assets/Scenes/MainMenu.unity
@@ -3326,7 +3326,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Menu
+  m_text: Pause
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -4000,6 +4000,7 @@ MonoBehaviour:
   - {fileID: 8300000, guid: 327636dbdcb895b478ac95086f383d8a, type: 3}
   - {fileID: 8300000, guid: f14b1787c8db6e448ab9eff57b9db745, type: 3}
   enemyHealthBar: {fileID: 1545666262}
+  artActivated: 
 --- !u!4 &1874083438
 Transform:
   m_ObjectHideFlags: 0
diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs
index 2932801..65b7501 100644
--- a/MuseumGame/Assets/Scripts/GameManager.cs
+++ b/MuseumGame/Assets/Scripts/GameManager.cs
@@ -194,7 +194,7 @@ public class GameManager : MonoBehaviour
         disableAllPowerups();
         player.SetActive(true);
         LoadLevel(sceneToLoad, positionToLoad);
-        title.GetComponent<TextMeshProUGUI>().text = "Menu";
+        title.GetComponent<TextMeshProUGUI>().text = "Paused";
         startButton.transform.Find("Text").GetComponent<TextMeshProUGUI>().text = "Restart";
 
 
@@ -284,7 +284,8 @@ public class GameManager : MonoBehaviour
             healthbar.SetActive(true);
             powerUps.SetActive(true);
             artImage.SetActive(false);
-            dialogBox.SetActive(false);
+            dialogBox.SetActive(false);
+            Time.timeScale = 1;
         }
     }
 
@@ -315,8 +316,7 @@ public class GameManager : MonoBehaviour
         healthbar.SetActive(false);
         powerUps.SetActive(false);
         HideDialog();
-
-
+        Time.timeScale = 0;
 
     }
 
diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset
index ddcee3f..af632a4 100644
--- a/MuseumGame/UserSettings/EditorUserSettings.asset
+++ b/MuseumGame/UserSettings/EditorUserSettings.asset
@@ -30,10 +30,10 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
+      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650