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/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta | 98 ++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta (limited to 'Assets/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta') 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: -- 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/Sprites/Enemies/5 Mummy/Mummy_idle.png.meta') 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