fixed conflict

4 years ago · 2f5c25ae0f
parent 62dfd0b748
commit 2f5c25ae0f
1 changed files with 11 additions and 11 deletions
--- a/MuseumGame/Assets/Scripts/GameManager.cs
+++ b/MuseumGame/Assets/Scripts/GameManager.cs
@ -100,7 +100,7 @@ public class GameManager : MonoBehaviour
        
        sound = GetComponent<AudioSource>();
        //GameManager.Instance.enablePowerup(3);
-        GameManager.Instance.enablePowerup(3);
+        //GameManager.Instance.enablePowerup(3);
        artActivated = new bool[art.Length];

        for (int i = 0; i < art.Length; i++)