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().text = "Menu"; + title.GetComponent().text = "Paused"; startButton.transform.Find("Text").GetComponent().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