Auto stash before merge of "main" and "origin/main"

4 years ago · b67f90fb29
parent cd3c0289a4
commit b67f90fb29
1 changed files with 2 additions and 6 deletions
--- 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<TextMeshProUGUI>().text = "Paused";
@ -321,7 +316,8 @@ public class GameManager : MonoBehaviour
        healthbar.SetActive(false);
        powerUps.SetActive(false);
        HideDialog();
-        Time.timeScale = 0;
+
+

    }