diff --git a/Assets/Data/Waves/Basic Wave.asset b/Assets/Data/Waves/Wave 1.asset similarity index 96% rename from Assets/Data/Waves/Basic Wave.asset rename to Assets/Data/Waves/Wave 1.asset index 4473de7..c20dc59 100644 --- a/Assets/Data/Waves/Basic Wave.asset +++ b/Assets/Data/Waves/Wave 1.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 998e0b91932048b1b2abcfcf4936b508, type: 3} - m_Name: Basic Wave + m_Name: Wave 1 m_EditorClassIdentifier: spawns: - enemyPrefab: {fileID: 204632724861940951, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} diff --git a/Assets/Data/Waves/Basic Wave.asset.meta b/Assets/Data/Waves/Wave 1.asset.meta similarity index 100% rename from Assets/Data/Waves/Basic Wave.asset.meta rename to Assets/Data/Waves/Wave 1.asset.meta diff --git a/Assets/Data/Waves/Wave 2.asset b/Assets/Data/Waves/Wave 2.asset new file mode 100644 index 0000000..bd96ba0 --- /dev/null +++ b/Assets/Data/Waves/Wave 2.asset @@ -0,0 +1,24 @@ +%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: 998e0b91932048b1b2abcfcf4936b508, type: 3} + m_Name: Wave 2 + m_EditorClassIdentifier: + spawns: + - enemyPrefab: {fileID: 204632724861940951, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} + count: 50 + spawnInterval: 0.5 + - enemyPrefab: {fileID: 204632724861940951, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + count: 50 + spawnInterval: 0.75 + - enemyPrefab: {fileID: 204632724861940951, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} + count: 700 + spawnInterval: 0.5 diff --git a/Assets/Data/Waves/Wave 2.asset.meta b/Assets/Data/Waves/Wave 2.asset.meta new file mode 100644 index 0000000..8e85f55 --- /dev/null +++ b/Assets/Data/Waves/Wave 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 745becb03d4a312b88b8a5b372d7f3cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Weapons/Grenade.asset b/Assets/Data/Weapons/Grenade.asset index 64e51ee..0f1c142 100644 --- a/Assets/Data/Weapons/Grenade.asset +++ b/Assets/Data/Weapons/Grenade.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: efa44a330e8343c08e3af638d466c118, type: 3} m_Name: Grenade m_EditorClassIdentifier: - weaponName: - description: - prefab: {fileID: 0} - icon: {fileID: 0} - price: 0 + weaponName: Grenade + description: Boom + prefab: {fileID: 4198373928733079624, guid: e9b74b330ff89ddbaa1db1dcfe57ecef, type: 3} + icon: {fileID: 1754851762, guid: 669e3ba4383a707eb951cae82a9ea538, type: 3} + price: 340 diff --git a/Assets/Data/Weapons/Rifle.asset b/Assets/Data/Weapons/Rifle.asset index 2a5bf0d..97bccbc 100644 --- a/Assets/Data/Weapons/Rifle.asset +++ b/Assets/Data/Weapons/Rifle.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: efa44a330e8343c08e3af638d466c118, type: 3} m_Name: Rifle m_EditorClassIdentifier: - weaponName: - description: - prefab: {fileID: 0} - icon: {fileID: 0} - price: 0 + weaponName: Rifle + description: pif paf faster + prefab: {fileID: 4198373928733079624, guid: d23194b52cb07a0f9ba88d40c3ea9082, type: 3} + icon: {fileID: -252851320, guid: 669e3ba4383a707eb951cae82a9ea538, type: 3} + price: 200 diff --git a/Assets/Data/Weapons/Sword.asset b/Assets/Data/Weapons/Sword.asset index 10c557f..07b327c 100644 --- a/Assets/Data/Weapons/Sword.asset +++ b/Assets/Data/Weapons/Sword.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: efa44a330e8343c08e3af638d466c118, type: 3} m_Name: Sword m_EditorClassIdentifier: - weaponName: - description: - prefab: {fileID: 0} - icon: {fileID: 0} - price: 0 + weaponName: Sword + description: slash + prefab: {fileID: 4198373928733079624, guid: 37be88b9c527bf70f81113879644e46c, type: 3} + icon: {fileID: 8233071653059976297, guid: 669e3ba4383a707eb951cae82a9ea538, type: 3} + price: 500 diff --git a/Assets/Prefabs/Weapons/Grenade Projectile.prefab b/Assets/Prefabs/Weapons/Grenade Projectile.prefab new file mode 100644 index 0000000..a3f2f13 --- /dev/null +++ b/Assets/Prefabs/Weapons/Grenade Projectile.prefab @@ -0,0 +1,207 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6885276120120059828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618924498601056688} + - component: {fileID: 6129280278992346914} + - component: {fileID: 8134375027176033877} + - component: {fileID: 6375708012542479532} + m_Layer: 8 + m_Name: Grenade Projectile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &618924498601056688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + 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: 982386912657826799} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &6129280278992346914 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + m_BodyType: 1 + 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: 1 + m_Constraints: 4 +--- !u!114 &8134375027176033877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23b6d668eacd4bffa5ec3772523d2b35, type: 3} + m_Name: + m_EditorClassIdentifier: + rb: {fileID: 6129280278992346914} + speed: 4 + lifeTime: 5 + stats: + damage: 0 + attackSpeed: 0 + range: 0 + damageType: 0 +--- !u!58 &6375708012542479532 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + 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.013352811, y: -0.008583948} + m_Radius: 0.096554294 +--- !u!1 &7527772782055463159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 982386912657826799} + - component: {fileID: 1733185684803924580} + m_Layer: 8 + m_Name: tileset_28 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &982386912657826799 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7527772782055463159} + 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: 1 + m_Children: [] + m_Father: {fileID: 618924498601056688} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1733185684803924580 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7527772782055463159} + 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: 1754851762, guid: 669e3ba4383a707eb951cae82a9ea538, 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 diff --git a/Assets/Prefabs/Weapons/Grenade Projectile.prefab.meta b/Assets/Prefabs/Weapons/Grenade Projectile.prefab.meta new file mode 100644 index 0000000..1c332fe --- /dev/null +++ b/Assets/Prefabs/Weapons/Grenade Projectile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0b644648fb6fcd6f5a5726a09927c3ea +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Weapons/Grenade.prefab b/Assets/Prefabs/Weapons/Grenade.prefab new file mode 100644 index 0000000..6f058d7 --- /dev/null +++ b/Assets/Prefabs/Weapons/Grenade.prefab @@ -0,0 +1,174 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2848344707366722547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 173884399746824259} + m_Layer: 0 + m_Name: Fire point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &173884399746824259 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2848344707366722547} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.201, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 668629343962284136} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3527550136980679514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668629343962284136} + - component: {fileID: 1594421362487999405} + m_Layer: 0 + m_Name: tileset_31 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &668629343962284136 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527550136980679514} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4, y: 0, z: 0} + m_LocalScale: {x: 0.4899, y: 0.4899, z: 0.4899} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 173884399746824259} + m_Father: {fileID: 3840905976706493970} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1594421362487999405 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527550136980679514} + 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: 1754851762, guid: 669e3ba4383a707eb951cae82a9ea538, 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 &4198373928733079624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3840905976706493970} + - component: {fileID: 7156251953188343334} + m_Layer: 6 + m_Name: Grenade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3840905976706493970 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4198373928733079624} + 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: 668629343962284136} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7156251953188343334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4198373928733079624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd9cdb55272f45ab9c60a948a56e01f5, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponStats: + damage: 9 + attackSpeed: 0.3 + range: 2 + damageType: 1 + character: {fileID: 0} + projectilePrefab: {fileID: 6885276120120059828, guid: 0b644648fb6fcd6f5a5726a09927c3ea, type: 3} + firePoint: {fileID: 173884399746824259} diff --git a/Assets/Prefabs/Weapons/Grenade.prefab.meta b/Assets/Prefabs/Weapons/Grenade.prefab.meta new file mode 100644 index 0000000..a3f0c41 --- /dev/null +++ b/Assets/Prefabs/Weapons/Grenade.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e9b74b330ff89ddbaa1db1dcfe57ecef +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Weapons/Rifle Projectile.prefab b/Assets/Prefabs/Weapons/Rifle Projectile.prefab new file mode 100644 index 0000000..3ebca7b --- /dev/null +++ b/Assets/Prefabs/Weapons/Rifle Projectile.prefab @@ -0,0 +1,212 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6885276120120059828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618924498601056688} + - component: {fileID: 6129280278992346914} + - component: {fileID: 4677435575099866603} + - component: {fileID: 9209553851344386497} + m_Layer: 8 + m_Name: Rifle Projectile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &618924498601056688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + 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: 982386912657826799} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &6129280278992346914 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + m_BodyType: 1 + 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: 1 + m_Constraints: 4 +--- !u!114 &4677435575099866603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d5fcee922b049d1b9db7b49711ce562, type: 3} + m_Name: + m_EditorClassIdentifier: + rb: {fileID: 6129280278992346914} + speed: 13 + lifeTime: 8 +--- !u!61 &9209553851344386497 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + 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.00050985813, y: 0.0005098283} + 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: 0.114934325, y: 0.2649578} + m_EdgeRadius: 0 +--- !u!1 &7527772782055463159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 982386912657826799} + - component: {fileID: 1733185684803924580} + m_Layer: 8 + m_Name: tileset_28 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &982386912657826799 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7527772782055463159} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 618924498601056688} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1733185684803924580 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7527772782055463159} + 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: 325748843, guid: 669e3ba4383a707eb951cae82a9ea538, 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 diff --git a/Assets/Prefabs/Weapons/Rifle Projectile.prefab.meta b/Assets/Prefabs/Weapons/Rifle Projectile.prefab.meta new file mode 100644 index 0000000..406bb69 --- /dev/null +++ b/Assets/Prefabs/Weapons/Rifle Projectile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7daf84d0215f690a5b8b2e49e636a02a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Weapons/Rifle.prefab b/Assets/Prefabs/Weapons/Rifle.prefab new file mode 100644 index 0000000..7df64a4 --- /dev/null +++ b/Assets/Prefabs/Weapons/Rifle.prefab @@ -0,0 +1,174 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2848344707366722547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 173884399746824259} + m_Layer: 0 + m_Name: Fire point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &173884399746824259 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2848344707366722547} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.499, y: 0.118, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 668629343962284136} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3527550136980679514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668629343962284136} + - component: {fileID: 1594421362487999405} + m_Layer: 0 + m_Name: tileset_31 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &668629343962284136 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527550136980679514} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 173884399746824259} + m_Father: {fileID: 3840905976706493970} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1594421362487999405 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527550136980679514} + 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: -252851320, guid: 669e3ba4383a707eb951cae82a9ea538, 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 &4198373928733079624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3840905976706493970} + - component: {fileID: 7156251953188343334} + m_Layer: 6 + m_Name: Rifle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3840905976706493970 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4198373928733079624} + 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: 668629343962284136} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7156251953188343334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4198373928733079624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd9cdb55272f45ab9c60a948a56e01f5, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponStats: + damage: 8 + attackSpeed: 4 + range: 0 + damageType: 1 + character: {fileID: 0} + projectilePrefab: {fileID: 6885276120120059828, guid: 7daf84d0215f690a5b8b2e49e636a02a, type: 3} + firePoint: {fileID: 173884399746824259} diff --git a/Assets/Prefabs/Weapons/Rifle.prefab.meta b/Assets/Prefabs/Weapons/Rifle.prefab.meta new file mode 100644 index 0000000..e0caaec --- /dev/null +++ b/Assets/Prefabs/Weapons/Rifle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d23194b52cb07a0f9ba88d40c3ea9082 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Weapons/Sword.prefab b/Assets/Prefabs/Weapons/Sword.prefab new file mode 100644 index 0000000..4521576 --- /dev/null +++ b/Assets/Prefabs/Weapons/Sword.prefab @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3527550136980679514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668629343962284136} + - component: {fileID: 1594421362487999405} + m_Layer: 0 + m_Name: tileset_31 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &668629343962284136 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527550136980679514} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3840905976706493970} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1594421362487999405 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527550136980679514} + 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: 8233071653059976297, guid: 669e3ba4383a707eb951cae82a9ea538, 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 &4198373928733079624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3840905976706493970} + - component: {fileID: 3172979439482193078} + m_Layer: 6 + m_Name: Sword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3840905976706493970 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4198373928733079624} + 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: 668629343962284136} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3172979439482193078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4198373928733079624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4ff53f671604189b15fac28115b2b70, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponStats: + damage: 30 + attackSpeed: 0.4 + range: 1.5 + damageType: 0 + character: {fileID: 0} + targetMask: + serializedVersion: 2 + m_Bits: 129 diff --git a/Assets/Prefabs/Weapons/Sword.prefab.meta b/Assets/Prefabs/Weapons/Sword.prefab.meta new file mode 100644 index 0000000..256e880 --- /dev/null +++ b/Assets/Prefabs/Weapons/Sword.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37be88b9c527bf70f81113879644e46c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 4ebf90a..e482439 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -4015,6 +4015,7 @@ MonoBehaviour: m_EditorClassIdentifier: waves: - {fileID: 11400000, guid: 4991b70e99800747597a28d7cff2a3d8, type: 2} + - {fileID: 11400000, guid: 745becb03d4a312b88b8a5b372d7f3cf, type: 2} spawnPoints: - {fileID: 521201812} - {fileID: 1593097268} @@ -7056,7 +7057,7 @@ MonoBehaviour: damage: 1 rangedDamage: 1 meleeDamage: 1 - attackRange: 16 + attackRange: 1 attackSpeed: 1 --- !u!4 &1261447604 Transform: @@ -7805,63 +7806,6 @@ Transform: m_Children: [] m_Father: {fileID: 54233099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1642425552 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 204632724861940951, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_Name - value: Advanced Enemy - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalPosition.x - value: -7.170298 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalPosition.y - value: 3.3622494 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b00136274fd417af18bc2ba9111a054c, type: 3} --- !u!114 &1767717491 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} @@ -7873,63 +7817,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f37c728615643a1abc988bbfd34986c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1791967925 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 204632724861940951, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_Name - value: Basic Enemy - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalPosition.x - value: -9.88 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalPosition.y - value: -1.669 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8982578637896279064, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d5225fe09f2ee0168b3a40e21948820a, type: 3} --- !u!1 &1869990420 GameObject: m_ObjectHideFlags: 0 @@ -7997,7 +7884,7 @@ MonoBehaviour: itemsContainer: {fileID: 701978012} upgradeSlotPrefab: {fileID: 7648813253940703347, guid: 14c4939434dba2696acbbc2285c85fca, type: 3} itemsCount: 3 - weaponsCount: 2 + weaponsCount: 0 shopManager: {fileID: 1767717491} upgradeManager: {fileID: 1953393765} --- !u!114 &1953393765 @@ -8525,10 +8412,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: itemsPerShop + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} propertyPath: inventoryManager value: objectReference: {fileID: 1261447609} + - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: possibleWeapons.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: 'possibleWeapons.Array.data[1]' + value: + objectReference: {fileID: 11400000, guid: 418269386bc531f5496cc51469fa7fd9, type: 2} + - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: 'possibleWeapons.Array.data[2]' + value: + objectReference: {fileID: 11400000, guid: c7dadcb685556983ebad06b46b2d94a3, type: 2} + - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: 'possibleWeapons.Array.data[3]' + value: + objectReference: {fileID: 11400000, guid: 4d75b6849f442cefa8319c3c30f4ff6e, type: 2} - target: {fileID: 4567329713039532410, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -8553,6 +8460,10 @@ PrefabInstance: propertyPath: m_Name value: Shop UI objectReference: {fileID: 0} + - target: {fileID: 4985729667885723412, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5200376552900448965, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -8673,8 +8584,6 @@ SceneRoots: - {fileID: 54233099} - {fileID: 479709345} - {fileID: 48810671} - - {fileID: 1791967925} - {fileID: 1368041001} - {fileID: 1953393769} - {fileID: 1265960068} - - {fileID: 1642425552} diff --git a/Assets/Scripts/Weapons/ExplosiveProjectile.cs b/Assets/Scripts/Weapons/ExplosiveProjectile.cs new file mode 100644 index 0000000..9f68f1f --- /dev/null +++ b/Assets/Scripts/Weapons/ExplosiveProjectile.cs @@ -0,0 +1,66 @@ +using Data; +using Interfaces; +using KBCore.Refs; +using Systems; +using UnityEngine; + +namespace Weapons +{ + public class ExplosiveProjectile : MonoBehaviour, IDamageInflector, IDamageInflectorSetup + { + [Self, SerializeField] private Rigidbody2D rb; + [SerializeField] private float speed = 10f; + [SerializeField] private float lifeTime = 5f; + [SerializeField] private WeaponStats stats; + + public float Damage { get; private set; } + public GameObject Owner { get; private set; } + public DamageType Type => DamageType.Ranged; + + public void Setup(Character attacker, float damage, WeaponStats weaponStats = null) + { + Damage = damage; + Owner = attacker.gameObject; + if (weaponStats != null) + { + stats = weaponStats; + } + } + + private void Start() + { + Destroy(gameObject, lifeTime); + } + + private void FixedUpdate() + { + var direction = transform.up.normalized; + var movement = direction * (speed * Time.fixedDeltaTime); + rb.MovePosition(rb.position + (Vector2)movement); + } + + private void OnTriggerEnter2D(Collider2D other) + { + Explode(); + } + + private void Explode() + { + var hitColliders = Physics2D.OverlapCircleAll(transform.position, stats.range); + foreach (var hitCollider in hitColliders) + { + if (hitCollider.gameObject == Owner) continue; + + hitCollider.TryGetComponent(out var health); + health?.TakeDamage(Damage, Owner); + } + Destroy(gameObject); + } + + private void OnDrawGizmosSelected() + { + Gizmos.color = Color.red; + Gizmos.DrawWireSphere(transform.position, stats.range); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Weapons/ExplosiveProjectile.cs.meta b/Assets/Scripts/Weapons/ExplosiveProjectile.cs.meta new file mode 100644 index 0000000..731658b --- /dev/null +++ b/Assets/Scripts/Weapons/ExplosiveProjectile.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 23b6d668eacd4bffa5ec3772523d2b35 +timeCreated: 1752353915 \ No newline at end of file diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index a35c12f..d07b215 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: fffffffffffffffffffffffffffffffffffffffffffffffffffefffffffdffffbfffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffff7ffeffffbffdffffbffeffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff