Removed MuseumArt.cs, made disabling art disable colliders

MuseumGame/Assets/Scenes/Museum/Museum.unity

@@ -123,52 +123,6 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &2613657
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2613659}
-  - component: {fileID: 2613658}
-  m_Layer: 0
-  m_Name: Artwork
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &2613658
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2613657}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ca8106578153b4c4cb86229f1b0c975f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  artId: 0
-  artworkToEnable: {fileID: 1783916102}
---- !u!4 &2613659
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2613657}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 83.236404, y: 2.2672524, z: -32.17468}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1783916103}
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &73552633
 GameObject:
   m_ObjectHideFlags: 0
@@ -17813,11 +17767,11 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 2613659}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_LocalScale.x
@@ -17829,15 +17783,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -77.486404
+      value: 5.75
       objectReference: {fileID: 0}
     - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -4.0172524
+      value: -1.75
       objectReference: {fileID: 0}
     - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 33.17468
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_LocalRotation.w
@@ -17867,26 +17821,20 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7047329146721016595, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_Name
       value: Blackburn-Abstract#2 Pixelart
       objectReference: {fileID: 0}
     - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
---- !u!1 &1783916102 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-  m_PrefabInstance: {fileID: 1783916101}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &1783916103 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-  m_PrefabInstance: {fileID: 1783916101}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1935037035
 GameObject:
   m_ObjectHideFlags: 0

MuseumGame/Assets/Scripts/Art.cs

@@ -5,17 +5,21 @@ using UnityEngine;
 public class Art : MonoBehaviour
 {
     public int index;
-
+    public SpriteRenderer spriteRenderer;
+    public BoxCollider2D collider;
     // Start is called before the first frame update
     void Start()
     {
-        
+        spriteRenderer = GetComponent<SpriteRenderer>();
+        collider = GetComponent<BoxCollider2D>();
     }
 
     // Update is called once per frame
     void Update()
     {
-        GetComponent<SpriteRenderer>().enabled = GameManager.Instance.IsArtActivated(index);
+        var status = GameManager.Instance.IsArtActivated(index);
+        spriteRenderer.enabled = status;
+        collider.enabled = status;
     }
     private void OnTriggerEnter2D(Collider2D collision)
     {

MuseumGame/Assets/Scripts/GameManager.cs

@@ -37,7 +37,6 @@ public class GameManager : MonoBehaviour
     public GameObject scrollSpace;
     public GameObject hideGalleryButton;
     private GameObject[] galleryArt;
-    public bool[] enabledArt;
     private GameObject[] galleryDialog;
 
     public Sprite[] powerupSprites;
@@ -67,7 +66,7 @@ public class GameManager : MonoBehaviour
 
     private bool paused = false;
 
-    private bool[] artActivated;
+    public bool[] artActivated;
 
     void Awake()
     {
@@ -100,15 +99,9 @@ public class GameManager : MonoBehaviour
          }*/
         
         sound = GetComponent<AudioSource>();
-        enabledArt = new bool[art.Length];
         //GameManager.Instance.enablePowerup(3);
         //GameManager.Instance.enablePowerup(3);
-        artActivated = new bool[art.Length];
-
-        for (int i = 0; i < art.Length; i++)
-        {
-            artActivated[i] = false;
-        }
+        artActivated = new bool[art.Length]; //new bool[] always starts off as false
     }
 
     // Update is called once per frame

MuseumGame/Assets/Scripts/MuseumArt.cs

@@ -1,20 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class MuseumArt : MonoBehaviour
-{
-    public int artId = 0;
-    public GameObject artworkToEnable;
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        artworkToEnable.SetActive(GameManager.Instance.enabledArt[artId]); 
-    }
-}

MuseumGame/Assets/Scripts/MuseumArt.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ca8106578153b4c4cb86229f1b0c975f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

MuseumGame/UserSettings/EditorUserSettings.asset

@@ -6,35 +6,27 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
       flags: 0
     RecentlyUsedScenePath-8: