From 5339e773f247bdf81fa3b30a4a03c748732b5046 Mon Sep 17 00:00:00 2001 From: Neil Kollack Date: Sat, 16 Apr 2022 16:33:55 -0500 Subject: fix: feedback(easier trap section + better damage) --- Assets/Prefabs/JungleEnemyPrefabs.meta | 8 + Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab | 59 + .../JungleEnemyPrefabs/Mummy (1).prefab.meta | 7 + Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab | 59 + .../Prefabs/JungleEnemyPrefabs/Mummy.prefab.meta | 7 + .../Prefabs/JungleEnemyPrefabs/Zombie (1).prefab | 59 + .../JungleEnemyPrefabs/Zombie (1).prefab.meta | 7 + Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab | 59 + .../Prefabs/JungleEnemyPrefabs/Zombie.prefab.meta | 7 + Assets/Prefabs/Player.prefab | 13 +- Assets/Prefabs/Traps/SawTrap.prefab | 2 +- Assets/Prefabs/Traps/Spikes.prefab | 198 +-- Assets/Scenes/Jungle.unity | 1464 ++++++++++++++++---- Assets/Scripts/Actors/Actor.cs | 30 +- Assets/Scripts/LevelController.cs | 46 +- Assets/Sprites/SpriteAtlas.spriteatlas | 44 + Assets/Sprites/SpriteAtlas.spriteatlas.meta | 8 + 17 files changed, 1586 insertions(+), 491 deletions(-) create mode 100644 Assets/Prefabs/JungleEnemyPrefabs.meta create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab.meta create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab.meta create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab.meta create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab create mode 100644 Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab.meta create mode 100644 Assets/Sprites/SpriteAtlas.spriteatlas create mode 100644 Assets/Sprites/SpriteAtlas.spriteatlas.meta (limited to 'Assets') diff --git a/Assets/Prefabs/JungleEnemyPrefabs.meta b/Assets/Prefabs/JungleEnemyPrefabs.meta new file mode 100644 index 0000000..d881ac6 --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6955c85e88486294491bdac1a49437cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab b/Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab new file mode 100644 index 0000000..4447c29 --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6130322858700275628 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.x + value: 400.75 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.y + value: 14.6 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673885, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Name + value: Mummy (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab.meta b/Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab.meta new file mode 100644 index 0000000..6871c4f --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Mummy (1).prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0262f96f42c6aeb4684f54ead0bc9bcd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab b/Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab new file mode 100644 index 0000000..4f016fe --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3659716736072451793 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.x + value: 422.5 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.y + value: -3.4 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673885, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Name + value: Mummy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab.meta b/Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab.meta new file mode 100644 index 0000000..90f9db9 --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Mummy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1e6541a2de44a6f4e9ccc8bda54bbe60 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab b/Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab new file mode 100644 index 0000000..714f974 --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4174394276487701855 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalPosition.x + value: -24.910004 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalPosition.y + value: -26.82 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_Name + value: Zombie (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab.meta b/Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab.meta new file mode 100644 index 0000000..b804c26 --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Zombie (1).prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97a792faae28dc44395a47b01d479474 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab b/Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab new file mode 100644 index 0000000..49a1b28 --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6035805420654222060 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalPosition.x + value: 23.839996 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalPosition.y + value: -14.32 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_Name + value: Zombie + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} diff --git a/Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab.meta b/Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab.meta new file mode 100644 index 0000000..7f1bc70 --- /dev/null +++ b/Assets/Prefabs/JungleEnemyPrefabs/Zombie.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ae69de9d22681aa4785f498d7fbcdb4b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index c5f16a4..48cd8d1 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -54,7 +54,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2776418409812533936} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.41, y: -0.53, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -318,7 +318,17 @@ MonoBehaviour: jumpForce: 1200 damage: 0 groundCheckPoint: {fileID: 2776418409611166769} + invulnTime: 2 + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 health: 0 + invuln: 0 + projectilePrefab: {fileID: 9063295841416902692, guid: a0ba51ee3fa7d25428dd81d9ee48ace9, type: 3} + firePoint: {fileID: 2776418409812533937} spawnPoint: {x: 0, y: 0, z: 0} --- !u!114 &6691474245549666832 MonoBehaviour: @@ -352,3 +362,4 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} heartSprite: {fileID: 21300000, guid: 454fb9103270323479e05b92e4ecf4d0, type: 3} + health: 0 diff --git a/Assets/Prefabs/Traps/SawTrap.prefab b/Assets/Prefabs/Traps/SawTrap.prefab index 9ffbe08..1aa66f7 100644 --- a/Assets/Prefabs/Traps/SawTrap.prefab +++ b/Assets/Prefabs/Traps/SawTrap.prefab @@ -30,7 +30,7 @@ Transform: m_GameObject: {fileID: 295837306294826375} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 10, y: -13, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Prefabs/Traps/Spikes.prefab b/Assets/Prefabs/Traps/Spikes.prefab index 8e4ef0c..9dc203a 100644 --- a/Assets/Prefabs/Traps/Spikes.prefab +++ b/Assets/Prefabs/Traps/Spikes.prefab @@ -1,89 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5267721060799806418 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5267721060799806429} - - component: {fileID: 5267721060799806428} - m_Layer: 7 - m_Name: Spike (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5267721060799806429 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5267721060799806418} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5267721061292888517} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5267721060799806428 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5267721060799806418} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: -1538092145, guid: 695b2877432cdad4ba906969c221cb37, 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 &5267721060992333633 GameObject: m_ObjectHideFlags: 0 @@ -179,7 +95,7 @@ GameObject: - component: {fileID: 5267721061211696896} - component: {fileID: 5267721061211696899} m_Layer: 7 - m_Name: Spike (4) + m_Name: Spike (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -198,7 +114,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5267721061292888517} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5267721061211696899 SpriteRenderer: @@ -369,9 +285,7 @@ Transform: - {fileID: 5267721061290197904} - {fileID: 5267721060992333632} - {fileID: 5267721061308398242} - - {fileID: 5267721061301196269} - {fileID: 5267721061211696896} - - {fileID: 5267721060799806429} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -399,7 +313,7 @@ PolygonCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 1 + m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -414,103 +328,15 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 2.0019627, y: -0.45511055} - - {x: 1.5005379, y: 0.27832222} - - {x: 1.0151105, y: -0.47779083} - - {x: 0.49297523, y: 0.28498173} - - {x: 0.021787643, y: -0.4510107} - - {x: -0.48613405, y: 0.28323364} - - {x: -0.9952316, y: -0.47535992} - - {x: -1.4857557, y: 0.2769146} - - {x: -2.0021577, y: -0.47897243} - - {x: -2.4938633, y: 0.29247645} - - {x: -2.9846206, y: -0.48530662} - - {x: 2.9602346, y: -0.49144435} - - {x: 2.508554, y: 0.2809953} ---- !u!1 &5267721061301196258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5267721061301196269} - - component: {fileID: 5267721061301196268} - m_Layer: 7 - m_Name: Spike (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5267721061301196269 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5267721061301196258} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5267721061292888517} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5267721061301196268 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5267721061301196258} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: -1538092145, guid: 695b2877432cdad4ba906969c221cb37, 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 + - - {x: 1.0135258, y: -0.4414559} + - {x: 0.50959647, y: 0.26982734} + - {x: -0.0005671084, y: -0.46429095} + - {x: -0.4917951, y: 0.27736223} + - {x: -1.0100198, y: -0.44660842} + - {x: -1.4980531, y: 0.26385212} + - {x: -1.9728405, y: -0.48784482} + - {x: 1.9628043, y: -0.49286294} + - {x: 1.5231446, y: 0.26887056} --- !u!1 &5267721061308398243 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity index c6979c4..27a46db 100644 --- a/Assets/Scenes/Jungle.unity +++ b/Assets/Scenes/Jungle.unity @@ -452,68 +452,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &49594509 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1984304316} - m_Modifications: - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalPosition.x - value: -24.910004 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalPosition.y - value: -26.82 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_Name - value: Zombie (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} ---- !u!4 &49594510 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - m_PrefabInstance: {fileID: 49594509} - m_PrefabAsset: {fileID: 0} --- !u!1001 &64907095 PrefabInstance: m_ObjectHideFlags: 0 @@ -2193,7 +2131,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5267721061292888517, guid: 69e106b0947765d408a825983fc3fac0, type: 3} propertyPath: m_LocalPosition.x - value: -42.75 + value: -36.5 objectReference: {fileID: 0} - target: {fileID: 5267721061292888517, guid: 69e106b0947765d408a825983fc3fac0, type: 3} propertyPath: m_LocalPosition.y @@ -2259,7 +2197,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.y - value: 9.267904 + value: 8.267904 objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.z @@ -3117,7 +3055,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8998169987422057300, guid: 43bb790f4ad5293458409f755aeddc9b, type: 3} propertyPath: m_LocalPosition.x - value: -22 + value: -19.25 objectReference: {fileID: 0} - target: {fileID: 8998169987422057300, guid: 43bb790f4ad5293458409f755aeddc9b, type: 3} propertyPath: m_LocalPosition.y @@ -3517,6 +3455,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: treasure: {fileID: 4788021209095683739, guid: f7f57f82eafa6be46b71b71e9117b9bf, type: 3} + enemies: + - {fileID: 1250002403757413528, guid: ae69de9d22681aa4785f498d7fbcdb4b, type: 3} + - {fileID: 5264188901624758220, guid: 1e6541a2de44a6f4e9ccc8bda54bbe60, type: 3} + - {fileID: 3374466305813530289, guid: 0262f96f42c6aeb4684f54ead0bc9bcd, type: 3} + - {fileID: 8896288112839863083, guid: 97a792faae28dc44395a47b01d479474, type: 3} --- !u!1 &544966461 GameObject: m_ObjectHideFlags: 0 @@ -9887,11 +9830,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &565923084 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - m_PrefabInstance: {fileID: 8919320862215231254} - m_PrefabAsset: {fileID: 0} --- !u!1001 &579896363 PrefabInstance: m_ObjectHideFlags: 0 @@ -11205,11 +11143,53 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 814781393} m_PrefabAsset: {fileID: 0} ---- !u!4 &861919841 stripped +--- !u!1 &819884910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 819884911} + m_Layer: 10 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &819884911 Transform: - m_CorrespondingSourceObject: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - m_PrefabInstance: {fileID: 2119287057} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819884910} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.51, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1238560272} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!70 &833297135 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927341563641} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.012937165, y: -0.08984017} + m_Size: {x: 0.58601534, y: 0.82031965} + m_Direction: 0 --- !u!1001 &869826067 PrefabInstance: m_ObjectHideFlags: 0 @@ -11227,7 +11207,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5267721061292888517, guid: 69e106b0947765d408a825983fc3fac0, type: 3} propertyPath: m_LocalPosition.x - value: -29.25 + value: -30 objectReference: {fileID: 0} - target: {fileID: 5267721061292888517, guid: 69e106b0947765d408a825983fc3fac0, type: 3} propertyPath: m_LocalPosition.y @@ -11293,7 +11273,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.y - value: 9.267904 + value: 8.267904 objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.z @@ -12412,6 +12392,213 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 1164592036} m_PrefabAsset: {fileID: 0} +--- !u!1 &1238560267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1238560272} + - component: {fileID: 1238560271} + - component: {fileID: 1238560270} + - component: {fileID: 1238560269} + - component: {fileID: 1238560268} + - component: {fileID: 1238560273} + - component: {fileID: 8919320862778890779} + m_Layer: 10 + m_Name: Mummy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!60 &1238560268 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238560267} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.875, y: 1.03125} + newSize: {x: 0.875, y: 1.03125} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.01050283, y: 0.51830614} + - {x: -0.03804493, y: 0.30102405} + - {x: -0.06719991, y: 0.11215283} + - {x: -0.19954701, y: 0.17721763} + - {x: -0.35172576, y: 0.33218575} + - {x: -0.42952424, y: 0.3248623} + - {x: -0.42164934, y: 0.21861035} + - {x: -0.30576783, y: 0.07783507} + - {x: -0.15711537, y: -0.014206134} + - {x: -0.12307759, y: -0.14472868} + - {x: -0.12483692, y: -0.23484956} + - {x: -0.15758227, y: -0.23566361} + - {x: -0.15446186, y: -0.327318} + - {x: -0.123628415, y: -0.32778835} + - {x: -0.12353212, y: -0.51483876} + - {x: 0.00047017095, y: -0.5159048} + - {x: 0.07817555, y: -0.21324027} + - {x: 0.3111925, y: -0.51857585} + - {x: 0.4375, y: -0.515625} + - {x: 0.3125105, y: -0.20174655} + - {x: 0.43713662, y: -0.11321354} + - {x: 0.44155252, y: 0.14519536} + - {x: 0.27001193, y: 0.3500944} + - {x: 0.19489595, y: 0.515625} +--- !u!114 &1238560269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238560267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6751c31468656894092c67dc838ac9a6, type: 3} + m_Name: + m_EditorClassIdentifier: + gravityScale: 1.5 + baseStats: + maxHealth: 3 + speedMultiplier: 1 + maxJumps: 1 + jumpForce: 500 + damage: 0 + groundCheckPoint: {fileID: 819884911} + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 + health: 0 +--- !u!50 &1238560270 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238560267} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!212 &1238560271 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238560267} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -1741269740, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.875, y: 1.03125} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1238560272 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238560267} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalPosition: {x: 422.5, y: -3.4, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 819884911} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!95 &1238560273 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238560267} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e9783ad7a740db24490f21bac3b9b298, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1001 &1267858711 PrefabInstance: m_ObjectHideFlags: 0 @@ -12664,6 +12851,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 1288347236} m_PrefabAsset: {fileID: 0} +--- !u!70 &1292770163 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927804837733} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.012937165, y: -0.08984017} + m_Size: {x: 0.58601534, y: 0.82031965} + m_Direction: 0 --- !u!1001 &1298531768 PrefabInstance: m_ObjectHideFlags: 0 @@ -13372,6 +13575,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6617642576055808877, guid: 308f1bf9ce39cde4688ce6d998c0565f, type: 3} m_PrefabInstance: {fileID: 1428033847} m_PrefabAsset: {fileID: 0} +--- !u!70 &1428768516 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320862840140564} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.12936941, y: 0} + m_Size: {x: 0.6162614, y: 1.03125} + m_Direction: 0 --- !u!1001 &1433319179 PrefabInstance: m_ObjectHideFlags: 0 @@ -13877,7 +14096,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8998169987422057300, guid: 43bb790f4ad5293458409f755aeddc9b, type: 3} propertyPath: m_LocalPosition.x - value: -15 + value: -9.25 objectReference: {fileID: 0} - target: {fileID: 8998169987422057300, guid: 43bb790f4ad5293458409f755aeddc9b, type: 3} propertyPath: m_LocalPosition.y @@ -14563,7 +14782,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8998169987422057300, guid: 43bb790f4ad5293458409f755aeddc9b, type: 3} propertyPath: m_LocalPosition.x - value: -11.75 + value: -6 objectReference: {fileID: 0} - target: {fileID: 8998169987422057300, guid: 43bb790f4ad5293458409f755aeddc9b, type: 3} propertyPath: m_LocalPosition.y @@ -14717,7 +14936,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.y - value: 9.267904 + value: 8.267904 objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.z @@ -305451,7 +305670,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.y - value: 9.267904 + value: 8.267904 objectReference: {fileID: 0} - target: {fileID: 295837306294826493, guid: 8b360e413c8b3f947a7b0f072403514d, type: 3} propertyPath: m_LocalPosition.z @@ -305509,7 +305728,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5267721061292888517, guid: 69e106b0947765d408a825983fc3fac0, type: 3} propertyPath: m_LocalPosition.x - value: 30.75 + value: 32.75 objectReference: {fileID: 0} - target: {fileID: 5267721061292888517, guid: 69e106b0947765d408a825983fc3fac0, type: 3} propertyPath: m_LocalPosition.y @@ -306067,68 +306286,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 1954126716} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1955727881 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1984304316} - m_Modifications: - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalPosition.x - value: 400.75 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalPosition.y - value: 14.6 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673885, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Name - value: Mummy (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} ---- !u!4 &1955727882 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - m_PrefabInstance: {fileID: 1955727881} - m_PrefabAsset: {fileID: 0} --- !u!1 &1961487387 GameObject: m_ObjectHideFlags: 0 @@ -324823,41 +324980,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 1983189679} m_PrefabAsset: {fileID: 0} ---- !u!1 &1984304315 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1984304316} - m_Layer: 0 - m_Name: Enemies - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1984304316 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1984304315} - 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: 861919841} - - {fileID: 565923084} - - {fileID: 1955727882} - - {fileID: 49594510} - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2019697999 GameObject: m_ObjectHideFlags: 0 @@ -325167,63 +325289,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2894666046278553864, guid: 8f6c22559c50b594496aaea2c749a6a4, type: 3} m_PrefabInstance: {fileID: 2117636798} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2119287057 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1984304316} - m_Modifications: - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalPosition.x - value: 23.839996 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalPosition.y - value: -14.32 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_Name - value: Zombie - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} --- !u!1001 &2127662255 PrefabInstance: m_ObjectHideFlags: 0 @@ -325356,6 +325421,38 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 2137490650} m_PrefabAsset: {fileID: 0} +--- !u!4 &199732719654464742 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927341563641} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -24.910004, y: -26.82, z: 0} + m_LocalScale: {x: 5, y: 6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2602158014812719780} + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &199732720268733818 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927804837733} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 23.839996, y: -14.32, z: 0} + m_LocalScale: {x: 5, y: 6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2602158012877245240} + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &242561286067450348 PrefabInstance: m_ObjectHideFlags: 0 @@ -325413,6 +325510,36 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dfcf644fe2158f64c8540e6e54c9a5e4, type: 3} +--- !u!4 &2602158012877245240 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8191793093634983870} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.001, y: -0.499, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 199732720268733818} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2602158014812719780 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8191793094366692898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.001, y: -0.499, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 199732719654464742} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3218036852604078191 PrefabInstance: m_ObjectHideFlags: 0 @@ -325478,6 +325605,150 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5634fecaf16a6234cbecd102e2675311, type: 3} +--- !u!212 &3542940353868576393 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927341563641} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, 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!212 &3542940355804444437 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927804837733} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, 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!95 &4349160083294555227 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927341563641} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e0579059f0698394b91f11d7e4bc1e7f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!95 &4349160084982566343 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927804837733} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e0579059f0698394b91f11d7e4bc1e7f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1001 &4788021208292696788 PrefabInstance: m_ObjectHideFlags: 0 @@ -325535,6 +325806,50 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7f57f82eafa6be46b71b71e9117b9bf, type: 3} +--- !u!1 &4799600927341563641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 199732719654464742} + - component: {fileID: 3542940353868576393} + - component: {fileID: 7876354948194620163} + - component: {fileID: 7434619227103773699} + - component: {fileID: 4349160083294555227} + - component: {fileID: 8374009869206708205} + - component: {fileID: 833297135} + m_Layer: 10 + m_Name: Zombie (1) + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &4799600927804837733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 199732720268733818} + - component: {fileID: 3542940355804444437} + - component: {fileID: 7876354948271887007} + - component: {fileID: 7434619225285215647} + - component: {fileID: 4349160084982566343} + - component: {fileID: 8374009868726263409} + - component: {fileID: 1292770163} + m_Layer: 10 + m_Name: Zombie + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &6691474245549666830 PrefabInstance: m_ObjectHideFlags: 0 @@ -325636,60 +325951,629 @@ PrefabInstance: objectReference: {fileID: 9063295841416902692, guid: a0ba51ee3fa7d25428dd81d9ee48ace9, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} ---- !u!1001 &8919320862215231254 -PrefabInstance: +--- !u!114 &7434619225285215647 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1984304316} - m_Modifications: - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalPosition.x - value: 422.5 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalPosition.y - value: -3.4 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673885, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Name - value: Mummy - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927804837733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6751c31468656894092c67dc838ac9a6, type: 3} + m_Name: + m_EditorClassIdentifier: + gravityScale: 1.5 + baseStats: + maxHealth: 3 + speedMultiplier: 1 + maxJumps: 1 + jumpForce: 500 + damage: 0 + groundCheckPoint: {fileID: 2602158012877245240} + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 + health: 0 +--- !u!114 &7434619227103773699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927341563641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6751c31468656894092c67dc838ac9a6, type: 3} + m_Name: + m_EditorClassIdentifier: + gravityScale: 1.5 + baseStats: + maxHealth: 3 + speedMultiplier: 1 + maxJumps: 1 + jumpForce: 500 + damage: 0 + groundCheckPoint: {fileID: 2602158014812719780} + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 + health: 0 +--- !u!50 &7876354948194620163 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927341563641} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!50 &7876354948271887007 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927804837733} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!1 &8191793093634983870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2602158012877245240} + m_Layer: 10 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &8191793094366692898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2602158014812719780} + m_Layer: 10 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!60 &8374009868726263409 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927804837733} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.25018322, y: -0.06131868} + - {x: 0.24924393, y: 0.0015283437} + - {x: 0.22211315, y: 0.002368521} + - {x: 0.21988362, y: 0.063510455} + - {x: 0.25186226, y: 0.06274653} + - {x: 0.25161874, y: 0.187289} + - {x: 0.2205683, y: 0.18843195} + - {x: 0.22007418, y: 0.25069618} + - {x: 0.18764253, y: 0.25115567} + - {x: 0.18764482, y: 0.28205344} + - {x: 0.09530307, y: 0.28201076} + - {x: 0.09450532, y: 0.311815} + - {x: 0.061127104, y: 0.31222564} + - {x: 0.060848728, y: 0.28091303} + - {x: -0.00024937838, y: 0.28107005} + - {x: -0.00025748226, y: 0.31361726} + - {x: -0.032501988, y: 0.31319395} + - {x: -0.03265647, y: 0.28087482} + - {x: -0.000997629, y: 0.2799999} + - {x: -0.0018962752, y: 0.25150684} + - {x: -0.032325733, y: 0.25013807} + - {x: -0.03171337, y: 0.12631121} + - {x: -0.15582198, y: 0.12842382} + - {x: -0.15540715, y: 0.09379548} + - {x: -0.21932296, y: 0.094253585} + - {x: -0.21885613, y: 0.063113414} + - {x: -0.24998015, y: 0.062444802} + - {x: -0.25039995, y: 0.00088302046} + - {x: -0.27987364, y: 0.0011970717} + - {x: -0.27994964, y: -0.030269377} + - {x: -0.31295708, y: -0.030762669} + - {x: -0.31404734, y: -0.061027683} + - {x: -0.3455596, y: -0.06082694} + - {x: -0.34401655, y: -0.12470007} + - {x: -0.31336495, y: -0.12609637} + - {x: -0.31247422, y: -0.15902151} + - {x: -0.21927421, y: -0.1619498} + - {x: -0.21915987, y: -0.2160559} + - {x: -0.24730948, y: -0.21943486} + - {x: -0.25000498, y: -0.24972314} + - {x: -0.28085735, y: -0.2524482} + - {x: -0.28032187, y: -0.2813004} + - {x: -0.31228638, y: -0.2812647} + - {x: -0.31371298, y: -0.37360686} + - {x: -0.34307098, y: -0.3741853} + - {x: -0.3440319, y: -0.40417448} + - {x: -0.31298617, y: -0.40494636} + - {x: -0.31475353, y: -0.46806902} + - {x: -0.34250525, y: -0.4673577} + - {x: -0.34196597, y: -0.5} + - {x: -0.24850044, y: -0.50065035} + - {x: -0.24751453, y: -0.3760564} + - {x: -0.2184577, y: -0.37525386} + - {x: -0.21846609, y: -0.3111339} + - {x: -0.187082, y: -0.31284425} + - {x: -0.18542004, y: -0.28503302} + - {x: -0.124415, y: -0.28176644} + - {x: -0.12281474, y: -0.25150424} + - {x: -0.09448738, y: -0.24960592} + - {x: -0.09406432, y: -0.21682861} + - {x: -0.0023855101, y: -0.21927963} + - {x: -0.0006275065, y: -0.2522452} + - {x: 0.028823482, y: -0.25205347} + - {x: 0.03030616, y: -0.31061852} + - {x: 0.06150809, y: -0.3122098} + - {x: 0.061172117, y: -0.37348002} + - {x: 0.033905327, y: -0.37436426} + - {x: 0.030949412, y: -0.43594742} + - {x: -0.0027501024, y: -0.43901345} + - {x: -0.0013702288, y: -0.49865782} + - {x: 0.12571864, y: -0.49936068} + - {x: 0.12487145, y: -0.4688261} + - {x: 0.09383451, y: -0.46857587} + - {x: 0.09376809, y: -0.43731087} + - {x: 0.1251156, y: -0.43759334} + - {x: 0.12617117, y: -0.40669215} + - {x: 0.15567595, y: -0.40729666} + - {x: 0.15592104, y: -0.28043506} + - {x: 0.1255914, y: -0.27999204} + - {x: 0.12477123, y: -0.21882217} + - {x: 0.09544516, y: -0.21841311} + - {x: 0.09299556, y: -0.18694769} + - {x: 0.06319696, y: -0.18533382} + - {x: 0.0653142, y: -0.15644352} + - {x: 0.09549953, y: -0.15402734} + - {x: 0.12503016, y: -0.093180865} + - {x: 0.18853198, y: -0.15594384} + - {x: 0.21840577, y: -0.21926005} + - {x: 0.24813324, y: -0.2488403} + - {x: 0.31373888, y: -0.24786459} + - {x: 0.3137243, y: -0.219399} + - {x: 0.34449852, y: -0.21778946} + - {x: 0.3438207, y: -0.15590215} + - {x: 0.31342927, y: -0.15432817} + - {x: 0.31132627, y: -0.1250647} + - {x: 0.27915064, y: -0.12528598} + - {x: 0.27996275, y: -0.06255028} +--- !u!60 &8374009869206708205 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927341563641} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.25018322, y: -0.06131868} + - {x: 0.24924393, y: 0.0015283437} + - {x: 0.22211315, y: 0.002368521} + - {x: 0.21988362, y: 0.063510455} + - {x: 0.25186226, y: 0.06274653} + - {x: 0.25161874, y: 0.187289} + - {x: 0.2205683, y: 0.18843195} + - {x: 0.22007418, y: 0.25069618} + - {x: 0.18764253, y: 0.25115567} + - {x: 0.18764482, y: 0.28205344} + - {x: 0.09530307, y: 0.28201076} + - {x: 0.09450532, y: 0.311815} + - {x: 0.061127104, y: 0.31222564} + - {x: 0.060848728, y: 0.28091303} + - {x: -0.00024937838, y: 0.28107005} + - {x: -0.00025748226, y: 0.31361726} + - {x: -0.032501988, y: 0.31319395} + - {x: -0.03265647, y: 0.28087482} + - {x: -0.000997629, y: 0.2799999} + - {x: -0.0018962752, y: 0.25150684} + - {x: -0.032325733, y: 0.25013807} + - {x: -0.03171337, y: 0.12631121} + - {x: -0.15582198, y: 0.12842382} + - {x: -0.15540715, y: 0.09379548} + - {x: -0.21932296, y: 0.094253585} + - {x: -0.21885613, y: 0.063113414} + - {x: -0.24998015, y: 0.062444802} + - {x: -0.25039995, y: 0.00088302046} + - {x: -0.27987364, y: 0.0011970717} + - {x: -0.27994964, y: -0.030269377} + - {x: -0.31295708, y: -0.030762669} + - {x: -0.31404734, y: -0.061027683} + - {x: -0.3455596, y: -0.06082694} + - {x: -0.34401655, y: -0.12470007} + - {x: -0.31336495, y: -0.12609637} + - {x: -0.31247422, y: -0.15902151} + - {x: -0.21927421, y: -0.1619498} + - {x: -0.21915987, y: -0.2160559} + - {x: -0.24730948, y: -0.21943486} + - {x: -0.25000498, y: -0.24972314} + - {x: -0.28085735, y: -0.2524482} + - {x: -0.28032187, y: -0.2813004} + - {x: -0.31228638, y: -0.2812647} + - {x: -0.31371298, y: -0.37360686} + - {x: -0.34307098, y: -0.3741853} + - {x: -0.3440319, y: -0.40417448} + - {x: -0.31298617, y: -0.40494636} + - {x: -0.31475353, y: -0.46806902} + - {x: -0.34250525, y: -0.4673577} + - {x: -0.34196597, y: -0.5} + - {x: -0.24850044, y: -0.50065035} + - {x: -0.24751453, y: -0.3760564} + - {x: -0.2184577, y: -0.37525386} + - {x: -0.21846609, y: -0.3111339} + - {x: -0.187082, y: -0.31284425} + - {x: -0.18542004, y: -0.28503302} + - {x: -0.124415, y: -0.28176644} + - {x: -0.12281474, y: -0.25150424} + - {x: -0.09448738, y: -0.24960592} + - {x: -0.09406432, y: -0.21682861} + - {x: -0.0023855101, y: -0.21927963} + - {x: -0.0006275065, y: -0.2522452} + - {x: 0.028823482, y: -0.25205347} + - {x: 0.03030616, y: -0.31061852} + - {x: 0.06150809, y: -0.3122098} + - {x: 0.061172117, y: -0.37348002} + - {x: 0.033905327, y: -0.37436426} + - {x: 0.030949412, y: -0.43594742} + - {x: -0.0027501024, y: -0.43901345} + - {x: -0.0013702288, y: -0.49865782} + - {x: 0.12571864, y: -0.49936068} + - {x: 0.12487145, y: -0.4688261} + - {x: 0.09383451, y: -0.46857587} + - {x: 0.09376809, y: -0.43731087} + - {x: 0.1251156, y: -0.43759334} + - {x: 0.12617117, y: -0.40669215} + - {x: 0.15567595, y: -0.40729666} + - {x: 0.15592104, y: -0.28043506} + - {x: 0.1255914, y: -0.27999204} + - {x: 0.12477123, y: -0.21882217} + - {x: 0.09544516, y: -0.21841311} + - {x: 0.09299556, y: -0.18694769} + - {x: 0.06319696, y: -0.18533382} + - {x: 0.0653142, y: -0.15644352} + - {x: 0.09549953, y: -0.15402734} + - {x: 0.12503016, y: -0.093180865} + - {x: 0.18853198, y: -0.15594384} + - {x: 0.21840577, y: -0.21926005} + - {x: 0.24813324, y: -0.2488403} + - {x: 0.31373888, y: -0.24786459} + - {x: 0.3137243, y: -0.219399} + - {x: 0.34449852, y: -0.21778946} + - {x: 0.3438207, y: -0.15590215} + - {x: 0.31342927, y: -0.15432817} + - {x: 0.31132627, y: -0.1250647} + - {x: 0.27915064, y: -0.12528598} + - {x: 0.27996275, y: -0.06255028} +--- !u!4 &8919320861079350896 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861079350897} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.51, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8919320862840140559} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8919320861079350897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8919320861079350896} + m_Layer: 10 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!70 &8919320862778890779 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238560267} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.12936941, y: 0} + m_Size: {x: 0.6162614, y: 1.03125} + m_Direction: 0 +--- !u!95 &8919320862840140558 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320862840140564} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e9783ad7a740db24490f21bac3b9b298, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &8919320862840140559 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320862840140564} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalPosition: {x: 400.75, y: 14.6, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8919320861079350896} + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!212 &8919320862840140560 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320862840140564} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -1741269740, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.875, y: 1.03125} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &8919320862840140561 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320862840140564} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &8919320862840140562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320862840140564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6751c31468656894092c67dc838ac9a6, type: 3} + m_Name: + m_EditorClassIdentifier: + gravityScale: 1.5 + baseStats: + maxHealth: 3 + speedMultiplier: 1 + maxJumps: 1 + jumpForce: 500 + damage: 0 + groundCheckPoint: {fileID: 8919320861079350896} + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 + health: 0 +--- !u!60 &8919320862840140563 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320862840140564} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.875, y: 1.03125} + newSize: {x: 0.875, y: 1.03125} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.01050283, y: 0.51830614} + - {x: -0.03804493, y: 0.30102405} + - {x: -0.06719991, y: 0.11215283} + - {x: -0.19954701, y: 0.17721763} + - {x: -0.35172576, y: 0.33218575} + - {x: -0.42952424, y: 0.3248623} + - {x: -0.42164934, y: 0.21861035} + - {x: -0.30576783, y: 0.07783507} + - {x: -0.15711537, y: -0.014206134} + - {x: -0.12307759, y: -0.14472868} + - {x: -0.12483692, y: -0.23484956} + - {x: -0.15758227, y: -0.23566361} + - {x: -0.15446186, y: -0.327318} + - {x: -0.123628415, y: -0.32778835} + - {x: -0.12353212, y: -0.51483876} + - {x: 0.00047017095, y: -0.5159048} + - {x: 0.07817555, y: -0.21324027} + - {x: 0.3111925, y: -0.51857585} + - {x: 0.4375, y: -0.515625} + - {x: 0.3125105, y: -0.20174655} + - {x: 0.43713662, y: -0.11321354} + - {x: 0.44155252, y: 0.14519536} + - {x: 0.27001193, y: 0.3500944} + - {x: 0.19489595, y: 0.515625} +--- !u!1 &8919320862840140564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8919320862840140559} + - component: {fileID: 8919320862840140560} + - component: {fileID: 8919320862840140561} + - component: {fileID: 8919320862840140562} + - component: {fileID: 8919320862840140563} + - component: {fileID: 8919320862840140558} + - component: {fileID: 1428768516} + m_Layer: 10 + m_Name: Mummy (1) + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 diff --git a/Assets/Scripts/Actors/Actor.cs b/Assets/Scripts/Actors/Actor.cs index 9a4b338..6b82060 100644 --- a/Assets/Scripts/Actors/Actor.cs +++ b/Assets/Scripts/Actors/Actor.cs @@ -15,6 +15,7 @@ namespace MontanaJohns.Actors [SerializeField] protected float gravityScale = 1.5f; [SerializeField] protected Stats baseStats = Stats.DefaultBaseStats(); [SerializeField] protected Transform groundCheckPoint; + [SerializeField] protected float invulnTime = 0f; protected Rigidbody2D _rigidBody; protected SpriteRenderer _renderer; @@ -32,6 +33,8 @@ namespace MontanaJohns.Actors public Stats stats; public int health; + public bool invuln; + protected virtual void Awake() { _rigidBody = GetComponent(); @@ -39,10 +42,7 @@ namespace MontanaJohns.Actors _renderer = GetComponent(); _animator = GetComponent(); groundLayers = LayerMask.GetMask("Grapple", "Ground"); - } - protected virtual void Start() - { _rigidBody.freezeRotation = true; _rigidBody.collisionDetectionMode = CollisionDetectionMode2D.Continuous; _rigidBody.gravityScale = gravityScale; @@ -53,6 +53,11 @@ namespace MontanaJohns.Actors jumpCount = stats.maxJumps; } + protected virtual void Start() + { + + } + protected virtual void FixedUpdate() { if (!_animator.GetBool("airborn") && !Physics2D.OverlapCircle(groundCheckPoint.position, 0.2f, groundLayers)) @@ -137,18 +142,29 @@ namespace MontanaJohns.Actors public virtual void TakeDamage(int damage) { - health -= damage; - StartCoroutine(DamageAnimation()); + StartCoroutine(Damage(damage)); + } + + private IEnumerator Damage(int damage) + { + if(!invuln) + { + invuln = true; + health -= damage; + StartCoroutine(DamageAnimation()); + yield return new WaitForSeconds(invulnTime); + invuln = false; + } } - IEnumerator DamageAnimation() + private IEnumerator DamageAnimation() { _renderer.color = Color.red; yield return new WaitForSeconds(0.5f); _renderer.color = Color.white; } - IEnumerator Falling() + private IEnumerator Falling() { _animator.SetBool("airborn", true); diff --git a/Assets/Scripts/LevelController.cs b/Assets/Scripts/LevelController.cs index 7c7355e..1b8bd47 100644 --- a/Assets/Scripts/LevelController.cs +++ b/Assets/Scripts/LevelController.cs @@ -1,12 +1,15 @@ using System.Collections; using System.Collections.Generic; +using UnityEditor; using UnityEngine; using UnityEngine.SceneManagement; public class LevelController : MonoBehaviour { [SerializeField] GameObject treasure; - // Start is called before the first frame update + [SerializeField] List enemies; + + private string clone = "(Clone)"; public void StartGame() { @@ -15,13 +18,44 @@ public class LevelController : MonoBehaviour public void ResetLevel() { + //Destroy Destroy(GameObject.Find("Boulder(Clone)")); Destroy(GameObject.Find("BoobyTrapSpawnPoint(Clone)")); - var currentTreasure = GameObject.Find("Treasure"); - if(currentTreasure) - Destroy(currentTreasure); - else - Destroy(GameObject.Find("Treasure(Clone)")); + CloneDestroy("Treasure"); + DestroyList(enemies); + + //Instantiate Instantiate(treasure); + InstantiateList(enemies); + } + + private void CloneDestroy(string objectName) + { + var obj = GameObject.Find(objectName); + if (obj) + Destroy(obj); + else + { + obj = GameObject.Find(objectName + clone); + if (obj) + Destroy(GameObject.Find(objectName + clone)); + } + } + + private void DestroyList(List gameObjects) + { + foreach(GameObject obj in gameObjects) + { + CloneDestroy(obj.name); + } + } + + private void InstantiateList(List gameObjects) + { + foreach (GameObject obj in gameObjects) + { + PrefabUtility.RevertPrefabInstance(obj, InteractionMode.AutomatedAction); + Instantiate(obj); + } } } diff --git a/Assets/Sprites/SpriteAtlas.spriteatlas b/Assets/Sprites/SpriteAtlas.spriteatlas new file mode 100644 index 0000000..a6dd02e --- /dev/null +++ b/Assets/Sprites/SpriteAtlas.spriteatlas @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!687078895 &4343727234628468602 +SpriteAtlas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SpriteAtlas + m_EditorData: + serializedVersion: 2 + textureSettings: + serializedVersion: 2 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 + textureCompression: 0 + filterMode: 1 + generateMipMaps: 0 + readable: 0 + crunchedCompression: 0 + sRGB: 1 + platformSettings: [] + packingSettings: + serializedVersion: 2 + padding: 4 + blockOffset: 1 + allowAlphaSplitting: 0 + enableRotation: 1 + enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} + variantMultiplier: 1 + packables: + - {fileID: 102900000, guid: d0603b6d5186471b96c778c3949c7ce2, type: 3} + bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + m_MasterAtlas: {fileID: 0} + m_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] + m_RenderDataMap: {} + m_Tag: SpriteAtlas + m_IsVariant: 0 diff --git a/Assets/Sprites/SpriteAtlas.spriteatlas.meta b/Assets/Sprites/SpriteAtlas.spriteatlas.meta new file mode 100644 index 0000000..f141483 --- /dev/null +++ b/Assets/Sprites/SpriteAtlas.spriteatlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62f028a274ccb2e49948eeb010ccd482 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4343727234628468602 + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.2.3-70-g09d2