From 2f5c25ae0f3aa27ac81faa74016dc845b552a3ea Mon Sep 17 00:00:00 2001
From: Matthew Kalahiki <kalahikimw@hendrix.edu>
Date: Sun, 2 May 2021 14:36:34 -0500
Subject: [PATCH] fixed conflict

---
 MuseumGame/Assets/Scripts/GameManager.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs
index e615a03..a2dd508 100644
--- a/MuseumGame/Assets/Scripts/GameManager.cs
+++ b/MuseumGame/Assets/Scripts/GameManager.cs
@@ -12,7 +12,7 @@ public class GameManager : MonoBehaviour
 {
     public static GameManager Instance { get; private set; }
 
-    public GameObject foregroundCanvas;
+    public GameObject foregroundCanvas;
     public GameObject backgroundCanvas;
 
     public GameObject spriteToFade;
@@ -74,7 +74,7 @@ public class GameManager : MonoBehaviour
         {
             Instance = this;
             DontDestroyOnLoad(gameObject);
-            DontDestroyOnLoad(foregroundCanvas);
+            DontDestroyOnLoad(foregroundCanvas);
             DontDestroyOnLoad(backgroundCanvas);
             DontDestroyOnLoad(events);
             DontDestroyOnLoad(player);
@@ -82,7 +82,7 @@ public class GameManager : MonoBehaviour
         else
         {
             Destroy(gameObject);
-            Destroy(foregroundCanvas);
+            Destroy(foregroundCanvas);
             Destroy(backgroundCanvas);
 
             Destroy(events);
@@ -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++)
@@ -180,9 +180,9 @@ public class GameManager : MonoBehaviour
     public void HideDialog()
     {
         dialogBox.SetActive(false);
-        artImage.SetActive(false);
-        //hideGalleryButton.SetActive(false);
-
+        artImage.SetActive(false);
+        //hideGalleryButton.SetActive(false);
+
     }
 
 
@@ -196,7 +196,7 @@ public class GameManager : MonoBehaviour
         healthbar.SetActive(true);
         powerUps.SetActive(true);
         pauseButton.SetActive(true);
-        disableAllPowerups();
+        disableAllPowerups();
         player.SetActive(true);
         LoadLevel(sceneToLoad, positionToLoad);
         disableAllPowerups();
@@ -318,9 +318,9 @@ public class GameManager : MonoBehaviour
         healthbar.SetActive(false);
         powerUps.SetActive(false);
         HideDialog();
-
-
-
+
+
+
     }
 
     public bool isPaused()