From e083092dff6bac9094cc0a653eed73098349ede2 Mon Sep 17 00:00:00 2001 From: teascade Date: Wed, 14 Aug 2019 17:32:52 +0300 Subject: [PATCH] Rename some animation stuff and make crab animations proper --- Assets/Graphics/Animations/Crab.controller | 107 ++++++++++++++++++ .../Graphics/Animations/Crab.controller.meta | 8 ++ Assets/Graphics/Animations/CrabAttack.anim | 69 +++++++++++ .../Graphics/Animations/CrabAttack.anim.meta | 8 ++ Assets/Graphics/Animations/CrabWalk.anim | 77 +++++++++++++ Assets/Graphics/Animations/CrabWalk.anim.meta | 8 ++ ...m.controller => PlayerBodyAnim.controller} | 4 +- ...er.meta => PlayerBodyAnim.controller.meta} | 0 ...m.controller => PlayerHeadAnim.controller} | 4 +- ...er.meta => PlayerHeadAnim.controller.meta} | 0 .../{HeadDown.anim => PlayerHeadDown.anim} | 2 +- ...own.anim.meta => PlayerHeadDown.anim.meta} | 0 .../{HeadRight.anim => PlayerHeadRight.anim} | 2 +- ...ht.anim.meta => PlayerHeadRight.anim.meta} | 0 .../{HeadUp.anim => PlayerHeadUp.anim} | 2 +- ...eadUp.anim.meta => PlayerHeadUp.anim.meta} | 0 ...talBody.anim => PlayerHorizontalBody.anim} | 2 +- ...im.meta => PlayerHorizontalBody.anim.meta} | 0 ...ticalBody.anim => PlayerVerticalBody.anim} | 2 +- ...anim.meta => PlayerVerticalBody.anim.meta} | 0 .../Enemies/Enemy (Default Melee).prefab | 33 ++++-- Assets/Scripts/Enemies/Enemy.cs | 15 ++- Assets/Scripts/Player/PlayerController.cs | 14 +-- Assets/Scripts/Utils/AcceleratedMovement.cs | 1 - 24 files changed, 323 insertions(+), 35 deletions(-) create mode 100644 Assets/Graphics/Animations/Crab.controller create mode 100644 Assets/Graphics/Animations/Crab.controller.meta create mode 100644 Assets/Graphics/Animations/CrabAttack.anim create mode 100644 Assets/Graphics/Animations/CrabAttack.anim.meta create mode 100644 Assets/Graphics/Animations/CrabWalk.anim create mode 100644 Assets/Graphics/Animations/CrabWalk.anim.meta rename Assets/Graphics/Animations/{BodyAnim.controller => PlayerBodyAnim.controller} (97%) rename Assets/Graphics/Animations/{BodyAnim.controller.meta => PlayerBodyAnim.controller.meta} (100%) rename Assets/Graphics/Animations/{HeadAnim.controller => PlayerHeadAnim.controller} (98%) rename Assets/Graphics/Animations/{HeadAnim.controller.meta => PlayerHeadAnim.controller.meta} (100%) rename Assets/Graphics/Animations/{HeadDown.anim => PlayerHeadDown.anim} (98%) rename Assets/Graphics/Animations/{HeadDown.anim.meta => PlayerHeadDown.anim.meta} (100%) rename Assets/Graphics/Animations/{HeadRight.anim => PlayerHeadRight.anim} (98%) rename Assets/Graphics/Animations/{HeadRight.anim.meta => PlayerHeadRight.anim.meta} (100%) rename Assets/Graphics/Animations/{HeadUp.anim => PlayerHeadUp.anim} (98%) rename Assets/Graphics/Animations/{HeadUp.anim.meta => PlayerHeadUp.anim.meta} (100%) rename Assets/Graphics/Animations/{HorizontalBody.anim => PlayerHorizontalBody.anim} (98%) rename Assets/Graphics/Animations/{HorizontalBody.anim.meta => PlayerHorizontalBody.anim.meta} (100%) rename Assets/Graphics/Animations/{VerticalBody.anim => PlayerVerticalBody.anim} (98%) rename Assets/Graphics/Animations/{VerticalBody.anim.meta => PlayerVerticalBody.anim.meta} (100%) diff --git a/Assets/Graphics/Animations/Crab.controller b/Assets/Graphics/Animations/Crab.controller new file mode 100644 index 0000000..3ee2b8a --- /dev/null +++ b/Assets/Graphics/Animations/Crab.controller @@ -0,0 +1,107 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-2283372574418785537 +AnimatorStateMachine: + serializedVersion: 5 + 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: -626156007799306927} + m_Position: {x: 310, y: 50, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3988067699168050806} + m_Position: {x: 300, y: 160, 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: -626156007799306927} +--- !u!1102 &-626156007799306927 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CrabWalk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d44cb1f5286be4944bd87a16d2c3d1c6, type: 2} + m_Tag: + m_SpeedParameter: Speed + 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: Crab + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2283372574418785537} + 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 &3988067699168050806 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CrabAttack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: cf3e7fccde276d94aa91734e92754725, type: 2} + m_Tag: + m_SpeedParameter: Speed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Graphics/Animations/Crab.controller.meta b/Assets/Graphics/Animations/Crab.controller.meta new file mode 100644 index 0000000..b94bc12 --- /dev/null +++ b/Assets/Graphics/Animations/Crab.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 460c3467220797a408662eba56385be7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Animations/CrabAttack.anim b/Assets/Graphics/Animations/CrabAttack.anim new file mode 100644 index 0000000..4ebd052 --- /dev/null +++ b/Assets/Graphics/Animations/CrabAttack.anim @@ -0,0 +1,69 @@ +%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: CrabAttack + 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: 3837973818445772063, guid: 8d816068e3260f54f9cb041dcd165103, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + 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: 3837973818445772063, guid: 8d816068e3260f54f9cb041dcd165103, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.083333336 + 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/Graphics/Animations/CrabAttack.anim.meta b/Assets/Graphics/Animations/CrabAttack.anim.meta new file mode 100644 index 0000000..5b3206e --- /dev/null +++ b/Assets/Graphics/Animations/CrabAttack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf3e7fccde276d94aa91734e92754725 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Animations/CrabWalk.anim b/Assets/Graphics/Animations/CrabWalk.anim new file mode 100644 index 0000000..0d61121 --- /dev/null +++ b/Assets/Graphics/Animations/CrabWalk.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: CrabWalk + 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: 6754164815184778395, guid: 8d816068e3260f54f9cb041dcd165103, + type: 3} + - time: 0.25 + value: {fileID: -8236523633242920872, guid: 8d816068e3260f54f9cb041dcd165103, + type: 3} + - time: 0.5 + value: {fileID: 6754164815184778395, guid: 8d816068e3260f54f9cb041dcd165103, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + 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: 6754164815184778395, guid: 8d816068e3260f54f9cb041dcd165103, type: 3} + - {fileID: -8236523633242920872, guid: 8d816068e3260f54f9cb041dcd165103, type: 3} + - {fileID: 6754164815184778395, guid: 8d816068e3260f54f9cb041dcd165103, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5833333 + 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/Graphics/Animations/CrabWalk.anim.meta b/Assets/Graphics/Animations/CrabWalk.anim.meta new file mode 100644 index 0000000..e0a798f --- /dev/null +++ b/Assets/Graphics/Animations/CrabWalk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d44cb1f5286be4944bd87a16d2c3d1c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Animations/BodyAnim.controller b/Assets/Graphics/Animations/PlayerBodyAnim.controller similarity index 97% rename from Assets/Graphics/Animations/BodyAnim.controller rename to Assets/Graphics/Animations/PlayerBodyAnim.controller index 33c9646..168c3c9 100644 --- a/Assets/Graphics/Animations/BodyAnim.controller +++ b/Assets/Graphics/Animations/PlayerBodyAnim.controller @@ -57,7 +57,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BodyAnim + m_Name: PlayerBodyAnim serializedVersion: 5 m_AnimatorParameters: - m_Name: Speed @@ -65,7 +65,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Graphics/Animations/BodyAnim.controller.meta b/Assets/Graphics/Animations/PlayerBodyAnim.controller.meta similarity index 100% rename from Assets/Graphics/Animations/BodyAnim.controller.meta rename to Assets/Graphics/Animations/PlayerBodyAnim.controller.meta diff --git a/Assets/Graphics/Animations/HeadAnim.controller b/Assets/Graphics/Animations/PlayerHeadAnim.controller similarity index 98% rename from Assets/Graphics/Animations/HeadAnim.controller rename to Assets/Graphics/Animations/PlayerHeadAnim.controller index 381ebbd..fce52de 100644 --- a/Assets/Graphics/Animations/HeadAnim.controller +++ b/Assets/Graphics/Animations/PlayerHeadAnim.controller @@ -32,7 +32,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HeadAnim + m_Name: PlayerHeadAnim serializedVersion: 5 m_AnimatorParameters: - m_Name: Speed @@ -40,7 +40,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Graphics/Animations/HeadAnim.controller.meta b/Assets/Graphics/Animations/PlayerHeadAnim.controller.meta similarity index 100% rename from Assets/Graphics/Animations/HeadAnim.controller.meta rename to Assets/Graphics/Animations/PlayerHeadAnim.controller.meta diff --git a/Assets/Graphics/Animations/HeadDown.anim b/Assets/Graphics/Animations/PlayerHeadDown.anim similarity index 98% rename from Assets/Graphics/Animations/HeadDown.anim rename to Assets/Graphics/Animations/PlayerHeadDown.anim index 044e43f..bf746dd 100644 --- a/Assets/Graphics/Animations/HeadDown.anim +++ b/Assets/Graphics/Animations/PlayerHeadDown.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HeadDown + m_Name: PlayerHeadDown serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Graphics/Animations/HeadDown.anim.meta b/Assets/Graphics/Animations/PlayerHeadDown.anim.meta similarity index 100% rename from Assets/Graphics/Animations/HeadDown.anim.meta rename to Assets/Graphics/Animations/PlayerHeadDown.anim.meta diff --git a/Assets/Graphics/Animations/HeadRight.anim b/Assets/Graphics/Animations/PlayerHeadRight.anim similarity index 98% rename from Assets/Graphics/Animations/HeadRight.anim rename to Assets/Graphics/Animations/PlayerHeadRight.anim index 8e12d1a..c196925 100644 --- a/Assets/Graphics/Animations/HeadRight.anim +++ b/Assets/Graphics/Animations/PlayerHeadRight.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HeadRight + m_Name: PlayerHeadRight serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Graphics/Animations/HeadRight.anim.meta b/Assets/Graphics/Animations/PlayerHeadRight.anim.meta similarity index 100% rename from Assets/Graphics/Animations/HeadRight.anim.meta rename to Assets/Graphics/Animations/PlayerHeadRight.anim.meta diff --git a/Assets/Graphics/Animations/HeadUp.anim b/Assets/Graphics/Animations/PlayerHeadUp.anim similarity index 98% rename from Assets/Graphics/Animations/HeadUp.anim rename to Assets/Graphics/Animations/PlayerHeadUp.anim index 61e914a..374d1c4 100644 --- a/Assets/Graphics/Animations/HeadUp.anim +++ b/Assets/Graphics/Animations/PlayerHeadUp.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HeadUp + m_Name: PlayerHeadUp serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Graphics/Animations/HeadUp.anim.meta b/Assets/Graphics/Animations/PlayerHeadUp.anim.meta similarity index 100% rename from Assets/Graphics/Animations/HeadUp.anim.meta rename to Assets/Graphics/Animations/PlayerHeadUp.anim.meta diff --git a/Assets/Graphics/Animations/HorizontalBody.anim b/Assets/Graphics/Animations/PlayerHorizontalBody.anim similarity index 98% rename from Assets/Graphics/Animations/HorizontalBody.anim rename to Assets/Graphics/Animations/PlayerHorizontalBody.anim index 19b77ba..f0f2d12 100644 --- a/Assets/Graphics/Animations/HorizontalBody.anim +++ b/Assets/Graphics/Animations/PlayerHorizontalBody.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HorizontalBody + m_Name: PlayerHorizontalBody serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Graphics/Animations/HorizontalBody.anim.meta b/Assets/Graphics/Animations/PlayerHorizontalBody.anim.meta similarity index 100% rename from Assets/Graphics/Animations/HorizontalBody.anim.meta rename to Assets/Graphics/Animations/PlayerHorizontalBody.anim.meta diff --git a/Assets/Graphics/Animations/VerticalBody.anim b/Assets/Graphics/Animations/PlayerVerticalBody.anim similarity index 98% rename from Assets/Graphics/Animations/VerticalBody.anim rename to Assets/Graphics/Animations/PlayerVerticalBody.anim index f1cc7ab..36fc227 100644 --- a/Assets/Graphics/Animations/VerticalBody.anim +++ b/Assets/Graphics/Animations/PlayerVerticalBody.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: VerticalBody + m_Name: PlayerVerticalBody serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Graphics/Animations/VerticalBody.anim.meta b/Assets/Graphics/Animations/PlayerVerticalBody.anim.meta similarity index 100% rename from Assets/Graphics/Animations/VerticalBody.anim.meta rename to Assets/Graphics/Animations/PlayerVerticalBody.anim.meta diff --git a/Assets/Prefabs/Enemies/Enemy (Default Melee).prefab b/Assets/Prefabs/Enemies/Enemy (Default Melee).prefab index fc76233..8c9f8b7 100644 --- a/Assets/Prefabs/Enemies/Enemy (Default Melee).prefab +++ b/Assets/Prefabs/Enemies/Enemy (Default Melee).prefab @@ -57,15 +57,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: CurrentBehavior: Nothing - Renderer: {fileID: 592487111066334295} - IdleSprite: {fileID: 6754164815184778395, guid: 8d816068e3260f54f9cb041dcd165103, - type: 3} - AttackingSprite: {fileID: 3837973818445772063, guid: 8d816068e3260f54f9cb041dcd165103, - type: 3} - MovementAnimationFramerate: 8 - MovementSprites: - - {fileID: 6754164815184778395, guid: 8d816068e3260f54f9cb041dcd165103, type: 3} - - {fileID: -8236523633242920872, guid: 8d816068e3260f54f9cb041dcd165103, type: 3} + Anim: {fileID: 5375970501711434365} MoveSpeed: 1 BehaviourTree: {fileID: 592487110401094199} Attacking: 0 @@ -133,6 +125,7 @@ MonoBehaviour: - {fileID: 960737912245282743, guid: 2fb0a649165a8b7429b09809cd8e25c7, type: 3} - {fileID: 3610142911819508080, guid: a1affae9e5ef819468fdc1f18f63ca7e, type: 3} DebugExplode: 0 + KillOnZeroHealth: 1 --- !u!114 &3362493323285318061 MonoBehaviour: m_ObjectHideFlags: 0 @@ -282,6 +275,7 @@ GameObject: m_Component: - component: {fileID: 592487111066334294} - component: {fileID: 592487111066334295} + - component: {fileID: 5375970501711434365} m_Layer: 0 m_Name: Sprite m_TagString: Untagged @@ -353,6 +347,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &5375970501711434365 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592487111066334293} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 460c3467220797a408662eba56385be7, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &592487111173795459 GameObject: m_ObjectHideFlags: 0 @@ -363,7 +376,7 @@ GameObject: m_Component: - component: {fileID: 592487111173795460} m_Layer: 0 - m_Name: AnimationRoot + m_Name: AttackingRoot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Enemies/Enemy.cs b/Assets/Scripts/Enemies/Enemy.cs index 6e08280..cf8ac8a 100644 --- a/Assets/Scripts/Enemies/Enemy.cs +++ b/Assets/Scripts/Enemies/Enemy.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.Animations; using Saltosion.OneWeapon.AI; namespace Saltosion.OneWeapon.Enemies { @@ -7,11 +8,7 @@ namespace Saltosion.OneWeapon.Enemies { [Header("Debug Info")] public string CurrentBehavior = "Nothing"; [Header("Graphics")] - public SpriteRenderer Renderer; - public Sprite IdleSprite; - public Sprite AttackingSprite; - public int MovementAnimationFramerate; - public Sprite[] MovementSprites; + public Animator Anim; [Header("Stats")] public float MoveSpeed; [Header("Behaviour")] @@ -33,11 +30,13 @@ namespace Saltosion.OneWeapon.Enemies { CurrentBehavior = BehaviourTree.GetExecutedName(); if (Attacking) { - Renderer.sprite = AttackingSprite; + Anim.Play("CrabAttack"); } else if (Body.velocity.magnitude > 0.1) { - Renderer.sprite = MovementSprites[(int)(Time.time * MovementAnimationFramerate) % MovementSprites.Length]; + Anim.Play("CrabWalk"); + Anim.SetFloat("Speed", 1); } else { - Renderer.sprite = IdleSprite; + Anim.Play("CrabWalk"); + Anim.SetFloat("Speed", 0); } } diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 15ea410..fceefcb 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -63,26 +63,26 @@ namespace Saltosion.OneWeapon.Player { float Rotation = Rot.z; if (Rotation >= 45 && Rotation < 135) { - BodyAnim.Play("HorizontalBody"); + BodyAnim.Play("PlayerHorizontalBody"); BodySprite.flipX = false; - HeadAnim.Play("HeadRight"); + HeadAnim.Play("PlayerHeadRight"); HeadSprite.flipX = false; Hand.localPosition = HandMiddle.localPosition; } else if (Rotation >= 225 || Rotation < -45) { - BodyAnim.Play("HorizontalBody"); + BodyAnim.Play("PlayerHorizontalBody"); BodySprite.flipX = true; - HeadAnim.Play("HeadRight"); + HeadAnim.Play("PlayerHeadRight"); HeadSprite.flipX = true; Hand.localPosition = HandMiddle.localPosition; } else { if (Rotation >= 135 && Rotation < 225) { - HeadAnim.Play("HeadUp"); + HeadAnim.Play("PlayerHeadUp"); Hand.localPosition = HandRight.localPosition; } else { - HeadAnim.Play("HeadDown"); + HeadAnim.Play("PlayerHeadDown"); Hand.localPosition = HandLeft.localPosition; } - BodyAnim.Play("VerticalBody"); + BodyAnim.Play("PlayerVerticalBody"); BodySprite.flipX = false; HeadSprite.flipX = false; } diff --git a/Assets/Scripts/Utils/AcceleratedMovement.cs b/Assets/Scripts/Utils/AcceleratedMovement.cs index 53121d7..a92ab05 100644 --- a/Assets/Scripts/Utils/AcceleratedMovement.cs +++ b/Assets/Scripts/Utils/AcceleratedMovement.cs @@ -25,7 +25,6 @@ namespace Saltosion.OneWeapon.Utils { CurrentSpeed -= AccelerationSpeed * Time.deltaTime; } CurrentSpeed *= 1 - (Vector2.Angle(Direction, LastDirection) / 180); - Debug.Log(1 - (Vector2.Angle(Direction, LastDirection) / 180)); CurrentSpeed = Mathf.Clamp(CurrentSpeed, 0, MaxSpeed); SpeedPercentage = CurrentSpeed / MaxSpeed;