diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index f57f340..197d168 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -2031,8 +2031,8 @@ GameObject: m_Component: - component: {fileID: 1101410979} - component: {fileID: 1101410978} - - component: {fileID: 1101410977} - component: {fileID: 1101410976} + - component: {fileID: 1101410977} m_Layer: 0 m_Name: Square m_TagString: Untagged @@ -2075,9 +2075,10 @@ MonoBehaviour: m_GameObject: {fileID: 1101410975} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2121bebb79696c742bd6ac9f9a701c81, type: 3} + m_Script: {fileID: 11500000, guid: b211c5a33678e544f8a025eda8fe81eb, type: 3} m_Name: m_EditorClassIdentifier: + index: 3 --- !u!212 &1101410978 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index 8782dd8..cfd9726 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -128,247 +128,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3367381690712633762, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} m_PrefabInstance: {fileID: 3367381690770450957} m_PrefabAsset: {fileID: 0} ---- !u!1 &154104103 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381690712633762, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 154104104} - m_Layer: 5 - m_Name: Box - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &154104104 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381690712633789, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 154104103} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 325321419} - m_Father: {fileID: 1545666263} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &176759822 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 176759823} - - component: {fileID: 176759826} - - component: {fileID: 176759825} - - component: {fileID: 176759824} - m_Layer: 5 - m_Name: HideGallery - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &176759823 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 176759822} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1148340315} - m_Father: {fileID: 937695572} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.0000038147} - m_SizeDelta: {x: 260.7415, y: 263.5901} - m_AnchoredPosition: {x: -1.9000244, y: -16.000015} - m_SizeDelta: {x: 125, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &176759824 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381690712633788, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 176759822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 176759825} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1874083437} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: HideGallery - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &176759825 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 176759822} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 939281478bb81e743b4a2aa112fd6dbb, type: 2} - m_sharedMaterial: {fileID: 447336955975408638, guid: 939281478bb81e743b4a2aa112fd6dbb, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278255884 - m_fontColor: {r: 0.047169805, g: 0.0028479854, b: 0.0028479854, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &127032242 - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &176759826 CanvasRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381690712633791, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 176759822} + m_GameObject: {fileID: 1924144075} m_CullTransparentMesh: 1 --- !u!1 &154104103 GameObject: @@ -419,7 +185,7 @@ GameObject: - component: {fileID: 176759825} - component: {fileID: 176759824} m_Layer: 5 - m_Name: HideGallery + m_Name: CloseButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -491,7 +257,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1874083437} m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: HideGallery + m_MethodName: CloseButton m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2896,72 +2662,14 @@ MonoBehaviour: m_Calls: [] --- !u!1 &1590398590 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381689256731763, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} m_CorrespondingSourceObject: {fileID: 3367381689256731763, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} m_PrefabInstance: {fileID: 3367381690770450957} m_PrefabAsset: {fileID: 0} --- !u!224 &1590398591 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381689256731762, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} m_CorrespondingSourceObject: {fileID: 3367381689256731762, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} m_PrefabInstance: {fileID: 3367381690770450957} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590398590} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 127032240} - m_Father: {fileID: 937695572} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 229.2138, y: -7.4669} - m_SizeDelta: {x: 286.9095, y: 263.5901} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1590398592 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381689256731789, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590398590} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.4392157} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1622af549545f1e4487371bb204ea114, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1590398593 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3367381689256731788, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} - m_PrefabInstance: {fileID: 3367381690770450957} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590398590} - m_CullTransparentMesh: 1 --- !u!1001 &1597355500 PrefabInstance: m_ObjectHideFlags: 0 @@ -3592,7 +3300,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.3 m_Pitch: 1 Loop: 0 Mute: 0 @@ -3696,6 +3404,7 @@ MonoBehaviour: dialogText: {fileID: 127032239} healthbar: {fileID: 830277152} startButton: {fileID: 283377687} + galleryButton: {fileID: 799432636} title: {fileID: 655160807} panel: {fileID: 182368510} art: @@ -3882,13 +3591,28 @@ MonoBehaviour: 16 x 53.5 inches - Windgate Museum of Art CollectionSteve ' + Windgate Museum of Art Collection ' artImage: {fileID: 1034874535} baseImage: {fileID: 4682637444930967783, guid: fd7c8c834cba8354683f87e1e4f89ec3, type: 3} baseDialog: {fileID: 3367381689256731763, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} scrollStuff: {fileID: 909612975} scrollSpace: {fileID: 392211211} hideGalleryButton: {fileID: 176759822} + powerupSprites: + - {fileID: 21300000, guid: b5b2b00149700420cb91ce2e6cd30049, type: 3} + - {fileID: 21300000, guid: 5fbb2a0418ebf4f489bf64f64d120396, type: 3} + - {fileID: 21300000, guid: 560ed191d91aae54c91c3a1422f08c94, type: 3} + - {fileID: 21300000, guid: fedbd5825a33346fa96498465bb740e7, type: 3} + - {fileID: 21300000, guid: e18fac868271ad74ab60e4ce846b1015, type: 3} + powerupInfo: + - Once activated, the Glider Powerup allows you to glide through the air and travel + farther before landing. + - Once activated, the Box Stack Powerup allows you to move certain boxes to your + convinience, providing cover from enemies. + - Once activated, the Double Jump Powerup allows you to jump twice before landing. + - Once activated, the Shrink Powerup shrinks you so you can fit in small places. + Deactivate the powerup to return to normal size. + - Once activated, Who knows? powerUps: {fileID: 1159971422} gliderPowerupButton: {fileID: 526643974} boxPowerupButton: {fileID: 2130100238} @@ -3916,6 +3640,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1924144075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1924144076} + - component: {fileID: 127032242} + m_Layer: 0 + m_Name: Recovery GameObject (127032242) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1924144076 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1924144075} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1941456385 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index bd18db7..3d03c00 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -9595,8 +9595,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} m_Name: m_EditorClassIdentifier: - LevelName: BossRoom - whereTo: {x: 15.28, y: -1.97, z: 0} + LevelName: Spawn + whereTo: {x: 0, y: 0, z: 0} --- !u!19719996 &277851820 TilemapCollider2D: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index 5f0796f..24a8d8e 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -20,6 +20,7 @@ public class GameManager : MonoBehaviour public GameObject dialogText; public GameObject healthbar; public GameObject startButton; + public GameObject galleryButton; public GameObject title; public GameObject panel; @@ -34,8 +35,10 @@ public class GameManager : MonoBehaviour public GameObject hideGalleryButton; private GameObject[] galleryArt; private GameObject[] galleryDialog; - + public Sprite[] powerupSprites; + [TextArea] + public string[] powerupInfo; public GameObject powerUps; public GameObject gliderPowerupButton; @@ -168,6 +171,7 @@ public class GameManager : MonoBehaviour public void PlayButton() { startButton.SetActive(false); + galleryButton.SetActive(false); title.SetActive(false); panel.SetActive(false); healthbar.SetActive(true); @@ -227,14 +231,29 @@ public class GameManager : MonoBehaviour scrollStuff.GetComponent().anchoredPosition = new Vector2(scrollStuff.GetComponent().anchoredPosition.x, (-scrollStuff.GetComponent().sizeDelta.y/2) + 150); } - public void HideGallery() + public void CloseButton() { - for (int i = 0; i < galleryArt.Length; i++) { - Destroy(galleryArt[i]); - Destroy(galleryDialog[i]); - scrollSpace.SetActive(false); - hideGalleryButton.SetActive(false); + if (scrollSpace.activeSelf) { + for (int i = 0; i < galleryArt.Length; i++) { + Destroy(galleryArt[i]); + Destroy(galleryDialog[i]); + scrollSpace.SetActive(false); + hideGalleryButton.SetActive(false); + } } + artImage.SetActive(false); + dialogBox.SetActive(false); + } + + public void PowerupReceived(int powerupIndex) + { + dialogBox.SetActive(true); + dialogText.GetComponent().text = "Congratulations! You received a new powerup! Click the powerup icon on the Powerup Pallet to activate the powerup. " + powerupInfo[powerupIndex]; + artImage.SetActive(true); + artImage.GetComponent().sprite = powerupSprites[powerupIndex]; + hideGalleryButton.SetActive(true); + /* artImage.GetComponent().SetNativeSize(); + artImage.GetComponent().anchoredPosition = new Vector2(-artImage.GetComponent().sprite.rect.width / 2, 0);*/ } public GameObject GetEnemyHealthBar() { diff --git a/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs b/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs index 2f700c9..4f8c617 100644 --- a/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs +++ b/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs @@ -20,6 +20,7 @@ public class GliderPowerupPickup : MonoBehaviour { Debug.Log("Glider Powerup Obtained"); GameManager.Instance.enablePowerup(0); + GameManager.Instance.PowerupReceived(0); Destroy(gameObject); } } diff --git a/MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs b/MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs new file mode 100644 index 0000000..44428ee --- /dev/null +++ b/MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PowerupPickup : MonoBehaviour +{ + public int index; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + private void OnTriggerEnter2D(Collider2D collision) + { + + GameManager.Instance.enablePowerup(index); + GameManager.Instance.PowerupReceived(index); + Destroy(gameObject); + } +} diff --git a/MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs.meta b/MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs.meta new file mode 100644 index 0000000..f3eed71 --- /dev/null +++ b/MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b211c5a33678e544f8a025eda8fe81eb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 9b5d265..ee0c568 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -9,24 +9,27 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 + value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + flags: 0 + RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 vcSharedLogLevel: