From 3b60583c767815b96b9a5bf22ef2487fb667bc60 Mon Sep 17 00:00:00 2001 From: myondev Date: Mon, 23 Feb 2026 06:26:50 -0800 Subject: [PATCH] alotta upgrade stuff but no upgrades --- Assets/Prefabs/Enemy.prefab | 4 + Assets/Prefabs/MagicMissile.prefab | 5 +- Assets/Prefabs/Main.prefab | 443 ++++++ Assets/Prefabs/Main.prefab.meta | 7 + Assets/Prefabs/MasterSpark.prefab | 7 +- Assets/Prefabs/Nondirectional Laser.prefab | 3 +- Assets/Prefabs/StarProjectile.prefab | 90 +- Assets/Prefabs/TemplateStoredUpgrade.prefab | 479 ++++++ .../Prefabs/TemplateStoredUpgrade.prefab.meta | 7 + Assets/Prefabs/UpgradePickup.prefab | 310 ++++ Assets/Prefabs/UpgradePickup.prefab.meta | 7 + Assets/Scenes/Game.unity | 1414 ++++++++++++++++- Assets/Scripts/Abilities/AbilityHotbarIcon.cs | 40 + .../Abilities/AbilityHotbarIcon.cs.meta | 2 + Assets/Scripts/Abilities/AbilityManager.cs | 27 +- Assets/Scripts/Abilities/AbilityUIHandler.cs | 34 +- .../Abilities/PlayerAbilities/Laser.cs | 1 + .../PlayerAbilities/NondirectionalLaser.cs | 2 + .../PlayerAbilities/PlayerAbility.cs | 2 +- .../Abilities/Upgrades/UpgradePickup.cs | 10 - Assets/Scripts/Entities/Enemy.cs | 5 +- .../Scripts/Entities/MarisaAbilityHandler.cs | 15 + Assets/Scripts/Items/ItemPickup.cs | 8 +- Assets/Scripts/Items/ItemPickupRange.cs | 5 +- Assets/Scripts/Items/PowerPickup.cs | 4 +- Assets/Scripts/Items/UpgradePickup.cs | 11 + .../Upgrades => Items}/UpgradePickup.cs.meta | 0 Assets/Scripts/Items/UpgradePickupEffects.cs | 15 + .../Items/UpgradePickupEffects.cs.meta | 2 + Assets/Scripts/StoredAbilityUpgradeUI.cs | 17 + Assets/Scripts/StoredAbilityUpgradeUI.cs.meta | 2 + Assets/Scripts/UIHandler.cs | 14 + Assets/Scripts/UIHandler.cs.meta | 2 + ProjectSettings/Physics2DSettings.asset | 2 +- ProjectSettings/TagManager.asset | 2 +- 35 files changed, 2937 insertions(+), 61 deletions(-) create mode 100644 Assets/Prefabs/Main.prefab create mode 100644 Assets/Prefabs/Main.prefab.meta create mode 100644 Assets/Prefabs/TemplateStoredUpgrade.prefab create mode 100644 Assets/Prefabs/TemplateStoredUpgrade.prefab.meta create mode 100644 Assets/Prefabs/UpgradePickup.prefab create mode 100644 Assets/Prefabs/UpgradePickup.prefab.meta create mode 100644 Assets/Scripts/Abilities/AbilityHotbarIcon.cs create mode 100644 Assets/Scripts/Abilities/AbilityHotbarIcon.cs.meta delete mode 100644 Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs create mode 100644 Assets/Scripts/Items/UpgradePickup.cs rename Assets/Scripts/{Abilities/Upgrades => Items}/UpgradePickup.cs.meta (100%) create mode 100644 Assets/Scripts/Items/UpgradePickupEffects.cs create mode 100644 Assets/Scripts/Items/UpgradePickupEffects.cs.meta create mode 100644 Assets/Scripts/StoredAbilityUpgradeUI.cs create mode 100644 Assets/Scripts/StoredAbilityUpgradeUI.cs.meta create mode 100644 Assets/Scripts/UIHandler.cs create mode 100644 Assets/Scripts/UIHandler.cs.meta diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index 0a05c01..753551c 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -311,6 +311,10 @@ MonoBehaviour: - {fileID: 2490025746165144143} forwardPercent: 60 strafePercent: 40 + possibleDrops: + - droppedUpgrade: {fileID: 11400000, guid: 6fe34d7ec95c2ce1fac0727c553b5f0b, type: 2} + chance: 100 + pickupObject: {fileID: 862999616518891837, guid: a61100612a8d074668a1c7407caeb226, type: 3} --- !u!1 &7992963443241331386 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/MagicMissile.prefab b/Assets/Prefabs/MagicMissile.prefab index d71d0b6..d7432ac 100644 --- a/Assets/Prefabs/MagicMissile.prefab +++ b/Assets/Prefabs/MagicMissile.prefab @@ -49,8 +49,9 @@ MonoBehaviour: thisPlayer: {fileID: 0} canCooldown: 1 cooldown: 0.2 - power: 0 - projectileCount: 12 + currentCooldown: 0 + power: 10 + projectileCount: 1 pierceAmount: 0 accuracy: 1 bulletLifetime: 3 diff --git a/Assets/Prefabs/Main.prefab b/Assets/Prefabs/Main.prefab new file mode 100644 index 0000000..12e05e4 --- /dev/null +++ b/Assets/Prefabs/Main.prefab @@ -0,0 +1,443 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4047471004172482373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3595604515381026928} + - component: {fileID: 4672323416651228388} + - component: {fileID: 8457928522181752785} + - component: {fileID: 3967213263405647408} + m_Layer: 5 + m_Name: Main + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3595604515381026928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4047471004172482373} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1449508968750028431} + - {fileID: 2758633500608765212} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4672323416651228388 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4047471004172482373} + m_CullTransparentMesh: 1 +--- !u!114 &8457928522181752785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4047471004172482373} + 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: 0.9528302, g: 0.9528302, b: 0.9528302, 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_Sprite: {fileID: 10907, 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!114 &3967213263405647408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4047471004172482373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3} + m_Name: + m_EditorClassIdentifier: + overlay: {fileID: 5765724299595858927} + cooldownText: {fileID: 562573406507960318} + text: {fileID: 7179150960317052887} +--- !u!1 &5765724299595858927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2758633500608765212} + - component: {fileID: 4771244295907069562} + - component: {fileID: 1268280585873495723} + m_Layer: 5 + m_Name: CooldownOverlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2758633500608765212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5765724299595858927} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5749448899681371347} + m_Father: {fileID: 3595604515381026928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4771244295907069562 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5765724299595858927} + m_CullTransparentMesh: 1 +--- !u!114 &1268280585873495723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5765724299595858927} + 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: 0.11320752, g: 0.11320752, b: 0.11320752, a: 0.95686275} + 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: 10907, 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!1 &5812690053708579647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5749448899681371347} + - component: {fileID: 8178049045515737004} + - component: {fileID: 562573406507960318} + m_Layer: 5 + m_Name: TimerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5749448899681371347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5812690053708579647} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2758633500608765212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8178049045515737004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5812690053708579647} + m_CullTransparentMesh: 1 +--- !u!114 &562573406507960318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5812690053708579647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: 60 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 72 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 0 + 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!1 &5826332855204939817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1449508968750028431} + - component: {fileID: 2815229545458732112} + - component: {fileID: 7179150960317052887} + m_Layer: 5 + m_Name: AbilityNamePlaceholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1449508968750028431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5826332855204939817} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3595604515381026928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2815229545458732112 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5826332855204939817} + m_CullTransparentMesh: 1 +--- !u!114 &7179150960317052887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5826332855204939817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Magic Missile + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 0 + 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} diff --git a/Assets/Prefabs/Main.prefab.meta b/Assets/Prefabs/Main.prefab.meta new file mode 100644 index 0000000..60509b8 --- /dev/null +++ b/Assets/Prefabs/Main.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76fcc84ad57e7fa44a8b2ea9c59842ed +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/MasterSpark.prefab b/Assets/Prefabs/MasterSpark.prefab index 94f8632..8f4e7f8 100644 --- a/Assets/Prefabs/MasterSpark.prefab +++ b/Assets/Prefabs/MasterSpark.prefab @@ -45,9 +45,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: abilityName: Master Spark + abilityIcon: {fileID: 0} thisPlayer: {fileID: 0} canCooldown: 1 - cooldown: 1 + cooldown: 60 + currentCooldown: 0 + power: 0 + projectileCount: 0 length: 100 width: 2 duration: 4 @@ -56,4 +60,3 @@ MonoBehaviour: offset: 0.5 enemyList: [] damageDebounceTime: 0.5 - damage: 10 diff --git a/Assets/Prefabs/Nondirectional Laser.prefab b/Assets/Prefabs/Nondirectional Laser.prefab index 0556e21..a945cea 100644 --- a/Assets/Prefabs/Nondirectional Laser.prefab +++ b/Assets/Prefabs/Nondirectional Laser.prefab @@ -49,7 +49,8 @@ MonoBehaviour: abilityIcon: {fileID: 0} thisPlayer: {fileID: 0} canCooldown: 1 - cooldown: 4 + cooldown: 30 + currentCooldown: 0 power: 0 projectileCount: 0 length: 10 diff --git a/Assets/Prefabs/StarProjectile.prefab b/Assets/Prefabs/StarProjectile.prefab index 527ff3d..25e7638 100644 --- a/Assets/Prefabs/StarProjectile.prefab +++ b/Assets/Prefabs/StarProjectile.prefab @@ -1,5 +1,92 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4461949207594616433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2833928912096437089} + - component: {fileID: 8160289985054989337} + m_Layer: 7 + m_Name: ProjectileSprite (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2833928912096437089 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4461949207594616433} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.85, y: 0.85, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6967225298403824989} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8160289985054989337 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4461949207594616433} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 4815476061570213978, guid: 04471894fe003265dad2be86950ab969, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4806008101797467748 GameObject: m_ObjectHideFlags: 0 @@ -155,7 +242,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2833928912096437089} m_Father: {fileID: 8258649627709469250} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8600968611477201350 diff --git a/Assets/Prefabs/TemplateStoredUpgrade.prefab b/Assets/Prefabs/TemplateStoredUpgrade.prefab new file mode 100644 index 0000000..f8f1d92 --- /dev/null +++ b/Assets/Prefabs/TemplateStoredUpgrade.prefab @@ -0,0 +1,479 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6578466268571578687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4885328024197142686} + - component: {fileID: 6125679206875171742} + - component: {fileID: 3457500454389425105} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4885328024197142686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6578466268571578687} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6849360599043087631} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 50, y: 0.7} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6125679206875171742 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6578466268571578687} + m_CullTransparentMesh: 1 +--- !u!114 &3457500454389425105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6578466268571578687} + 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: 1} + 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: 0} + 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!1 &7440556131954709033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7764682926458295462} + - component: {fileID: 7904669694422582500} + m_Layer: 5 + m_Name: TemplateStoredUpgrade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7764682926458295462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7440556131954709033} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6849360599043087631} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7904669694422582500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7440556131954709033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b370a84d98c02cd8aac5802018918417, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 3457500454389425105} + nameUI: {fileID: 582792873287932290} + countUI: {fileID: 2192342825804493328} +--- !u!1 &8302463801907023498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5935949832609022443} + - component: {fileID: 616077177540882472} + - component: {fileID: 2192342825804493328} + m_Layer: 5 + m_Name: Count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5935949832609022443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8302463801907023498} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6849360599043087631} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -20, y: 15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &616077177540882472 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8302463801907023498} + m_CullTransparentMesh: 1 +--- !u!114 &2192342825804493328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8302463801907023498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: x20 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 18.55 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 0 + 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!1 &8729639386077600260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6012504599924553735} + - component: {fileID: 3337734802317541866} + - component: {fileID: 582792873287932290} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6012504599924553735 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8729639386077600260} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6849360599043087631} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 50, y: 30} + m_SizeDelta: {x: -100, y: -60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3337734802317541866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8729639386077600260} + m_CullTransparentMesh: 1 +--- !u!114 &582792873287932290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8729639386077600260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Upgrade Name + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 18 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 36 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 0 + 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!1 &9219280510241862026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6849360599043087631} + - component: {fileID: 1168130044032811579} + - component: {fileID: 3980257825772120554} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6849360599043087631 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219280510241862026} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4885328024197142686} + - {fileID: 6012504599924553735} + - {fileID: 5935949832609022443} + m_Father: {fileID: 7764682926458295462} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1168130044032811579 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219280510241862026} + m_CullTransparentMesh: 1 +--- !u!114 &3980257825772120554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219280510241862026} + 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: 0, g: 0, b: 0, a: 0.7019608} + 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: 10907, 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 diff --git a/Assets/Prefabs/TemplateStoredUpgrade.prefab.meta b/Assets/Prefabs/TemplateStoredUpgrade.prefab.meta new file mode 100644 index 0000000..587fde6 --- /dev/null +++ b/Assets/Prefabs/TemplateStoredUpgrade.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4af6aa94cacc76b58b61e239461992e0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UpgradePickup.prefab b/Assets/Prefabs/UpgradePickup.prefab new file mode 100644 index 0000000..add3776 --- /dev/null +++ b/Assets/Prefabs/UpgradePickup.prefab @@ -0,0 +1,310 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &320108835252486310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6695468453195450238} + - component: {fileID: 862999616518891837} + - component: {fileID: 3111937212904179460} + - component: {fileID: 1020142841384871867} + m_Layer: 8 + m_Name: UpgradePickup + m_TagString: Friendly + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6695468453195450238 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320108835252486310} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8871310553115399125} + - {fileID: 8606734855318315670} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &862999616518891837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320108835252486310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 414126e6ddc5f8085af89e294a8deb38, type: 3} + m_Name: + m_EditorClassIdentifier: + inRange: 0 + rb: {fileID: 1020142841384871867} + speed: 2 + upgradeDropped: {fileID: 11400000, guid: 6fe34d7ec95c2ce1fac0727c553b5f0b, type: 2} +--- !u!212 &3111937212904179460 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320108835252486310} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &1020142841384871867 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320108835252486310} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!1 &3859027828621014479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8871310553115399125} + - component: {fileID: 7493811894130617355} + - component: {fileID: 2954572706530623094} + m_Layer: 8 + m_Name: PickupRange + m_TagString: Friendly + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8871310553115399125 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3859027828621014479} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6695468453195450238} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &7493811894130617355 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3859027828621014479} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 2.5 +--- !u!114 &2954572706530623094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3859027828621014479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed6160da3b86db81b18fdaf0abf65da, type: 3} + m_Name: + m_EditorClassIdentifier: + thisItem: {fileID: 862999616518891837} +--- !u!1 &7404342011389495795 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8606734855318315670} + - component: {fileID: 8438988706587578373} + - component: {fileID: 3043789530102209968} + m_Layer: 8 + m_Name: Item + m_TagString: Friendly + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8606734855318315670 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7404342011389495795} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6695468453195450238} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &8438988706587578373 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7404342011389495795} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &3043789530102209968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7404342011389495795} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3826d3871547e566aa448bea0f340014, type: 3} + m_Name: + m_EditorClassIdentifier: + thisPickup: {fileID: 862999616518891837} diff --git a/Assets/Prefabs/UpgradePickup.prefab.meta b/Assets/Prefabs/UpgradePickup.prefab.meta new file mode 100644 index 0000000..224558b --- /dev/null +++ b/Assets/Prefabs/UpgradePickup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a61100612a8d074668a1c7407caeb226 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 0f10653..8f9504e 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -221,6 +221,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 106799867} m_CullTransparentMesh: 1 +--- !u!1 &161505811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 161505812} + - component: {fileID: 161505814} + - component: {fileID: 161505813} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &161505812 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161505811} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1581615297} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &161505813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161505811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: X + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 0 + 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 &161505814 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161505811} + m_CullTransparentMesh: 1 --- !u!1 &223361740 GameObject: m_ObjectHideFlags: 0 @@ -493,6 +629,151 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 289338508} m_CullTransparentMesh: 1 +--- !u!1 &342414423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 342414424} + - component: {fileID: 342414427} + - component: {fileID: 342414426} + - component: {fileID: 342414425} + m_Layer: 5 + m_Name: OpenAbilityUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &342414424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342414423} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 944240574} + m_Father: {fileID: 1935311237} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -35} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &342414425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342414423} + 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: 342414426} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1935311238} + m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp + m_MethodName: ShowUI + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1676793495} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1935311238} + m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp + m_MethodName: HideUI + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 342414423} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &342414426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342414423} + 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: 1} + 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: 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 &342414427 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342414423} + m_CullTransparentMesh: 1 --- !u!1 &344366129 GameObject: m_ObjectHideFlags: 0 @@ -689,6 +970,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3} + propertyPath: mainIcon + value: + objectReference: {fileID: 8557355471054574495} + - target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3} + propertyPath: spellAIcon + value: + objectReference: {fileID: 2040234423} + - target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3} + propertyPath: spellBIcon + value: + objectReference: {fileID: 2065550206} + - target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3} + propertyPath: secondaryIcon + value: + objectReference: {fileID: 1509689679} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1587,37 +1884,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641813897} m_CullTransparentMesh: 1 ---- !u!1 &689402300 -GameObject: +--- !u!1001 &689507106 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 689402301} - m_Layer: 0 - m_Name: Pickup - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &689402301 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 689402300} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.4307132, y: -0.1515338, z: 0.6842527} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5007058640176408060} + m_Modifications: + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4047471004172482373, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Name + value: SpellA + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} +--- !u!224 &689507107 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 689507106} + m_PrefabAsset: {fileID: 0} --- !u!1 &720841234 GameObject: m_ObjectHideFlags: 0 @@ -2550,6 +2918,142 @@ MonoBehaviour: counterUI: {fileID: 1976329135} upgradeImage: {fileID: 905335571} thisAbilityUpgrade: {fileID: 0} +--- !u!1 &944240573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 944240574} + - component: {fileID: 944240576} + - component: {fileID: 944240575} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &944240574 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944240573} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 342414424} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &944240575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944240573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Abilties + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 0 + 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 &944240576 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944240573} + m_CullTransparentMesh: 1 --- !u!1 &1048274874 GameObject: m_ObjectHideFlags: 0 @@ -2984,6 +3488,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1202518526} m_CullTransparentMesh: 1 +--- !u!1 &1205925643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1205925644} + - component: {fileID: 1205925646} + - component: {fileID: 1205925645} + m_Layer: 5 + m_Name: InventoryPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1205925644 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205925643} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2139647019} + - {fileID: 1982511464} + m_Father: {fileID: 1676793496} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -180, y: 0} + m_SizeDelta: {x: 320, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1205925645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205925643} + 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: 0.14150941, g: 0.14150941, b: 0.14150941, a: 0.8156863} + 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: 10907, 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 &1205925646 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205925643} + m_CullTransparentMesh: 1 --- !u!1 &1233543068 GameObject: m_ObjectHideFlags: 0 @@ -4102,6 +4683,121 @@ MonoBehaviour: - {fileID: 106799869} - {fileID: 1877212723} playerAbilityHandler: {fileID: 394036756} + upgradeGrid: {fileID: 1982511464} + templateStoredUpgradeUI: {fileID: 7904669694422582500, guid: 4af6aa94cacc76b58b61e239461992e0, type: 3} +--- !u!1001 &1509689677 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5007058640176408060} + m_Modifications: + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4047471004172482373, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Name + value: Secondary + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} +--- !u!224 &1509689678 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 1509689677} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1509689679 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 1509689677} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1527669742 GameObject: m_ObjectHideFlags: 0 @@ -4438,6 +5134,151 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1556596338} m_CullTransparentMesh: 1 +--- !u!1 &1581615296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1581615297} + - component: {fileID: 1581615300} + - component: {fileID: 1581615299} + - component: {fileID: 1581615298} + m_Layer: 5 + m_Name: CloseButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1581615297 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1581615296} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 161505812} + m_Father: {fileID: 1676793496} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: -20} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1581615298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1581615296} + 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: 1581615299} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1935311238} + m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp + m_MethodName: HideUI + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1676793495} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1935311238} + m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp + m_MethodName: ShowUI + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 342414423} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1581615299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1581615296} + 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: 1} + 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: 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 &1581615300 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1581615296} + m_CullTransparentMesh: 1 --- !u!114 &1582287016 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5275979051295637757, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3} @@ -4649,6 +5490,8 @@ RectTransform: - {fileID: 1527669743} - {fileID: 905335570} - {fileID: 1535363993} + - {fileID: 1581615297} + - {fileID: 1205925644} m_Father: {fileID: 1493212142} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5081,6 +5924,7 @@ GameObject: - component: {fileID: 1935311236} - component: {fileID: 1935311235} - component: {fileID: 1935311234} + - component: {fileID: 1935311238} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -5164,6 +6008,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1493212142} + - {fileID: 5007058640176408060} + - {fileID: 342414424} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5171,6 +6017,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1935311238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935311233} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fcbf7ba7b9dd4a4f830085cba33ae91, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1945064408 GameObject: m_ObjectHideFlags: 0 @@ -5583,6 +6441,66 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1976329133} m_CullTransparentMesh: 1 +--- !u!1 &1982511463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1982511464} + - component: {fileID: 1982511465} + m_Layer: 5 + m_Name: InventoryGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1982511464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982511463} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1205925644} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 0, y: -50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1982511465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982511463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 320, y: 100} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &2000423407 GameObject: m_ObjectHideFlags: 0 @@ -5614,6 +6532,108 @@ Transform: m_Children: [] m_Father: {fileID: 844020320} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2016713359 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5007058640176408060} + m_Modifications: + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4047471004172482373, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Name + value: SpellB + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} +--- !u!224 &2016713360 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 2016713359} + m_PrefabAsset: {fileID: 0} --- !u!1 &2019012823 GameObject: m_ObjectHideFlags: 0 @@ -5738,6 +6758,17 @@ MonoBehaviour: m_Spacing: {x: 5, y: 5} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &2040234423 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 689507106} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2055390696 GameObject: m_ObjectHideFlags: 0 @@ -5840,6 +6871,153 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055390696} m_CullTransparentMesh: 1 +--- !u!114 &2065550206 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 2016713359} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2139647018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2139647019} + - component: {fileID: 2139647021} + - component: {fileID: 2139647020} + m_Layer: 5 + m_Name: NameLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2139647019 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139647018} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1205925644} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 275} + m_SizeDelta: {x: 0, y: -550} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2139647020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139647018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Inventory + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 0 + 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 &2139647021 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139647018} + m_CullTransparentMesh: 1 --- !u!1 &2142625667 GameObject: m_ObjectHideFlags: 0 @@ -5976,6 +7154,183 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2142625667} m_CullTransparentMesh: 1 +--- !u!224 &2906208582812154946 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 4790752187006030204} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3758675619081454424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4508066417797342323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 0 + m_Top: 0 + m_Bottom: 20 + m_ChildAlignment: 6 + m_StartCorner: 2 + m_StartAxis: 0 + m_CellSize: {x: 150, y: 150} + m_Spacing: {x: 20, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &4508066417797342323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5007058640176408060} + - component: {fileID: 3758675619081454424} + m_Layer: 5 + m_Name: AbilityIconHotbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1001 &4790752187006030204 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5007058640176408060} + m_Modifications: + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4047471004172482373, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + propertyPath: m_Name + value: Main + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} +--- !u!224 &5007058640176408060 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4508066417797342323} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2906208582812154946} + - {fileID: 1509689678} + - {fileID: 689507107} + - {fileID: 2016713360} + m_Father: {fileID: 1935311237} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8557355471054574495 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3} + m_PrefabInstance: {fileID: 4790752187006030204} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -5989,4 +7344,3 @@ SceneRoots: - {fileID: 844020320} - {fileID: 1319590957} - {fileID: 1935311237} - - {fileID: 689402301} diff --git a/Assets/Scripts/Abilities/AbilityHotbarIcon.cs b/Assets/Scripts/Abilities/AbilityHotbarIcon.cs new file mode 100644 index 0000000..2ea6d9f --- /dev/null +++ b/Assets/Scripts/Abilities/AbilityHotbarIcon.cs @@ -0,0 +1,40 @@ +using System; +using TMPro; +using UnityEngine; + +public class AbilityHotbarIcon : MonoBehaviour +{ + [SerializeField] private GameObject overlay; + [SerializeField] private TextMeshProUGUI cooldownText; + [SerializeField] private TextMeshProUGUI text; + private bool onCooldown; + private PlayerAbility thisAbility; + + private void Update() + { + if (onCooldown) + { + cooldownText.text = thisAbility.currentCooldown.ToString("F2"); + if (thisAbility.currentCooldown <= 0) + { + onCooldown = false; + overlay.SetActive(false); + } + } + } + + public void UpdateCooldown() + { + if (thisAbility.currentCooldown > 0) + { + onCooldown = true; + overlay.SetActive(true); + } + } + + public void UpdateAbility(PlayerAbility ability) + { + thisAbility = ability; + text.text = thisAbility.abilityName; + } +} diff --git a/Assets/Scripts/Abilities/AbilityHotbarIcon.cs.meta b/Assets/Scripts/Abilities/AbilityHotbarIcon.cs.meta new file mode 100644 index 0000000..0f8d6d0 --- /dev/null +++ b/Assets/Scripts/Abilities/AbilityHotbarIcon.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 18d0774d0a3b11b43858ef778057d6fe \ No newline at end of file diff --git a/Assets/Scripts/Abilities/AbilityManager.cs b/Assets/Scripts/Abilities/AbilityManager.cs index f6b406c..c8468fd 100644 --- a/Assets/Scripts/Abilities/AbilityManager.cs +++ b/Assets/Scripts/Abilities/AbilityManager.cs @@ -31,10 +31,33 @@ public class AbilityManager : MonoBehaviour public Button upgradeButton; [Header("Upgrades")] - public List upgradesInventory; + public HashSet upgradesInventory = new(); private void Start() { - upgradeButton.onClick.AddListener((() => AddUpgrade(upgradeToAdd, player.mainAttackInstance))); + // upgradeButton.onClick.AddListener((() => AddUpgrade(upgradeToAdd, player.mainAttackInstance))); + } + + public void StoreUpgrade(AbilityUpgrade upgradeToStore) + { + foreach (StoredUpgrade storedUpgrade in upgradesInventory) + { + if (storedUpgrade.upgrade == upgradeToStore) + { + storedUpgrade.count++; + Debug.Log($"Added upgrade {storedUpgrade.upgrade.upgradeName}. Current count: {storedUpgrade.count}"); + AbilityUIHandler.instance.UpdateInventory(); + return; + } + } + + StoredUpgrade newUpgrade = new() + { + upgrade = upgradeToStore, + count = 1 + }; + upgradesInventory.Add(newUpgrade); + Debug.Log($"Added upgrade {newUpgrade.upgrade.upgradeName}. Current count: {newUpgrade.count}"); + AbilityUIHandler.instance.UpdateInventory(); } public void AddUpgrade(AbilityUpgrade upgrade, PlayerAbility ability) diff --git a/Assets/Scripts/Abilities/AbilityUIHandler.cs b/Assets/Scripts/Abilities/AbilityUIHandler.cs index d8e0453..ecc7f81 100644 --- a/Assets/Scripts/Abilities/AbilityUIHandler.cs +++ b/Assets/Scripts/Abilities/AbilityUIHandler.cs @@ -4,10 +4,29 @@ using UnityEngine; public class AbilityUIHandler : MonoBehaviour { - public List uiObjects = new(); + #region Statication + public static AbilityUIHandler instance; + + private void Awake() + { + if (instance != null && instance != this) + { + Destroy(gameObject); + return; + } + instance = this; + } + + #endregion + [Header("Abilities")] + public List uiObjects = new(); [SerializeField] private MarisaAbilityHandler playerAbilityHandler; + [Header("Upgrades")] + [SerializeField] private Transform upgradeGrid; + [SerializeField] private StoredAbilityUpgradeUI templateStoredUpgradeUI; + private void Start() { uiObjects[0].thisAbility = playerAbilityHandler.mainAttackInstance; @@ -19,4 +38,17 @@ public class AbilityUIHandler : MonoBehaviour uiObject.UpdateUI(); } } + + public void UpdateInventory() + { + foreach (Transform child in upgradeGrid) //awful but we'll go with it for now + { + Destroy(child.gameObject); + } + foreach (AbilityManager.StoredUpgrade storedUpgrade in AbilityManager.instance.upgradesInventory) + { + StoredAbilityUpgradeUI newUI = Instantiate(templateStoredUpgradeUI, upgradeGrid); + newUI.SetUpgrade(storedUpgrade.upgrade, storedUpgrade.count); + } + } } diff --git a/Assets/Scripts/Abilities/PlayerAbilities/Laser.cs b/Assets/Scripts/Abilities/PlayerAbilities/Laser.cs index e4ae894..71b618e 100644 --- a/Assets/Scripts/Abilities/PlayerAbilities/Laser.cs +++ b/Assets/Scripts/Abilities/PlayerAbilities/Laser.cs @@ -28,6 +28,7 @@ public class Laser : PlayerAbility { canCooldown = false; currentDuration = duration; + currentCooldown = cooldown; currentDebounce = damageDebounceTime; beamObjectInstance.gameObject.SetActive(true); transform.Lookat2D(thisPlayer.mouseWorldPos); diff --git a/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs b/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs index 561a7f6..4ec40ef 100644 --- a/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs +++ b/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs @@ -11,6 +11,7 @@ public class NondirectionalLaser : Laser { canCooldown = false; currentDuration = duration; + currentCooldown = cooldown; currentDebounce = damageDebounceTime; beamRoot.gameObject.SetActive(true); } @@ -40,6 +41,7 @@ public class NondirectionalLaser : Laser } currentDebounce = damageDebounceTime; } + currentDuration -= Time.deltaTime; } if (currentDuration <= 0) { diff --git a/Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs b/Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs index dce4e60..e2488e9 100644 --- a/Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs +++ b/Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs @@ -11,7 +11,7 @@ public class PlayerAbility : MonoBehaviour [Header("Cooldown")] public bool canCooldown = true; public float cooldown; - protected float currentCooldown; + public float currentCooldown; [Header("Stats")] public float power; public float projectileCount; diff --git a/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs b/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs deleted file mode 100644 index d2fc57e..0000000 --- a/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UnityEngine; - -public class UpgradePickup : ItemPickup -{ - public AbilityUpgrade upgradeDropped; - protected override void PickupEffects() - { - - } -} diff --git a/Assets/Scripts/Entities/Enemy.cs b/Assets/Scripts/Entities/Enemy.cs index 0e76c05..01e93a4 100644 --- a/Assets/Scripts/Entities/Enemy.cs +++ b/Assets/Scripts/Entities/Enemy.cs @@ -24,6 +24,8 @@ public class Enemy : Entity } [Header("Drops")] public List possibleDrops = new(); + + [SerializeField] private UpgradePickup pickupObject; private void Start() { if (Random.Range(0f, 2f) > 1f) @@ -82,7 +84,8 @@ public class Enemy : Entity { if (random < drop.chance) //just so it matches up with the number. 80 chance means 80 percent? idk but less than 80 lol { - // drop the item + UpgradePickup newPickup = Instantiate(pickupObject, transform.position, Quaternion.identity); + newPickup.upgradeDropped = drop.droppedUpgrade; } } } diff --git a/Assets/Scripts/Entities/MarisaAbilityHandler.cs b/Assets/Scripts/Entities/MarisaAbilityHandler.cs index 7696f09..95ecf4e 100644 --- a/Assets/Scripts/Entities/MarisaAbilityHandler.cs +++ b/Assets/Scripts/Entities/MarisaAbilityHandler.cs @@ -18,16 +18,27 @@ public class MarisaAbilityHandler : MonoBehaviour public PlayerAbility spellAInstance; public PlayerAbility spellBInstance; + [Header("UI")] + public AbilityHotbarIcon mainIcon; + public AbilityHotbarIcon secondaryIcon; + public AbilityHotbarIcon spellAIcon; + public AbilityHotbarIcon spellBIcon; + //this is getting ridiculous + private void Awake() { mainAttackInstance = Instantiate(mainAttack, transform); mainAttackInstance.thisPlayer = thisPlayer; + mainIcon.UpdateAbility(mainAttackInstance); secondaryAttackInstance = Instantiate(secondaryAttack, transform); secondaryAttackInstance.thisPlayer = thisPlayer; + secondaryIcon.UpdateAbility(secondaryAttackInstance); spellAInstance = Instantiate(spellA, transform); spellAInstance.thisPlayer = thisPlayer; + spellAIcon.UpdateAbility(spellAInstance); spellBInstance = Instantiate(spellB, transform); spellBInstance.thisPlayer = thisPlayer; + spellBIcon.UpdateAbility(spellBInstance); } private void Update() @@ -35,18 +46,22 @@ public class MarisaAbilityHandler : MonoBehaviour if (inputHandler.actions["MainAttack"].inProgress) { mainAttackInstance.TryAbility(); + mainIcon.UpdateCooldown(); } else if (inputHandler.actions["SecondaryAttack"].inProgress) { secondaryAttackInstance.TryAbility(); + secondaryIcon.UpdateCooldown(); } else if (inputHandler.actions["SpellA"].inProgress) { spellAInstance.TryAbility(); + spellAIcon.UpdateCooldown(); } else if (inputHandler.actions["SpellB"].inProgress) { spellBInstance.TryAbility(); + spellBIcon.UpdateCooldown(); } } } diff --git a/Assets/Scripts/Items/ItemPickup.cs b/Assets/Scripts/Items/ItemPickup.cs index 2a3fc65..5238d81 100644 --- a/Assets/Scripts/Items/ItemPickup.cs +++ b/Assets/Scripts/Items/ItemPickup.cs @@ -12,18 +12,16 @@ public class ItemPickup : MonoBehaviour { if (inRange) { - rb.linearVelocity = (transform.position - AbilityManager.instance.player.transform.position).normalized * speed; + rb.linearVelocity = (AbilityManager.instance.player.transform.position - transform.position).normalized * speed; } } private void OnTriggerEnter2D(Collider2D other) { - PickupEffects(); - Destroy(gameObject); } - protected virtual void PickupEffects() + public virtual void PickupEffects() { - + Destroy(gameObject); } } diff --git a/Assets/Scripts/Items/ItemPickupRange.cs b/Assets/Scripts/Items/ItemPickupRange.cs index 5b0225c..3c89cfa 100644 --- a/Assets/Scripts/Items/ItemPickupRange.cs +++ b/Assets/Scripts/Items/ItemPickupRange.cs @@ -7,6 +7,9 @@ public class ItemPickupRange : MonoBehaviour private void OnTriggerEnter2D(Collider2D other) { - thisItem.inRange = true; + if (other.CompareTag(tag)) + { + thisItem.inRange = true; + } } } diff --git a/Assets/Scripts/Items/PowerPickup.cs b/Assets/Scripts/Items/PowerPickup.cs index 1e33096..1b0024c 100644 --- a/Assets/Scripts/Items/PowerPickup.cs +++ b/Assets/Scripts/Items/PowerPickup.cs @@ -3,8 +3,8 @@ using UnityEngine; public class PowerPickup : ItemPickup { [SerializeField] private float powerAmount; - protected override void PickupEffects() + public override void PickupEffects() { - + base.PickupEffects(); } } diff --git a/Assets/Scripts/Items/UpgradePickup.cs b/Assets/Scripts/Items/UpgradePickup.cs new file mode 100644 index 0000000..3cfee66 --- /dev/null +++ b/Assets/Scripts/Items/UpgradePickup.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +public class UpgradePickup : ItemPickup +{ + public AbilityUpgrade upgradeDropped; + public override void PickupEffects() + { //i'll figure out the hashset later + base.PickupEffects(); + AbilityManager.instance.StoreUpgrade(upgradeDropped); + } +} diff --git a/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs.meta b/Assets/Scripts/Items/UpgradePickup.cs.meta similarity index 100% rename from Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs.meta rename to Assets/Scripts/Items/UpgradePickup.cs.meta diff --git a/Assets/Scripts/Items/UpgradePickupEffects.cs b/Assets/Scripts/Items/UpgradePickupEffects.cs new file mode 100644 index 0000000..d41afe8 --- /dev/null +++ b/Assets/Scripts/Items/UpgradePickupEffects.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +public class UpgradePickupEffects : MonoBehaviour +{ + [SerializeField] private UpgradePickup thisPickup; + + public void OnTriggerEnter2D(Collider2D other) + { + if (other.CompareTag(tag)) + { + thisPickup.PickupEffects(); + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/Items/UpgradePickupEffects.cs.meta b/Assets/Scripts/Items/UpgradePickupEffects.cs.meta new file mode 100644 index 0000000..6b7c539 --- /dev/null +++ b/Assets/Scripts/Items/UpgradePickupEffects.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3826d3871547e566aa448bea0f340014 \ No newline at end of file diff --git a/Assets/Scripts/StoredAbilityUpgradeUI.cs b/Assets/Scripts/StoredAbilityUpgradeUI.cs new file mode 100644 index 0000000..e0b8a18 --- /dev/null +++ b/Assets/Scripts/StoredAbilityUpgradeUI.cs @@ -0,0 +1,17 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class StoredAbilityUpgradeUI : MonoBehaviour +{ + [SerializeField] private Image icon; + [SerializeField] private TextMeshProUGUI nameUI; + [SerializeField] private TextMeshProUGUI countUI; + + public void SetUpgrade(AbilityUpgrade upgrade, int count) + { + //icon.sprite = upgrade.upgradeIcon; + nameUI.text = upgrade.name; + countUI.text = $"x{count}"; + } +} diff --git a/Assets/Scripts/StoredAbilityUpgradeUI.cs.meta b/Assets/Scripts/StoredAbilityUpgradeUI.cs.meta new file mode 100644 index 0000000..dae267b --- /dev/null +++ b/Assets/Scripts/StoredAbilityUpgradeUI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b370a84d98c02cd8aac5802018918417 \ No newline at end of file diff --git a/Assets/Scripts/UIHandler.cs b/Assets/Scripts/UIHandler.cs new file mode 100644 index 0000000..2a839e9 --- /dev/null +++ b/Assets/Scripts/UIHandler.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +public class UIHandler : MonoBehaviour +{ + public void ShowUI(GameObject shownUI) + { + shownUI.SetActive(true); + } + + public void HideUI(GameObject hiddenUI) + { + hiddenUI.SetActive(false); + } +} diff --git a/Assets/Scripts/UIHandler.cs.meta b/Assets/Scripts/UIHandler.cs.meta new file mode 100644 index 0000000..1c25268 --- /dev/null +++ b/Assets/Scripts/UIHandler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2fcbf7ba7b9dd4a4f830085cba33ae91 \ No newline at end of file diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index d36c3a0..aeda816 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -53,4 +53,4 @@ Physics2DSettings: m_ReuseCollisionCallbacks: 1 m_AutoSyncTransforms: 0 m_GizmoOptions: 10 - m_LayerCollisionMatrix: 010000000000000000000000400000000000000000000000c800000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 010000000000000000000000400000000000000000000000c801000040000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 769ae11..cf33424 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - UI - Entity - Projectile - - + - Pickup - - -