From 0b0d2594cd58a52f88f653775c5f21433cd0aac3 Mon Sep 17 00:00:00 2001 From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com> Date: Sat, 20 Apr 2024 23:55:50 +0200 Subject: [PATCH] Tower collection now available --- Assets/Scenes/UI Test.unity | 639 +++++++++--------- Assets/ScriptableObjects.meta | 8 + .../ScriptableObjects/TowerCollection.asset | 27 + .../TowerCollection.asset.meta | 8 + Assets/Scripts/Manager/MoneyManager.cs | 20 +- Assets/Scripts/Manager/TowerCollection.cs | 15 + .../Scripts/Manager/TowerCollection.cs.meta | 11 + 7 files changed, 406 insertions(+), 322 deletions(-) create mode 100644 Assets/ScriptableObjects.meta create mode 100644 Assets/ScriptableObjects/TowerCollection.asset create mode 100644 Assets/ScriptableObjects/TowerCollection.asset.meta create mode 100644 Assets/Scripts/Manager/TowerCollection.cs create mode 100644 Assets/Scripts/Manager/TowerCollection.cs.meta diff --git a/Assets/Scenes/UI Test.unity b/Assets/Scenes/UI Test.unity index aa07ea8..5919773 100644 --- a/Assets/Scenes/UI Test.unity +++ b/Assets/Scenes/UI Test.unity @@ -190,7 +190,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1938733463} + m_Material: {fileID: 254088150} m_Color: {r: 0.8301887, g: 0.6912864, b: 0.6552747, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -465,7 +465,7 @@ MonoBehaviour: m_EditorClassIdentifier: tooltip: {fileID: 233832249} ButtonIndex: -1 ---- !u!21 &185985592 +--- !u!21 &82866310 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -502,9 +502,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] --- !u!1 &189158287 GameObject: @@ -571,7 +571,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 893943273} + m_Material: {fileID: 854345313} m_Color: {r: 0.9811321, g: 0.8669752, b: 0.8669752, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -729,6 +729,47 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 233832247} m_PrefabAsset: {fileID: 0} +--- !u!21 &254088150 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] --- !u!1 &260575883 GameObject: m_ObjectHideFlags: 0 @@ -1229,6 +1270,47 @@ MonoBehaviour: m_EditorClassIdentifier: tooltip: {fileID: 1041640023} ButtonIndex: -1 +--- !u!21 &568311740 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1 &640484733 GameObject: m_ObjectHideFlags: 0 @@ -1301,6 +1383,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640484733} m_CullTransparentMesh: 1 +--- !u!21 &657496416 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + m_BuildTextureStacks: [] --- !u!1 &661977249 GameObject: m_ObjectHideFlags: 0 @@ -1373,47 +1496,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661977249} m_CullTransparentMesh: 1 ---- !u!21 &669173741 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} - m_BuildTextureStacks: [] --- !u!1 &709531144 GameObject: m_ObjectHideFlags: 0 @@ -1749,6 +1831,7 @@ GameObject: - component: {fileID: 767861951} - component: {fileID: 767861950} - component: {fileID: 767861949} + - component: {fileID: 767861953} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1842,6 +1925,31 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &767861953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767861948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f985e05059363c4db7f10d49b4c0aeb, type: 3} + m_Name: + m_EditorClassIdentifier: + towerCollection: {fileID: 11400000, guid: 4ec931c91bb7b204fb0017f43497a707, type: 2} + ShopButtons: + - {fileID: 1350940958} + - {fileID: 963716314} + - {fileID: 387969738} + - {fileID: 62192452} + - {fileID: 1410880911} + MoneyTexts: + - {fileID: 979233404} + - {fileID: 1939149281} + - {fileID: 898031555} + - {fileID: 1144806374} + - {fileID: 2125436575} --- !u!1 &778280126 GameObject: m_ObjectHideFlags: 0 @@ -1944,6 +2052,88 @@ MonoBehaviour: count: 0 maxCount: 2 currentCount: 0 +--- !u!21 &822952343 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + m_BuildTextureStacks: [] +--- !u!21 &854345313 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1 &861226422 GameObject: m_ObjectHideFlags: 0 @@ -2016,47 +2206,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 861226422} m_CullTransparentMesh: 1 ---- !u!21 &893943273 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1 &898031553 GameObject: m_ObjectHideFlags: 0 @@ -2655,7 +2804,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1249008092} + m_Material: {fileID: 568311740} m_Color: {r: 0.9811321, g: 0.8669752, b: 0.8669752, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3259,47 +3408,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1223794685} m_CullTransparentMesh: 1 ---- !u!21 &1249008092 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1 &1350940958 GameObject: m_ObjectHideFlags: 0 @@ -3486,7 +3594,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 669173741} + m_Material: {fileID: 82866310} m_Color: {r: 0.76729554, g: 0.34738284, b: 0.24370071, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3602,47 +3710,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1360005276} m_CullTransparentMesh: 1 ---- !u!21 &1399977267 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} - m_BuildTextureStacks: [] --- !u!1 &1410880911 GameObject: m_ObjectHideFlags: 0 @@ -3760,6 +3827,47 @@ MonoBehaviour: m_EditorClassIdentifier: tooltip: {fileID: 1900695146} ButtonIndex: -1 +--- !u!21 &1417666871 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} + - _r: {r: 30.96, g: 0, b: 0, a: 0} + - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + m_BuildTextureStacks: [] --- !u!1 &1439728634 GameObject: m_ObjectHideFlags: 0 @@ -3833,6 +3941,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1439728634} m_CullTransparentMesh: 1 +--- !u!21 &1477318244 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} + m_BuildTextureStacks: [] --- !u!1 &1617039392 GameObject: m_ObjectHideFlags: 0 @@ -3846,7 +3995,6 @@ GameObject: - component: {fileID: 1617039396} - component: {fileID: 1617039395} - component: {fileID: 1617039394} - - component: {fileID: 1617039398} m_Layer: 5 m_Name: ShopBackground m_TagString: Untagged @@ -3931,7 +4079,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 185985592} + m_Material: {fileID: 657496416} m_Color: {r: 0.9056604, g: 0.78319687, b: 0.78319687, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3954,61 +4102,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1617039392} m_CullTransparentMesh: 1 ---- !u!114 &1617039398 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1617039392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7f985e05059363c4db7f10d49b4c0aeb, type: 3} - m_Name: - m_EditorClassIdentifier: - ShopButtons: [] - MoneyTexts: [] ---- !u!21 &1654496034 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} - m_BuildTextureStacks: [] --- !u!1 &1707922889 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2, @@ -4370,7 +4463,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2110028166} + m_Material: {fileID: 1417666871} m_Color: {r: 0.90588236, g: 0.78431374, b: 0.78431374, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -4528,47 +4621,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1900695144} m_PrefabAsset: {fileID: 0} ---- !u!21 &1938733463 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} - m_BuildTextureStacks: [] --- !u!1 &1939149279 GameObject: m_ObjectHideFlags: 0 @@ -5040,7 +5092,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1654496034} + m_Material: {fileID: 822952343} m_Color: {r: 0.83137256, g: 0.6901961, b: 0.654902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -5129,7 +5181,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1399977267} + m_Material: {fileID: 1477318244} m_Color: {r: 0.76862746, g: 0.34901962, b: 0.24313726, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -5152,47 +5204,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2073337545} m_CullTransparentMesh: 1 ---- !u!21 &2110028166 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} - - _r: {r: 30.96, g: 0, b: 0, a: 0} - - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} - m_BuildTextureStacks: [] --- !u!1 &2125436573 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ScriptableObjects.meta b/Assets/ScriptableObjects.meta new file mode 100644 index 0000000..444c2cd --- /dev/null +++ b/Assets/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4f56a0581ab2a0b41ba2d548d0da3ebe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ScriptableObjects/TowerCollection.asset b/Assets/ScriptableObjects/TowerCollection.asset new file mode 100644 index 0000000..a983a6a --- /dev/null +++ b/Assets/ScriptableObjects/TowerCollection.asset @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa2b083878fb5a9449e6425aa1f217d4, type: 3} + m_Name: TowerCollection + m_EditorClassIdentifier: + Towers: + - name: Turret + price: 100 + prefab: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554, + type: 3} + - name: Gripper + price: 250 + prefab: {fileID: 1415246146501367120, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + - name: Black hole + price: 500 + prefab: {fileID: 4611178744751000815, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, + type: 3} diff --git a/Assets/ScriptableObjects/TowerCollection.asset.meta b/Assets/ScriptableObjects/TowerCollection.asset.meta new file mode 100644 index 0000000..5ccae46 --- /dev/null +++ b/Assets/ScriptableObjects/TowerCollection.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ec931c91bb7b204fb0017f43497a707 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Manager/MoneyManager.cs b/Assets/Scripts/Manager/MoneyManager.cs index 698fc09..5c3c099 100644 --- a/Assets/Scripts/Manager/MoneyManager.cs +++ b/Assets/Scripts/Manager/MoneyManager.cs @@ -6,6 +6,8 @@ using UnityEngine.Assertions; public class MoneyManager : MonoBehaviour { + public TowerCollection towerCollection; + [Space(10)] public GameObject[] ShopButtons; public TMP_Text[] MoneyTexts; @@ -20,17 +22,19 @@ public class MoneyManager : MonoBehaviour } } + private void Start() + { + // Show prices + for (int i = 0; i < towerCollection.Towers.Length; i++) + { + MoneyTexts[i].text = towerCollection.Towers[i].price.ToString(); + } + } + private void OnShopButtonClicked(int index) { Assert.AreNotEqual(index, -1, "Shop button not init-ed with index"); - print("Button clicked: " + index); + } } - - -[CreateAssetMenu(fileName = "New TowerCollection", menuName = "Tower Defense/Tower Collection")] -public class TowerCollection : ScriptableObject -{ - public Tower[] Towers; -} diff --git a/Assets/Scripts/Manager/TowerCollection.cs b/Assets/Scripts/Manager/TowerCollection.cs new file mode 100644 index 0000000..4737856 --- /dev/null +++ b/Assets/Scripts/Manager/TowerCollection.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +[CreateAssetMenu(fileName = "New TowerCollection", menuName = "Tower Defense/Tower Collection")] +public class TowerCollection : ScriptableObject +{ + public TowerInfo[] Towers; +} + +[System.Serializable] +public struct TowerInfo +{ + public string name; + public int price; + public GameObject prefab; +} \ No newline at end of file diff --git a/Assets/Scripts/Manager/TowerCollection.cs.meta b/Assets/Scripts/Manager/TowerCollection.cs.meta new file mode 100644 index 0000000..1753eb8 --- /dev/null +++ b/Assets/Scripts/Manager/TowerCollection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa2b083878fb5a9449e6425aa1f217d4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: