From d326d57082dfbd78e93550377cb7f12cf5f5af69 Mon Sep 17 00:00:00 2001 From: Ivy Date: Thu, 29 Apr 2021 10:25:15 -0500 Subject: [PATCH] Added disable powerups function --- MuseumGame/Assets/Scenes/MainMenu.unity | 19 +++--- MuseumGame/Assets/Scripts/GameManager.cs | 61 +++++++++++++++---- MuseumGame/ProjectSettings/TagManager.asset | 1 + .../UserSettings/EditorUserSettings.asset | 19 ++++-- 4 files changed, 74 insertions(+), 26 deletions(-) diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index 536ed1d..0ed804b 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -1084,17 +1084,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829770868} m_CullTransparentMesh: 1 ---- !u!1 &830277152 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6644325902043065115, guid: 9add303577184004ab77878cb3cdcf57, type: 3} - m_PrefabInstance: {fileID: 1597355500} - m_PrefabAsset: {fileID: 0} --- !u!114 &830277153 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3455161703679244629, guid: 9add303577184004ab77878cb3cdcf57, type: 3} m_PrefabInstance: {fileID: 1597355500} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 830277152} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b9240bd39bca87438df56c58d013245, type: 3} @@ -2459,8 +2454,7 @@ MonoBehaviour: player: {fileID: 1831256037} dialogBox: {fileID: 1590398590} dialogText: {fileID: 127032239} - healtBar: {fileID: 830277152} - powerUps: {fileID: 1159971422} + healthbar: {fileID: 0} startButton: {fileID: 283377687} title: {fileID: 655160807} panel: {fileID: 182368510} @@ -2470,9 +2464,16 @@ MonoBehaviour: - Selma Blackburn Untitled n.d. Watercolor on paper 19.125 x 18.125 inches Windgate Museum of Art Collection artImage: {fileID: 1034874535} + powerUps: {fileID: 1159971422} + gliderPowerupButton: {fileID: 526643974} + boxPowerupButton: {fileID: 2130100238} + doubleJumpPowerupButton: {fileID: 184189969} + shrinkPowerupButton: {fileID: 974869911} + otherPowerupButton: {fileID: 847247611} + powerupText: {fileID: 829770868} obtainedPowerups: powerupStatus: - sceneToLoad: '""' + sceneToLoad: Spawn music: - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} - {fileID: 8300000, guid: 327636dbdcb895b478ac95086f383d8a, type: 3} diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index bad9af0..8b6b12a 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -18,16 +18,25 @@ public class GameManager : MonoBehaviour public GameObject player; public GameObject dialogBox; public GameObject dialogText; - public GameObject healtBar; - public GameObject powerUps; + public GameObject healthbar; public GameObject startButton; public GameObject title; public GameObject panel; public Sprite[] art; public string[] artInfo; - public GameObject artImage; - + public GameObject artImage; + + + public GameObject powerUps; + public GameObject gliderPowerupButton; + public GameObject boxPowerupButton; + public GameObject doubleJumpPowerupButton; + public GameObject shrinkPowerupButton; + public GameObject otherPowerupButton; + public GameObject powerupText; + + private AudioSource sound; @@ -49,6 +58,7 @@ public class GameManager : MonoBehaviour DontDestroyOnLoad(canvas); DontDestroyOnLoad(events); DontDestroyOnLoad(player); + DontDestroyOnLoad(powerUps); } else @@ -57,6 +67,7 @@ public class GameManager : MonoBehaviour Destroy(canvas); Destroy(events); Destroy(player); + Destroy(powerUps); } } // Start is called before the first frame update @@ -176,20 +187,46 @@ public class GameManager : MonoBehaviour } public void PlayButton() { - Debug.Log("s"); startButton.SetActive(false); title.SetActive(false); - panel.SetActive(false); - LoadLevel("DogBoss", new Vector3(0, 0, 0)); - healtBar.SetActive(true); - powerUps.SetActive(true); + panel.SetActive(false); + healthbar.SetActive(true); + powerUps.SetActive(true); + disableAllPowerups(); + LoadLevel(sceneToLoad, new Vector3(0, 0, 0)); + + } public GameObject GetEnemyHealthBar() { return enemyHealthBar; } + + public void disablePowerup(int powerupID) + { + if (powerupID >= 0 && powerupID <= 4) + { + var powerup = powerUps.gameObject.transform.GetChild(powerupID); + powerup.gameObject.SetActive(false); + } + } + + + public void enablePowerup(int powerupID) + { + if (powerupID >= 0 && powerupID <= 4) + { + var powerup = powerUps.gameObject.transform.GetChild(powerupID); + powerup.gameObject.SetActive(true); + } + } + + public void disableAllPowerups() + { + for(int i=0; i<=4; i++) + { + disablePowerup(i); + } + } } -// } -//} -//} diff --git a/MuseumGame/ProjectSettings/TagManager.asset b/MuseumGame/ProjectSettings/TagManager.asset index b445cd2..ca58d51 100644 --- a/MuseumGame/ProjectSettings/TagManager.asset +++ b/MuseumGame/ProjectSettings/TagManager.asset @@ -11,6 +11,7 @@ TagManager: - GliderPowerup - Dog - Projectile + - EnemyPlatform layers: - Default - TransparentFX diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index acca505..9998721 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,24 +6,33 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + flags: 0 + RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 vcSharedLogLevel: