From 626057f677ee9e707fd21399a4e07e1cfd6016ae Mon Sep 17 00:00:00 2001 From: cross28 Date: Thu, 14 Apr 2022 20:17:12 -0500 Subject: Moved projectile firing logic to Player class --- Assets/Scripts/Actors/Enemy.cs | 22 ++++++++++++++++++++++ Assets/Scripts/Actors/Enemy.cs.meta | 11 +++++++++++ Assets/Scripts/Actors/Player.cs | 8 ++++++++ Assets/Scripts/Weapon.cs | 23 ----------------------- Assets/Scripts/Weapon.cs.meta | 11 ----------- 5 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 Assets/Scripts/Actors/Enemy.cs create mode 100644 Assets/Scripts/Actors/Enemy.cs.meta delete mode 100644 Assets/Scripts/Weapon.cs delete mode 100644 Assets/Scripts/Weapon.cs.meta (limited to 'Assets/Scripts') diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs new file mode 100644 index 0000000..b45f7d3 --- /dev/null +++ b/Assets/Scripts/Actors/Enemy.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MontanaJohns.Actors +{ + [RequireComponent(typeof(Rigidbody2D))] + public class Enemy : Actor + { + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } +} diff --git a/Assets/Scripts/Actors/Enemy.cs.meta b/Assets/Scripts/Actors/Enemy.cs.meta new file mode 100644 index 0000000..26a1d77 --- /dev/null +++ b/Assets/Scripts/Actors/Enemy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6751c31468656894092c67dc838ac9a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Actors/Player.cs b/Assets/Scripts/Actors/Player.cs index 3192338..012c09a 100644 --- a/Assets/Scripts/Actors/Player.cs +++ b/Assets/Scripts/Actors/Player.cs @@ -10,6 +10,8 @@ namespace MontanaJohns.Actors { public Transform ActorTransform => _transform; public Camera MainCamera => _camera; + public GameObject projectilePrefab; + public Transform firePoint; Camera _camera; PlayerInput playerInput; @@ -27,6 +29,7 @@ namespace MontanaJohns.Actors jump.started += context => Jump(); use.started += context => Use(); + use.started += context => Fire(); } protected override void Start() @@ -49,5 +52,10 @@ namespace MontanaJohns.Actors base.Move(move.ReadValue().x); } } + + protected void Fire() + { + Instantiate(projectilePrefab, firePoint.position, firePoint.rotation); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Weapon.cs b/Assets/Scripts/Weapon.cs deleted file mode 100644 index 1af1abb..0000000 --- a/Assets/Scripts/Weapon.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Weapon : MonoBehaviour -{ - public Transform firePoint; - public GameObject projectilePrefab; - - // Update is called once per frame - void Update() - { - if (Input.GetButtonDown("Fire1")) - { - Shoot(); - } - } - - void Shoot() - { - Instantiate(projectilePrefab, firePoint.position, firePoint.rotation); - } -} diff --git a/Assets/Scripts/Weapon.cs.meta b/Assets/Scripts/Weapon.cs.meta deleted file mode 100644 index 6546dd7..0000000 --- a/Assets/Scripts/Weapon.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2b8de137e60a3cb418e266e99100d25f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3-70-g09d2 From 584b852c81c3504a823eee6eba83aa2eae53b023 Mon Sep 17 00:00:00 2001 From: cross28 Date: Fri, 15 Apr 2022 00:53:44 -0500 Subject: feat: set up template for zombie animation --- Assets/Animations/Enemies.meta | 8 + Assets/Animations/Enemies/Zombie.meta | 8 + Assets/Animations/Enemies/Zombie/Idle.anim | 53 + Assets/Animations/Enemies/Zombie/Idle.anim.meta | 8 + Assets/Animations/Enemies/Zombie/Moving.anim | 53 + Assets/Animations/Enemies/Zombie/Moving.anim.meta | 8 + Assets/Animations/Enemies/Zombie/Zombie.controller | 153 +++ .../Enemies/Zombie/Zombie.controller.meta | 8 + Assets/Prefabs/Enemies.meta | 8 + Assets/Prefabs/Enemies/Zombie.prefab | 171 +++ Assets/Prefabs/Enemies/Zombie.prefab.meta | 7 + Assets/Scenes/Jungle.unity | 13 + Assets/Scripts/Actors/Enemy.cs | 11 +- Assets/Sprites/Enemies.meta | 8 + Assets/Sprites/Enemies/5 Mummy.meta | 8 + Assets/Sprites/Enemies/5 Mummy/Mummy.png | Bin 0 -> 1179 bytes Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta | 98 ++ Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png | Bin 0 -> 1829 bytes .../Sprites/Enemies/5 Mummy/Mummy_attack.png.meta | 98 ++ Assets/Sprites/Enemies/5 Mummy/Mummy_death.png | Bin 0 -> 1713 bytes .../Sprites/Enemies/5 Mummy/Mummy_death.png.meta | 98 ++ Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png | Bin 0 -> 1327 bytes Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png.meta | 98 ++ Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png | Bin 0 -> 1460 bytes Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta | 98 ++ Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png | Bin 0 -> 1672 bytes Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta | 98 ++ Assets/Sprites/Enemies/Zombie.png | Bin 0 -> 16388 bytes Assets/Sprites/Enemies/Zombie.png.meta | 1300 ++++++++++++++++++++ 29 files changed, 2409 insertions(+), 4 deletions(-) create mode 100644 Assets/Animations/Enemies.meta create mode 100644 Assets/Animations/Enemies/Zombie.meta create mode 100644 Assets/Animations/Enemies/Zombie/Idle.anim create mode 100644 Assets/Animations/Enemies/Zombie/Idle.anim.meta create mode 100644 Assets/Animations/Enemies/Zombie/Moving.anim create mode 100644 Assets/Animations/Enemies/Zombie/Moving.anim.meta create mode 100644 Assets/Animations/Enemies/Zombie/Zombie.controller create mode 100644 Assets/Animations/Enemies/Zombie/Zombie.controller.meta create mode 100644 Assets/Prefabs/Enemies.meta create mode 100644 Assets/Prefabs/Enemies/Zombie.prefab create mode 100644 Assets/Prefabs/Enemies/Zombie.prefab.meta create mode 100644 Assets/Sprites/Enemies.meta create mode 100644 Assets/Sprites/Enemies/5 Mummy.meta create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy.png create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_death.png create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_death.png.meta create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png.meta create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta create mode 100644 Assets/Sprites/Enemies/Zombie.png create mode 100644 Assets/Sprites/Enemies/Zombie.png.meta (limited to 'Assets/Scripts') diff --git a/Assets/Animations/Enemies.meta b/Assets/Animations/Enemies.meta new file mode 100644 index 0000000..a6db7d1 --- /dev/null +++ b/Assets/Animations/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e31571f5dfbf8ca4d831968244b775b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Zombie.meta b/Assets/Animations/Enemies/Zombie.meta new file mode 100644 index 0000000..20f617f --- /dev/null +++ b/Assets/Animations/Enemies/Zombie.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f74db35a3ced6fe4abffd8f34a53adf9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Zombie/Idle.anim b/Assets/Animations/Enemies/Zombie/Idle.anim new file mode 100644 index 0000000..c89c100 --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Idle.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemies/Zombie/Idle.anim.meta b/Assets/Animations/Enemies/Zombie/Idle.anim.meta new file mode 100644 index 0000000..a3204c0 --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4c07776cf364714f996da50902ab553 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Zombie/Moving.anim b/Assets/Animations/Enemies/Zombie/Moving.anim new file mode 100644 index 0000000..e8c12fb --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Moving.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Moving + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemies/Zombie/Moving.anim.meta b/Assets/Animations/Enemies/Zombie/Moving.anim.meta new file mode 100644 index 0000000..d08dedf --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Moving.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c65a4008d81eec4fa1a98d6a2218261 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Zombie/Zombie.controller b/Assets/Animations/Enemies/Zombie/Zombie.controller new file mode 100644 index 0000000..3f9455b --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Zombie.controller @@ -0,0 +1,153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8731865481558821802 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6089190274217570171} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-6204006212838014119 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8969007887231168511} + m_Position: {x: 320, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6089190274217570171} + m_Position: {x: 320, y: 10, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8969007887231168511} +--- !u!1102 &-6089190274217570171 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Moving + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8139433511157601217} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Zombie + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: moving + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6204006212838014119} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &8139433511157601217 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8969007887231168511} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &8969007887231168511 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8731865481558821802} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a4c07776cf364714f996da50902ab553, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animations/Enemies/Zombie/Zombie.controller.meta b/Assets/Animations/Enemies/Zombie/Zombie.controller.meta new file mode 100644 index 0000000..948bc3a --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Zombie.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0579059f0698394b91f11d7e4bc1e7f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemies.meta b/Assets/Prefabs/Enemies.meta new file mode 100644 index 0000000..4567174 --- /dev/null +++ b/Assets/Prefabs/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 655da936dd13fd241a00580c37354fee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/Zombie.prefab b/Assets/Prefabs/Enemies/Zombie.prefab new file mode 100644 index 0000000..c1fbcf2 --- /dev/null +++ b/Assets/Prefabs/Enemies/Zombie.prefab @@ -0,0 +1,171 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4799600927363337844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 199732719703436395} + - component: {fileID: 3542940353895036420} + - component: {fileID: 7876354948243592078} + - component: {fileID: -1788752809794239346} + m_Layer: 10 + m_Name: Zombie + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &199732719703436395 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927363337844} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.71, y: -0.12, z: 0} + m_LocalScale: {x: 5, y: 6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2602158014784719401} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3542940353895036420 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927363337844} + 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!50 &7876354948243592078 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927363337844} + 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 &-1788752809794239346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927363337844} + 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 + groundLayer: + serializedVersion: 2 + m_Bits: 0 + groundCheckPoint: {fileID: 0} + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 + health: 0 +--- !u!1 &8191793094342821551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2602158014784719401} + m_Layer: 10 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2602158014784719401 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8191793094342821551} + 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: 199732719703436395} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Enemies/Zombie.prefab.meta b/Assets/Prefabs/Enemies/Zombie.prefab.meta new file mode 100644 index 0000000..e192357 --- /dev/null +++ b/Assets/Prefabs/Enemies/Zombie.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: be3f47d037eef1240b8271b5e1da25ba +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity index ff1f7aa..71ebcd4 100644 --- a/Assets/Scenes/Jungle.unity +++ b/Assets/Scenes/Jungle.unity @@ -551,6 +551,11 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!4 &371069633 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + m_PrefabInstance: {fileID: 6691474245549666830} + m_PrefabAsset: {fileID: 0} --- !u!1001 &468852580 PrefabInstance: m_ObjectHideFlags: 0 @@ -17551,5 +17556,13 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 2776418409999972327, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: firePoint + value: + objectReference: {fileID: 371069633} + - target: {fileID: 2776418409999972327, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: projectilePrefab + value: + objectReference: {fileID: 9063295841416902692, guid: a0ba51ee3fa7d25428dd81d9ee48ace9, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs index b45f7d3..95ed278 100644 --- a/Assets/Scripts/Actors/Enemy.cs +++ b/Assets/Scripts/Actors/Enemy.cs @@ -7,16 +7,19 @@ namespace MontanaJohns.Actors [RequireComponent(typeof(Rigidbody2D))] public class Enemy : Actor { - // Start is called before the first frame update - void Start() + GameObject player; + + protected override void Awake() { - + base.Awake(); + player = GameObject.FindGameObjectWithTag("Player"); } // Update is called once per frame void Update() { - + if (player.transform.position.x < transform.position.x) Move(-stats.speedMultiplier * 0.5f); + else Move(stats.speedMultiplier * 0.5f); } } } diff --git a/Assets/Sprites/Enemies.meta b/Assets/Sprites/Enemies.meta new file mode 100644 index 0000000..d3c6c89 --- /dev/null +++ b/Assets/Sprites/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1efb53728461fec40b200c91bda26c14 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/5 Mummy.meta b/Assets/Sprites/Enemies/5 Mummy.meta new file mode 100644 index 0000000..b2412a7 --- /dev/null +++ b/Assets/Sprites/Enemies/5 Mummy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c69a814ad6f5bb47851d0b665295ad6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy.png b/Assets/Sprites/Enemies/5 Mummy/Mummy.png new file mode 100644 index 0000000..e97778f Binary files /dev/null and b/Assets/Sprites/Enemies/5 Mummy/Mummy.png differ diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta new file mode 100644 index 0000000..cc49040 --- /dev/null +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 73888ec3497e9fb479db0e58435a0157 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png b/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png new file mode 100644 index 0000000..b4148e6 Binary files /dev/null and b/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png differ diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta new file mode 100644 index 0000000..0e3a860 --- /dev/null +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: f4dc9b04cabb2f043a9cfce676e01924 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_death.png b/Assets/Sprites/Enemies/5 Mummy/Mummy_death.png new file mode 100644 index 0000000..128f0c8 Binary files /dev/null and b/Assets/Sprites/Enemies/5 Mummy/Mummy_death.png differ diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_death.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_death.png.meta new file mode 100644 index 0000000..29d9be8 --- /dev/null +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_death.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 4e29e67dc6444634bae896f2cad0b1a5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png b/Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png new file mode 100644 index 0000000..ee8d938 Binary files /dev/null and b/Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png differ diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png.meta new file mode 100644 index 0000000..aa021b9 --- /dev/null +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_hurt.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: b19ebb5e62ac56244a79bc271965bd53 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png b/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png new file mode 100644 index 0000000..68552c9 Binary files /dev/null and b/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png differ diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta new file mode 100644 index 0000000..2e07855 --- /dev/null +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 1480995e4fc038b4c91e94b26a99613d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png b/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png new file mode 100644 index 0000000..5b6638b Binary files /dev/null and b/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png differ diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta new file mode 100644 index 0000000..196df19 --- /dev/null +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 8667283d5cec0bb48af6052eed07ffd4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/Zombie.png b/Assets/Sprites/Enemies/Zombie.png new file mode 100644 index 0000000..c8ca02c Binary files /dev/null and b/Assets/Sprites/Enemies/Zombie.png differ diff --git a/Assets/Sprites/Enemies/Zombie.png.meta b/Assets/Sprites/Enemies/Zombie.png.meta new file mode 100644 index 0000000..95a3461 --- /dev/null +++ b/Assets/Sprites/Enemies/Zombie.png.meta @@ -0,0 +1,1300 @@ +fileFormatVersion: 2 +guid: 5b8b5784d85f20e4db4cd6c05e225e16 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Zombie_0 + rect: + serializedVersion: 2 + x: 0 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 10072b072a1648e47850a7e27e0cc061 + internalID: -1785555725 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_1 + rect: + serializedVersion: 2 + x: 32 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c487a5e93211f9345bd1baa006e0cd12 + internalID: -898720914 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_2 + rect: + serializedVersion: 2 + x: 64 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9e67c4d89f9a75243978503cbb239308 + internalID: -1434709672 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_3 + rect: + serializedVersion: 2 + x: 96 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 70d4172574bc47f45adab0af393e32d5 + internalID: -2003769690 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_4 + rect: + serializedVersion: 2 + x: 128 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8b328d89570c776418cb385fbb538076 + internalID: 606266643 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_5 + rect: + serializedVersion: 2 + x: 160 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ee40c5216fb078f4cbdcfed5d7763b74 + internalID: -1702410671 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_6 + rect: + serializedVersion: 2 + x: 192 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d7b843e07a021c446b6dcd471cb40fb2 + internalID: 1762682961 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_7 + rect: + serializedVersion: 2 + x: 224 + y: 160 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1cd34356ad648e847bf3c9ff58c7496b + internalID: 395807849 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_8 + rect: + serializedVersion: 2 + x: 0 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 88afb979fe1f9db42bc6ddcbcd074b99 + internalID: 2078424329 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_9 + rect: + serializedVersion: 2 + x: 32 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d35c82c3693aabe4aacd4c417c15a2ed + internalID: 828034450 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_10 + rect: + serializedVersion: 2 + x: 64 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7dfe337bc2ee0754d8dd0d745245a4de + internalID: -302372421 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_11 + rect: + serializedVersion: 2 + x: 96 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7ce7cc12da7f5254e8a3f37cfaebf8a3 + internalID: -85932321 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_12 + rect: + serializedVersion: 2 + x: 128 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 95283717fc1edb14e8c6aa855789bc14 + internalID: 1639612969 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_13 + rect: + serializedVersion: 2 + x: 160 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a07ed515a27be2745a26dd20c5ecad55 + internalID: -1764084075 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_14 + rect: + serializedVersion: 2 + x: 192 + y: 128 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2a1126ea6ab7af646912200fdf3148f8 + internalID: -560229937 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_15 + rect: + serializedVersion: 2 + x: 0 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6aadf775e4af5da44900d131316a639e + internalID: -459294537 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_16 + rect: + serializedVersion: 2 + x: 32 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6feee2e413f7d174d908d25d7d6a18c8 + internalID: -932836783 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_17 + rect: + serializedVersion: 2 + x: 64 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 52e6a9c8e421a6a48975cfdcf5e76f01 + internalID: 2098029280 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_18 + rect: + serializedVersion: 2 + x: 96 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0cc71d1862a0ff24ca8a13b1d6fa01c6 + internalID: -948577929 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_19 + rect: + serializedVersion: 2 + x: 128 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3813390acf4e32547b2252b512c6696a + internalID: -1063589079 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_20 + rect: + serializedVersion: 2 + x: 160 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 239ab4ab87f0d824ca800696f384dbc8 + internalID: -1106049903 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_21 + rect: + serializedVersion: 2 + x: 192 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7bd0f406b41129744bf2daac3d61434e + internalID: -1787249033 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_22 + rect: + serializedVersion: 2 + x: 224 + y: 96 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2c4fc4fa832ca8f4984703b9c64351d7 + internalID: -1687654213 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_23 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a8e7199e52174b44ba837257f8c7f0a3 + internalID: 1977141023 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_24 + rect: + serializedVersion: 2 + x: 32 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9d8fec12a649cf244b7c6ca6a7d76c83 + internalID: 270513617 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_25 + rect: + serializedVersion: 2 + x: 64 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 25cdc51c5a70e154bbc21c6214c2d15f + internalID: -1460582567 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_26 + rect: + serializedVersion: 2 + x: 96 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 526b4e93d95fdeb4490de7c4ea515c67 + internalID: 320187862 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_27 + rect: + serializedVersion: 2 + x: 128 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6e7d3f03abc97354080ffcc028a503a5 + internalID: 221044790 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_28 + rect: + serializedVersion: 2 + x: 160 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f1558d9573d40cc49b06ea28de3971e3 + internalID: 1870173156 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_29 + rect: + serializedVersion: 2 + x: 192 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 01e1d10582eb1f44086a7dbb2772747e + internalID: 312136778 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_30 + rect: + serializedVersion: 2 + x: 224 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 372caa620d8bf4046acd7edbad2022b6 + internalID: 1390911363 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_31 + rect: + serializedVersion: 2 + x: 256 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 983db5ebb865bdc4d92a56ded6034a3f + internalID: 604614354 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_32 + rect: + serializedVersion: 2 + x: 288 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ef94e818b0ff60043b7f199e1803e0cc + internalID: -2088101773 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_33 + rect: + serializedVersion: 2 + x: 320 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 182bce9a406200f4896ae58576aac1e5 + internalID: -1018249618 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_34 + rect: + serializedVersion: 2 + x: 352 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7e197451aa55949439dd99584ba6132f + internalID: 406377794 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_35 + rect: + serializedVersion: 2 + x: 384 + y: 64 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5862b2664e56b094eb370b191e424254 + internalID: 1116846770 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_36 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f6f36792f0cff0f4f8c66c2d20bcee70 + internalID: 882908053 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_37 + rect: + serializedVersion: 2 + x: 32 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3095005655f9e1f45b88844d2f9d9567 + internalID: 901438849 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_38 + rect: + serializedVersion: 2 + x: 64 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e5707d1a49dab6e4f9212506ec8caedb + internalID: -4352385 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_39 + rect: + serializedVersion: 2 + x: 96 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 00d635852d3767f45a17fef96562db11 + internalID: -744668395 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_40 + rect: + serializedVersion: 2 + x: 128 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f780e793de6feea4489e4b29b272da5e + internalID: -195805391 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_41 + rect: + serializedVersion: 2 + x: 160 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f77942ac804fc1447ac09ef371136c53 + internalID: 1786249903 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_42 + rect: + serializedVersion: 2 + x: 192 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7f51ace41311854449474ef7178a4a0c + internalID: 1100783711 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_43 + rect: + serializedVersion: 2 + x: 224 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9518a1e4121a66644b8227e3a8dd8d2d + internalID: 2100858986 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_44 + rect: + serializedVersion: 2 + x: 256 + y: 32 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 19272a8f332272d4d8c7845a50fdb4e0 + internalID: -1508274598 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_45 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3ef030eebd5ce1b4290488552312a4eb + internalID: -1251365740 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_46 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d71fda72ccfdc6847b1c51dbac1db683 + internalID: -770177244 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_47 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7615ba825658bcf45b3c70c158ec748e + internalID: -7892910 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_48 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 38586da203b18764ba296947a650665a + internalID: -395400854 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_49 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b78d2ebf6db22014dbbfeab1e0b78777 + internalID: 1277000262 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_50 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0acc56fffdbab6743b2d1504e789db4e + internalID: 1283259838 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_51 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4f49f304b3e29ab419f39dc41a916902 + internalID: -2145877637 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Zombie_52 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9c8dba7e651d2f046b2c0bf6f43a67df + internalID: -352885454 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Zombie_19: -1063589079 + Zombie_29: 312136778 + Zombie_2: -1434709672 + Zombie_48: -395400854 + Zombie_33: -1018249618 + Zombie_38: -4352385 + Zombie_32: -2088101773 + Zombie_30: 1390911363 + Zombie_44: -1508274598 + Zombie_16: -932836783 + Zombie_50: 1283259838 + Zombie_52: -352885454 + Zombie_9: 828034450 + Zombie_49: 1277000262 + Zombie_4: 606266643 + Zombie_11: -85932321 + Zombie_22: -1687654213 + Zombie_40: -195805391 + Zombie_41: 1786249903 + Zombie_25: -1460582567 + Zombie_39: -744668395 + Zombie_18: -948577929 + Zombie_12: 1639612969 + Zombie_31: 604614354 + Zombie_34: 406377794 + Zombie_51: -2145877637 + Zombie_0: -1785555725 + Zombie_17: 2098029280 + Zombie_35: 1116846770 + Zombie_37: 901438849 + Zombie_6: 1762682961 + Zombie_36: 882908053 + Zombie_3: -2003769690 + Zombie_42: 1100783711 + Zombie_10: -302372421 + Zombie_28: 1870173156 + Zombie_5: -1702410671 + Zombie_8: 2078424329 + Zombie_15: -459294537 + Zombie_45: -1251365740 + Zombie_7: 395807849 + Zombie_20: -1106049903 + Zombie_24: 270513617 + Zombie_27: 221044790 + Zombie_23: 1977141023 + Zombie_46: -770177244 + Zombie_1: -898720914 + Zombie_13: -1764084075 + Zombie_47: -7892910 + Zombie_43: 2100858986 + Zombie_21: -1787249033 + Zombie_26: 320187862 + Zombie_14: -560229937 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.2.3-70-g09d2 From c86860eb94cd1d3bdd8beda44c2b9faee56a6d99 Mon Sep 17 00:00:00 2001 From: cross28 Date: Fri, 15 Apr 2022 02:14:57 -0500 Subject: feat: added poly collider to zombie prefab --- Assets/Animations/Prototype.meta | 8 ++ Assets/Animations/Prototype/Player.controller.meta | 8 -- Assets/Prefabs/Enemies/Zombie.prefab | 155 +++++++++++++++++++-- Assets/Scenes/Jungle.unity | 64 ++++++++- Assets/Scripts/Actors/Enemy.cs | 2 - Assets/Sprites/Player/PrototypeHero.meta | 8 ++ Assets/Sprites/Player/Warrior.meta | 8 ++ 7 files changed, 232 insertions(+), 21 deletions(-) create mode 100644 Assets/Animations/Prototype.meta delete mode 100644 Assets/Animations/Prototype/Player.controller.meta create mode 100644 Assets/Sprites/Player/PrototypeHero.meta create mode 100644 Assets/Sprites/Player/Warrior.meta (limited to 'Assets/Scripts') diff --git a/Assets/Animations/Prototype.meta b/Assets/Animations/Prototype.meta new file mode 100644 index 0000000..7be3619 --- /dev/null +++ b/Assets/Animations/Prototype.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 512e0933132944d4ba2180e0b31b6420 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Prototype/Player.controller.meta b/Assets/Animations/Prototype/Player.controller.meta deleted file mode 100644 index 998593b..0000000 --- a/Assets/Animations/Prototype/Player.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 363aef300fba71f40ab5aa64ba12659f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/Zombie.prefab b/Assets/Prefabs/Enemies/Zombie.prefab index c1fbcf2..7059ac9 100644 --- a/Assets/Prefabs/Enemies/Zombie.prefab +++ b/Assets/Prefabs/Enemies/Zombie.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 3542940353895036420} - component: {fileID: 7876354948243592078} - component: {fileID: -1788752809794239346} + - component: {fileID: 4349160083341462742} + - component: {fileID: -849362167687110816} m_Layer: 10 m_Name: Zombie m_TagString: Enemy @@ -127,17 +129,150 @@ MonoBehaviour: maxJumps: 1 jumpForce: 500 damage: 0 - groundLayer: - serializedVersion: 2 - m_Bits: 0 - groundCheckPoint: {fileID: 0} - stats: - maxHealth: 0 - speedMultiplier: 0 - maxJumps: 0 - jumpForce: 0 - damage: 0 + groundCheckPoint: {fileID: 2602158014784719401} health: 0 +--- !u!95 &4349160083341462742 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927363337844} + 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!60 &-849362167687110816 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927363337844} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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!1 &8191793094342821551 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity index 089da84..a699f61 100644 --- a/Assets/Scenes/Jungle.unity +++ b/Assets/Scenes/Jungle.unity @@ -12654,6 +12654,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 1298531768} m_PrefabAsset: {fileID: 0} +--- !u!4 &1301059137 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + m_PrefabInstance: {fileID: 6691474245549666830} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1303550327 PrefabInstance: m_ObjectHideFlags: 0 @@ -324993,6 +324998,63 @@ 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: 0} + m_Modifications: + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_LocalPosition.x + value: -67.91 + 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 @@ -325374,7 +325436,7 @@ PrefabInstance: - target: {fileID: 2776418409999972327, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} propertyPath: firePoint value: - objectReference: {fileID: 371069633} + objectReference: {fileID: 1301059137} - target: {fileID: 2776418409999972327, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} propertyPath: projectilePrefab value: diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs index 95ed278..8e4ce1b 100644 --- a/Assets/Scripts/Actors/Enemy.cs +++ b/Assets/Scripts/Actors/Enemy.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; namespace MontanaJohns.Actors diff --git a/Assets/Sprites/Player/PrototypeHero.meta b/Assets/Sprites/Player/PrototypeHero.meta new file mode 100644 index 0000000..c9f17a9 --- /dev/null +++ b/Assets/Sprites/Player/PrototypeHero.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01ce197cf3d0b9c409dd3c8d49cd01cc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/Warrior.meta b/Assets/Sprites/Player/Warrior.meta new file mode 100644 index 0000000..e92f53e --- /dev/null +++ b/Assets/Sprites/Player/Warrior.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4649601a09c0b764aa31e101b9194028 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.2.3-70-g09d2 From 3e2ce2d607eff118e16b9b53fe763f2465e0a8b2 Mon Sep 17 00:00:00 2001 From: cross28 Date: Fri, 15 Apr 2022 03:14:32 -0500 Subject: fix: Firing point on player properly flips depending on direction of movement --- Assets/Prefabs/Projectile.prefab | 4 ++-- Assets/Scripts/Actors/Actor.cs | 16 ++++++++++++++-- ProjectSettings/Physics2DSettings.asset | 2 +- ProjectSettings/TagManager.asset | 3 ++- 4 files changed, 19 insertions(+), 6 deletions(-) (limited to 'Assets/Scripts') diff --git a/Assets/Prefabs/Projectile.prefab b/Assets/Prefabs/Projectile.prefab index 30fdbcc..2069524 100644 --- a/Assets/Prefabs/Projectile.prefab +++ b/Assets/Prefabs/Projectile.prefab @@ -13,9 +13,9 @@ GameObject: - component: {fileID: 1537325952086636130} - component: {fileID: 3979439104010016330} - component: {fileID: -1260146822183481114} - m_Layer: 0 + m_Layer: 11 m_Name: Projectile - m_TagString: Untagged + m_TagString: Projectile m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Scripts/Actors/Actor.cs b/Assets/Scripts/Actors/Actor.cs index 63854d9..f23f3c6 100644 --- a/Assets/Scripts/Actors/Actor.cs +++ b/Assets/Scripts/Actors/Actor.cs @@ -68,10 +68,22 @@ namespace MontanaJohns.Actors _rigidBody.velocity = Vector2.SmoothDamp(_rigidBody.velocity, target, ref acceleration, .05f); _animator.SetBool("moving", Mathf.Abs(_rigidBody.velocity.x) > 1); - if (_rigidBody.velocity.x < -0.001) + if (_rigidBody.velocity.x < -0.001) { _renderer.flipX = true; - else if (_rigidBody.velocity.x > 0.001) + for (int i = 0; i < transform.childCount; i++) { + var rot = transform.GetChild(i).rotation; + rot.y = 180f; + transform.GetChild(i).rotation = rot; + } + } + else if (_rigidBody.velocity.x > 0.001) { _renderer.flipX = false; + for (int i = 0; i < transform.childCount; i++) { + var rot = transform.GetChild(i).rotation; + rot.y = 0f; + transform.GetChild(i).rotation = rot; + } + } } public virtual void MoveY(float input) { diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 6cfcdda..5b3d6e6 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -53,4 +53,4 @@ Physics2DSettings: m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: fff7fffffff7fffffff7fffffffffffffff7fffffff7fffffffffffffffffffffff7fffffff7ffffffffffffc8f4ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 7cb1727..aa38f35 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Trap - Enemy + - Projectile layers: - Default - TransparentFX @@ -18,7 +19,7 @@ TagManager: - Player - Grapple - Enemy - - + - Projectile - - - -- cgit v1.2.3-70-g09d2 From 34cb39ef5d6ec1f19b5509ae58f4e87f0774bd6b Mon Sep 17 00:00:00 2001 From: cross28 Date: Fri, 15 Apr 2022 03:16:22 -0500 Subject: feat: projectiles hitting enemies deletes them (for now) --- Assets/Scripts/Projectile.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Assets/Scripts') diff --git a/Assets/Scripts/Projectile.cs b/Assets/Scripts/Projectile.cs index 3b86e4a..5331264 100644 --- a/Assets/Scripts/Projectile.cs +++ b/Assets/Scripts/Projectile.cs @@ -17,5 +17,10 @@ public class Projectile : MonoBehaviour { Debug.Log(collision.name); Destroy(gameObject); + + if (collision.tag == "Enemy") + { + Destroy(collision.gameObject); + } } } -- cgit v1.2.3-70-g09d2 From e50fc523b25010582c158b7a307e3e7b1db7fb47 Mon Sep 17 00:00:00 2001 From: cross28 Date: Fri, 15 Apr 2022 04:43:23 -0500 Subject: feat: Added zombie idle and moving animation --- Assets/Animations/Enemies/Zombie/Attack.anim | 86 +++++++++++++ Assets/Animations/Enemies/Zombie/Attack.anim.meta | 8 ++ Assets/Animations/Enemies/Zombie/Idle.anim | 46 ++++++- Assets/Animations/Enemies/Zombie/Moving.anim | 46 ++++++- Assets/Animations/Enemies/Zombie/Zombie.controller | 139 +++++++++++++-------- .../MontanaJohns/MontanaJohns.controller | 8 +- Assets/Prefabs/Projectile.prefab | 2 +- Assets/Scenes/Jungle.unity | 28 +++++ Assets/Scripts/Actors/Enemy.cs | 12 ++ Assets/Scripts/Projectile.cs | 9 +- 10 files changed, 310 insertions(+), 74 deletions(-) create mode 100644 Assets/Animations/Enemies/Zombie/Attack.anim create mode 100644 Assets/Animations/Enemies/Zombie/Attack.anim.meta (limited to 'Assets/Scripts') diff --git a/Assets/Animations/Enemies/Zombie/Attack.anim b/Assets/Animations/Enemies/Zombie/Attack.anim new file mode 100644 index 0000000..43658a5 --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Attack.anim @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 2078424329, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.05 + value: {fileID: 828034450, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.11666667 + value: {fileID: -302372421, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.16666667 + value: {fileID: -85932321, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.21666667 + value: {fileID: 1639612969, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.28333333 + value: {fileID: -1764084075, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.33333334 + value: {fileID: -560229937, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 2078424329, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: 828034450, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -302372421, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -85932321, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: 1639612969, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1764084075, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -560229937, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.35000002 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemies/Zombie/Attack.anim.meta b/Assets/Animations/Enemies/Zombie/Attack.anim.meta new file mode 100644 index 0000000..ef6267c --- /dev/null +++ b/Assets/Animations/Enemies/Zombie/Attack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46751831936f6464b867e572e5529105 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Zombie/Idle.anim b/Assets/Animations/Enemies/Zombie/Idle.anim index c89c100..b93a7b9 100644 --- a/Assets/Animations/Enemies/Zombie/Idle.anim +++ b/Assets/Animations/Enemies/Zombie/Idle.anim @@ -17,26 +17,62 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.1 + value: {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.21666667 + value: {fileID: -2003769690, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.31666666 + value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.41666666 + value: {fileID: -1702410671, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.53333336 + value: {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.6166667 + value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.68333334 + value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -2003769690, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1702410671, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.7 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animations/Enemies/Zombie/Moving.anim b/Assets/Animations/Enemies/Zombie/Moving.anim index e8c12fb..a091f1f 100644 --- a/Assets/Animations/Enemies/Zombie/Moving.anim +++ b/Assets/Animations/Enemies/Zombie/Moving.anim @@ -17,26 +17,62 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -459294537, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.06666667 + value: {fileID: -932836783, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.13333334 + value: {fileID: 2098029280, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.2 + value: {fileID: -948577929, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.26666668 + value: {fileID: -1063589079, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.33333334 + value: {fileID: -1106049903, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.41666666 + value: {fileID: -1787249033, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - time: 0.5 + value: {fileID: -1687654213, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -459294537, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -932836783, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: 2098029280, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -948577929, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1063589079, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1106049903, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1787249033, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} + - {fileID: -1687654213, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animations/Enemies/Zombie/Zombie.controller b/Assets/Animations/Enemies/Zombie/Zombie.controller index 3f9455b..7cc8d1f 100644 --- a/Assets/Animations/Enemies/Zombie/Zombie.controller +++ b/Assets/Animations/Enemies/Zombie/Zombie.controller @@ -1,53 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-8731865481558821802 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6089190274217570171} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1107 &-6204006212838014119 -AnimatorStateMachine: +--- !u!1102 &-2461426347161001773 +AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 8969007887231168511} - m_Position: {x: 320, y: 130, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6089190274217570171} - m_Position: {x: 320, y: 10, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 8969007887231168511} ---- !u!1102 &-6089190274217570171 + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 46751831936f6464b867e572e5529105, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1887222890965656619 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -58,7 +37,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 8139433511157601217} + - {fileID: 9190035719620373905} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -68,7 +47,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 0} + m_Motion: {fileID: 7400000, guid: 1c65a4008d81eec4fa1a98d6a2218261, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -92,7 +71,7 @@ AnimatorController: m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: -6204006212838014119} + m_StateMachine: {fileID: 1063358119497531979} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -102,29 +81,60 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &8139433511157601217 +--- !u!1107 &1063358119497531979 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -2461426347161001773} + m_Position: {x: 290, y: -30, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5416144975737678020} + m_Position: {x: 320, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1887222890965656619} + m_Position: {x: 440, y: 270, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 40, y: -30, z: 0} + m_EntryPosition: {x: 90, y: 80, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5416144975737678020} +--- !u!1101 &3411777108285681989 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: moving + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8969007887231168511} + m_DstState: {fileID: -1887222890965656619} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 + m_ExitTime: 0.64285713 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &8969007887231168511 +--- !u!1102 &5416144975737678020 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -135,7 +145,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -8731865481558821802} + - {fileID: 3411777108285681989} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -151,3 +161,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &9190035719620373905 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: moving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5416144975737678020} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.54545456 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/MontanaJohns/MontanaJohns.controller b/Assets/Animations/MontanaJohns/MontanaJohns.controller index 46d4d12..c295976 100644 --- a/Assets/Animations/MontanaJohns/MontanaJohns.controller +++ b/Assets/Animations/MontanaJohns/MontanaJohns.controller @@ -220,25 +220,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: jump m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: fall m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: airborn m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Prefabs/Projectile.prefab b/Assets/Prefabs/Projectile.prefab index 2069524..659aca8 100644 --- a/Assets/Prefabs/Projectile.prefab +++ b/Assets/Prefabs/Projectile.prefab @@ -118,7 +118,7 @@ BoxCollider2D: 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} diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity index a699f61..d385757 100644 --- a/Assets/Scenes/Jungle.unity +++ b/Assets/Scenes/Jungle.unity @@ -325005,6 +325005,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -849362167687110816, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} propertyPath: m_RootOrder value: 9 @@ -325385,6 +325389,30 @@ PrefabInstance: propertyPath: hearts.Array.data[2] value: objectReference: {fileID: 2019698001} + - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2776418409999972307, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} propertyPath: m_RootOrder value: 4 diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs index 8e4ce1b..6862298 100644 --- a/Assets/Scripts/Actors/Enemy.cs +++ b/Assets/Scripts/Actors/Enemy.cs @@ -18,6 +18,18 @@ namespace MontanaJohns.Actors { if (player.transform.position.x < transform.position.x) Move(-stats.speedMultiplier * 0.5f); else Move(stats.speedMultiplier * 0.5f); + + if (health <= 0) Destroy(gameObject); + } + + private void OnCollisionEnter2D(Collision2D other) + { + if (other.gameObject.tag == "Projectile") + { + Debug.Log("Enemy: Hit by projectile"); + TakeDamage(1); + Destroy(other.gameObject); + } } } } diff --git a/Assets/Scripts/Projectile.cs b/Assets/Scripts/Projectile.cs index 5331264..7692917 100644 --- a/Assets/Scripts/Projectile.cs +++ b/Assets/Scripts/Projectile.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using MontanaJohns.Actors; public class Projectile : MonoBehaviour { @@ -13,14 +14,8 @@ public class Projectile : MonoBehaviour rb.velocity = transform.right * speed; } - private void OnTriggerEnter2D(Collider2D collision) + private void OnCollisionEnter2D(Collision2D collision) { - Debug.Log(collision.name); Destroy(gameObject); - - if (collision.tag == "Enemy") - { - Destroy(collision.gameObject); - } } } -- cgit v1.2.3-70-g09d2 From e01302a15cf68869088a73e561ac672d70b501a7 Mon Sep 17 00:00:00 2001 From: cross28 Date: Fri, 15 Apr 2022 06:08:15 -0500 Subject: feat: finished zombie attack animation and functionality --- Assets/Animations/Enemies/Zombie/Attack.anim | 2 +- Assets/Animations/Enemies/Zombie/Zombie.controller | 73 ++++++++++++++++++++-- Assets/Scenes/Jungle.unity | 16 +++-- Assets/Scripts/Actors/Enemy.cs | 24 ++++++- 4 files changed, 103 insertions(+), 12 deletions(-) (limited to 'Assets/Scripts') diff --git a/Assets/Animations/Enemies/Zombie/Attack.anim b/Assets/Animations/Enemies/Zombie/Attack.anim index 43658a5..33cb5f7 100644 --- a/Assets/Animations/Enemies/Zombie/Attack.anim +++ b/Assets/Animations/Enemies/Zombie/Attack.anim @@ -69,7 +69,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animations/Enemies/Zombie/Zombie.controller b/Assets/Animations/Enemies/Zombie/Zombie.controller index 7cc8d1f..d7c2a97 100644 --- a/Assets/Animations/Enemies/Zombie/Zombie.controller +++ b/Assets/Animations/Enemies/Zombie/Zombie.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8824451288058899808 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5416144975737678020} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2461426347161001773 AnimatorState: serializedVersion: 6 @@ -8,9 +30,10 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Attack - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8824451288058899808} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -67,7 +90,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: airborn + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -92,7 +127,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2461426347161001773} - m_Position: {x: 290, y: -30, z: 0} + m_Position: {x: 470, y: 10, z: 0} - serializedVersion: 1 m_State: {fileID: 5416144975737678020} m_Position: {x: 320, y: 120, z: 0} @@ -100,11 +135,12 @@ AnimatorStateMachine: m_State: {fileID: -1887222890965656619} m_Position: {x: 440, y: 270, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 5673627202155167741} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 40, y: -30, z: 0} + m_AnyStatePosition: {x: 140, y: -10, z: 0} m_EntryPosition: {x: 90, y: 80, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} @@ -161,6 +197,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &5673627202155167741 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2461426347161001773} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &9190035719620373905 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity index d385757..8cf717f 100644 --- a/Assets/Scenes/Jungle.unity +++ b/Assets/Scenes/Jungle.unity @@ -325005,10 +325005,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -849362167687110816, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} propertyPath: m_RootOrder value: 9 @@ -325053,6 +325049,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 514569869678374215, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_Size.x + value: 1.198549 + objectReference: {fileID: 0} + - target: {fileID: 514569869678374215, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 514569869678374215, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} + propertyPath: m_Offset.x + value: -0.030214876 + objectReference: {fileID: 0} - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} propertyPath: m_Name value: Zombie diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs index 6862298..3db479f 100644 --- a/Assets/Scripts/Actors/Enemy.cs +++ b/Assets/Scripts/Actors/Enemy.cs @@ -1,11 +1,14 @@ using UnityEngine; +using System.Collections; namespace MontanaJohns.Actors { [RequireComponent(typeof(Rigidbody2D))] public class Enemy : Actor { - GameObject player; + protected GameObject player; + protected float attackRate = 0.5f; + protected float nextAttackTime = 0f; protected override void Awake() { @@ -15,13 +18,32 @@ namespace MontanaJohns.Actors // Update is called once per frame void Update() + { + MoveTowardsPlayer(); + Attack(); + CheckHealth(); + } + + void MoveTowardsPlayer() { if (player.transform.position.x < transform.position.x) Move(-stats.speedMultiplier * 0.5f); else Move(stats.speedMultiplier * 0.5f); + } + void CheckHealth() + { if (health <= 0) Destroy(gameObject); } + void Attack() + { + if (Mathf.Abs(player.transform.position.x - transform.position.x) <= 3 && Time.time >= nextAttackTime) { + _animator.SetTrigger("attack"); + player.GetComponent().TakeDamage(1); + nextAttackTime = Time.time + 1f / attackRate; + } + } + private void OnCollisionEnter2D(Collision2D other) { if (other.gameObject.tag == "Projectile") -- cgit v1.2.3-70-g09d2 From b80e48181fb54dd80d4f344d8354e768200beb7f Mon Sep 17 00:00:00 2001 From: cross28 Date: Fri, 15 Apr 2022 06:29:22 -0500 Subject: feat: added mummy animations and prefab --- Assets/Animations/Enemies/Mummy.meta | 8 + Assets/Animations/Enemies/Mummy/Attack.anim | 83 +++++++ Assets/Animations/Enemies/Mummy/Attack.anim.meta | 8 + Assets/Animations/Enemies/Mummy/Idle.anim | 77 +++++++ Assets/Animations/Enemies/Mummy/Idle.anim.meta | 8 + Assets/Animations/Enemies/Mummy/Moving.anim | 83 +++++++ Assets/Animations/Enemies/Mummy/Moving.anim.meta | 8 + Assets/Animations/Enemies/Mummy/Mummy.controller | 249 +++++++++++++++++++++ .../Animations/Enemies/Mummy/Mummy.controller.meta | 8 + Assets/Prefabs/Enemies/Mummy.prefab | 230 +++++++++++++++++++ Assets/Prefabs/Enemies/Mummy.prefab.meta | 7 + Assets/Scenes/Jungle.unity | 149 +++++++++++- Assets/Scripts/Actors/Enemy.cs | 2 +- Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta | 40 +++- .../Sprites/Enemies/5 Mummy/Mummy_attack.png.meta | 178 ++++++++++++++- Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta | 134 ++++++++++- Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta | 178 ++++++++++++++- 17 files changed, 1420 insertions(+), 30 deletions(-) create mode 100644 Assets/Animations/Enemies/Mummy.meta create mode 100644 Assets/Animations/Enemies/Mummy/Attack.anim create mode 100644 Assets/Animations/Enemies/Mummy/Attack.anim.meta create mode 100644 Assets/Animations/Enemies/Mummy/Idle.anim create mode 100644 Assets/Animations/Enemies/Mummy/Idle.anim.meta create mode 100644 Assets/Animations/Enemies/Mummy/Moving.anim create mode 100644 Assets/Animations/Enemies/Mummy/Moving.anim.meta create mode 100644 Assets/Animations/Enemies/Mummy/Mummy.controller create mode 100644 Assets/Animations/Enemies/Mummy/Mummy.controller.meta create mode 100644 Assets/Prefabs/Enemies/Mummy.prefab create mode 100644 Assets/Prefabs/Enemies/Mummy.prefab.meta (limited to 'Assets/Scripts') diff --git a/Assets/Animations/Enemies/Mummy.meta b/Assets/Animations/Enemies/Mummy.meta new file mode 100644 index 0000000..c1d6924 --- /dev/null +++ b/Assets/Animations/Enemies/Mummy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77555645b0c017b4b892572a59b65060 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Mummy/Attack.anim b/Assets/Animations/Enemies/Mummy/Attack.anim new file mode 100644 index 0000000..92f5314 --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Attack.anim @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 741006923, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - time: 0.06666667 + value: {fileID: 382031228, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - time: 0.13333334 + value: {fileID: 333677141, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - time: 0.2 + value: {fileID: -1616691205, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - time: 0.26666668 + value: {fileID: 918470050, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - time: 0.33333334 + value: {fileID: 1249113196, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 741006923, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - {fileID: 382031228, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - {fileID: 333677141, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - {fileID: -1616691205, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - {fileID: 918470050, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + - {fileID: 1249113196, guid: f4dc9b04cabb2f043a9cfce676e01924, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.35000002 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemies/Mummy/Attack.anim.meta b/Assets/Animations/Enemies/Mummy/Attack.anim.meta new file mode 100644 index 0000000..801b0e0 --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Attack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca3570849d0027c4c99ee03ccbf2de17 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Mummy/Idle.anim b/Assets/Animations/Enemies/Mummy/Idle.anim new file mode 100644 index 0000000..11825c7 --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Idle.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1741269740, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + - time: 0.083333336 + value: {fileID: 1411652427, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + - time: 0.16666667 + value: {fileID: 1250215872, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + - time: 0.25 + value: {fileID: 2027049342, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1741269740, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + - {fileID: 1411652427, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + - {fileID: 1250215872, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + - {fileID: 2027049342, guid: 1480995e4fc038b4c91e94b26a99613d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemies/Mummy/Idle.anim.meta b/Assets/Animations/Enemies/Mummy/Idle.anim.meta new file mode 100644 index 0000000..83b1f5e --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4e64738d157bd144879b023a07ed3af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Mummy/Moving.anim b/Assets/Animations/Enemies/Mummy/Moving.anim new file mode 100644 index 0000000..f91111b --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Moving.anim @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Moving + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1140890004, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - time: 0.05 + value: {fileID: 485675233, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - time: 0.1 + value: {fileID: -2117520738, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - time: 0.15 + value: {fileID: 2001742755, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - time: 0.2 + value: {fileID: 1161581582, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - time: 0.25 + value: {fileID: 1727113818, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1140890004, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - {fileID: 485675233, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - {fileID: -2117520738, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - {fileID: 2001742755, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - {fileID: 1161581582, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + - {fileID: 1727113818, guid: 8667283d5cec0bb48af6052eed07ffd4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemies/Mummy/Moving.anim.meta b/Assets/Animations/Enemies/Mummy/Moving.anim.meta new file mode 100644 index 0000000..d2bf517 --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Moving.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6478a9fd885933d4eb89024eeef21569 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Mummy/Mummy.controller b/Assets/Animations/Enemies/Mummy/Mummy.controller new file mode 100644 index 0000000..929f26a --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Mummy.controller @@ -0,0 +1,249 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8866948895685114005 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8648402463872574681} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 6478a9fd885933d4eb89024eeef21569, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-8648402463872574681 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: moving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8324049255490522487} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.06250006 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-8324049255490522487 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3864494108814624862} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e4e64738d157bd144879b023a07ed3af, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-4710607655950975168 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2763067786627113859} + m_Position: {x: 210, y: -40, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8324049255490522487} + m_Position: {x: 310, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8866948895685114005} + m_Position: {x: 380, y: 200, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 8205391962103719725} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8324049255490522487} +--- !u!1101 &-3864494108814624862 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: moving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8866948895685114005} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.06250006 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1069941874464114753 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8324049255490522487} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mummy + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: moving + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: airborn + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4710607655950975168} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2763067786627113859 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1069941874464114753} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: ca3570849d0027c4c99ee03ccbf2de17, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8205391962103719725 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2763067786627113859} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Enemies/Mummy/Mummy.controller.meta b/Assets/Animations/Enemies/Mummy/Mummy.controller.meta new file mode 100644 index 0000000..34f10fe --- /dev/null +++ b/Assets/Animations/Enemies/Mummy/Mummy.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9783ad7a740db24490f21bac3b9b298 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/Mummy.prefab b/Assets/Prefabs/Enemies/Mummy.prefab new file mode 100644 index 0000000..8e3e3e2 --- /dev/null +++ b/Assets/Prefabs/Enemies/Mummy.prefab @@ -0,0 +1,230 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8919320861035673885 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8919320861035673862} + - component: {fileID: 8919320861035673881} + - component: {fileID: 8919320861035673880} + - component: {fileID: 8919320861035673883} + - component: {fileID: 8919320861035673882} + - component: {fileID: 8919320861035673863} + m_Layer: 10 + m_Name: Mummy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8919320861035673862 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861035673885} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -79.2, y: -14.69, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8919320863032976505} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8919320861035673881 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861035673885} + 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 &8919320861035673880 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861035673885} + 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 &8919320861035673883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861035673885} + 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: 8919320863032976505} + health: 0 +--- !u!60 &8919320861035673882 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861035673885} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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.4375, y: -0.515625} + - {x: 0.3125105, y: -0.20174655} + - {x: 0.46387002, y: -0.12658024} + - {x: 0.45324838, y: 0.1735998} + - {x: 0.27001193, y: 0.3500944} + - {x: 0.19489595, y: 0.515625} +--- !u!95 &8919320861035673863 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861035673885} + 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!1 &8919320863032976504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8919320863032976505} + m_Layer: 10 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8919320863032976505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320863032976504} + 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: 8919320861035673862} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Enemies/Mummy.prefab.meta b/Assets/Prefabs/Enemies/Mummy.prefab.meta new file mode 100644 index 0000000..79793d3 --- /dev/null +++ b/Assets/Prefabs/Enemies/Mummy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1ac05b890e176640a3d9fd9e24cd0c1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity index 8cf717f..07c2d04 100644 --- a/Assets/Scenes/Jungle.unity +++ b/Assets/Scenes/Jungle.unity @@ -325049,18 +325049,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 514569869678374215, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_Size.x - value: 1.198549 - objectReference: {fileID: 0} - - target: {fileID: 514569869678374215, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 514569869678374215, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_Offset.x - value: -0.030214876 - objectReference: {fileID: 0} - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} propertyPath: m_Name value: Zombie @@ -325479,3 +325467,140 @@ PrefabInstance: objectReference: {fileID: 9063295841416902692, guid: a0ba51ee3fa7d25428dd81d9ee48ace9, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3} +--- !u!1001 &8919320862215231254 +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: 10 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.x + value: -79.2 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_LocalPosition.y + value: -14.69 + 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: 8919320861035673881, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_FlipX + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.size + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[15].x + value: 0.00047017095 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[15].y + value: -0.5159048 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[16].x + value: 0.07817555 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[16].y + value: -0.21324027 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[17].x + value: 0.3111925 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[17].y + value: -0.51857585 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[18].x + value: 0.4375 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[18].y + value: -0.515625 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[19].x + value: 0.3125105 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[19].y + value: -0.20174655 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[20].x + value: 0.43713662 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[20].y + value: -0.11321354 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[21].x + value: 0.44155252 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[21].y + value: 0.14519536 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[22].x + value: 0.27001193 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[22].y + value: 0.3500944 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[23].x + value: 0.19489595 + objectReference: {fileID: 0} + - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[23].y + value: 0.515625 + 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/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs index 3db479f..9160e44 100644 --- a/Assets/Scripts/Actors/Enemy.cs +++ b/Assets/Scripts/Actors/Enemy.cs @@ -37,7 +37,7 @@ namespace MontanaJohns.Actors void Attack() { - if (Mathf.Abs(player.transform.position.x - transform.position.x) <= 3 && Time.time >= nextAttackTime) { + if (Mathf.Abs(player.transform.position.x - transform.position.x) <= 5 && Time.time >= nextAttackTime) { _animator.SetTrigger("attack"); player.GetComponent().TakeDamage(1); nextAttackTime = Time.time + 1f / attackRate; diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta index cc49040..95da2ef 100644 --- a/Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -76,6 +76,42 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta index 0e3a860..22c6e2c 100644 --- a/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_attack.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -42,12 +42,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -76,9 +76,171 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Mummy_attack_0 + rect: + serializedVersion: 2 + x: 17 + y: 0 + width: 28 + height: 33 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bf531c405acf5004da1dd4248bfe678e + internalID: 741006923 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_attack_1 + rect: + serializedVersion: 2 + x: 66 + y: 0 + width: 28 + height: 36 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 14695cd1c2cf9a84ea3d7f13b9117657 + internalID: 382031228 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_attack_2 + rect: + serializedVersion: 2 + x: 123 + y: 0 + width: 20 + height: 45 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ee433c7f88e4fb948926046d35170460 + internalID: 333677141 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_attack_3 + rect: + serializedVersion: 2 + x: 149 + y: 0 + width: 40 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 67d91a767a7f4be4b99d4271dfb21242 + internalID: -1616691205 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_attack_4 + rect: + serializedVersion: 2 + x: 200 + y: 0 + width: 36 + height: 31 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b629164794a73ce43947124abfb68906 + internalID: 918470050 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_attack_5 + rect: + serializedVersion: 2 + x: 252 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f2682b2d9d934184c8cf9556a077ba71 + internalID: 1249113196 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -89,7 +251,13 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Mummy_attack_5: 1249113196 + Mummy_attack_1: 382031228 + Mummy_attack_2: 333677141 + Mummy_attack_4: 918470050 + Mummy_attack_0: 741006923 + Mummy_attack_3: -1616691205 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta index 2e07855..42431d0 100644 --- a/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -42,12 +42,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -76,9 +76,129 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Mummy_idle_0 + rect: + serializedVersion: 2 + x: 17 + y: 0 + width: 28 + height: 33 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 23e9c7233dbd02c4c88d720416325f2b + internalID: -1741269740 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_idle_1 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 30 + height: 34 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1520d2a00d4f1fa4b90eaaf7106e3c22 + internalID: 1411652427 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_idle_2 + rect: + serializedVersion: 2 + x: 114 + y: 0 + width: 28 + height: 34 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 35a24041d6c931a4f81aaba09bfb60d5 + internalID: 1250215872 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_idle_3 + rect: + serializedVersion: 2 + x: 163 + y: 0 + width: 27 + height: 33 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8d686b42fed97ce4bbf226b7eaa7842e + internalID: 2027049342 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -89,7 +209,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Mummy_idle_3: 2027049342 + Mummy_idle_2: 1250215872 + Mummy_idle_0: -1741269740 + Mummy_idle_1: 1411652427 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta b/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta index 196df19..81933f0 100644 --- a/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta +++ b/Assets/Sprites/Enemies/5 Mummy/Mummy_walk.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -42,12 +42,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -76,9 +76,171 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Mummy_walk_0 + rect: + serializedVersion: 2 + x: 26 + y: 0 + width: 18 + height: 33 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 38cd7f327196b7b4e873711ea8227f19 + internalID: -1140890004 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_walk_1 + rect: + serializedVersion: 2 + x: 72 + y: 0 + width: 18 + height: 34 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9c672063ae351ce44b7e6b53ad481fdd + internalID: 485675233 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_walk_2 + rect: + serializedVersion: 2 + x: 118 + y: 0 + width: 22 + height: 35 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2720b7bd95f935841bebfe4001cdc8b5 + internalID: -2117520738 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_walk_3 + rect: + serializedVersion: 2 + x: 161 + y: 0 + width: 28 + height: 33 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ec2b96fa838bea74fbfbc26669854b7a + internalID: 2001742755 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_walk_4 + rect: + serializedVersion: 2 + x: 214 + y: 0 + width: 22 + height: 34 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 24ee9593791b9f443a281267cc2997de + internalID: 1161581582 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Mummy_walk_5 + rect: + serializedVersion: 2 + x: 264 + y: 0 + width: 18 + height: 35 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 76b45c2599aa8054e8969e3aef73b2ae + internalID: 1727113818 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -89,7 +251,13 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Mummy_walk_2: -2117520738 + Mummy_walk_5: 1727113818 + Mummy_walk_4: 1161581582 + Mummy_walk_3: 2001742755 + Mummy_walk_0: -1140890004 + Mummy_walk_1: 485675233 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 -- cgit v1.2.3-70-g09d2