From b67f90fb29f6174b88eef696de0d63d82e318f56 Mon Sep 17 00:00:00 2001 From: thoopchuk26 Date: Mon, 3 May 2021 12:56:18 -0500 Subject: [PATCH] Auto stash before merge of "main" and "origin/main" --- MuseumGame/Assets/Scripts/GameManager.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index b9c9ed0..e2e2590 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -192,11 +192,6 @@ public class GameManager : MonoBehaviour powerUps.SetActive(true); pauseButton.SetActive(true); disableAllPowerups(); - - for (int i = 0; i < artActivated.Length; i++){ - artActivated[i] = false; - } - player.SetActive(true); LoadLevel(sceneToLoad, positionToLoad); title.GetComponent().text = "Paused"; @@ -321,7 +316,8 @@ public class GameManager : MonoBehaviour healthbar.SetActive(false); powerUps.SetActive(false); HideDialog(); - Time.timeScale = 0; + + }