From 375cecb736f65fc8f66891a711c5a758dad77f57 Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Sun, 2 May 2021 14:58:26 -0500 Subject: [PATCH] art only visible in museum once collected --- MuseumGame/Assets/Scripts/Art.cs | 2 +- MuseumGame/Assets/Scripts/GameManager.cs | 5 +++++ .../UserSettings/EditorUserSettings.asset | 19 ++++++++----------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/MuseumGame/Assets/Scripts/Art.cs b/MuseumGame/Assets/Scripts/Art.cs index 665d05f..5d3a6d4 100644 --- a/MuseumGame/Assets/Scripts/Art.cs +++ b/MuseumGame/Assets/Scripts/Art.cs @@ -15,7 +15,7 @@ public class Art : MonoBehaviour // Update is called once per frame void Update() { - + GetComponent().enabled = GameManager.Instance.IsArtActivated(index); } private void OnTriggerEnter2D(Collider2D collision) { diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index a2dd508..81cac3e 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -300,11 +300,16 @@ public class GameManager : MonoBehaviour { hideGalleryButton.SetActive(true); StartDialog(artIndex); + artActivated[artIndex] = true; powerIndex = powerupIndex; /* artImage.GetComponent().SetNativeSize(); artImage.GetComponent().anchoredPosition = new Vector2(-artImage.GetComponent().sprite.rect.width / 2, 0);*/ } + public bool IsArtActivated(int artIndex) + { + return artActivated[artIndex]; + } public void PauseButton() { diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 9de0599..cec3240 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,33 +6,30 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b + value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 vcSharedLogLevel: