From 1ac5a21503f77862804b884e2b67e88a472fc59a Mon Sep 17 00:00:00 2001 From: thoopchuk26 Date: Mon, 3 May 2021 12:56:18 -0500 Subject: [PATCH] Revert "Auto stash before merge of "main" and "origin/main"" This reverts commit b67f90fb29f6174b88eef696de0d63d82e318f56. --- MuseumGame/Assets/Scripts/GameManager.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index e2e2590..b2df9e2 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -192,6 +192,8 @@ public class GameManager : MonoBehaviour powerUps.SetActive(true); pauseButton.SetActive(true); disableAllPowerups(); + artActivated = new bool[artActivated.Length]; //Resets to [false,...] + player.SetActive(true); LoadLevel(sceneToLoad, positionToLoad); title.GetComponent().text = "Paused"; @@ -284,7 +286,7 @@ public class GameManager : MonoBehaviour healthbar.SetActive(true); powerUps.SetActive(true); artImage.SetActive(false); - dialogBox.SetActive(false); + dialogBox.SetActive(false); Time.timeScale = 1; } } @@ -316,8 +318,7 @@ public class GameManager : MonoBehaviour healthbar.SetActive(false); powerUps.SetActive(false); HideDialog(); - - + Time.timeScale = 0; }