diff --git a/Assets/Art/Animations/Characters/Pulver/AC_Pulver.controller b/Assets/Art/Animations/Characters/Pulver/AC_Pulver.controller deleted file mode 100644 index 4a8ab492..00000000 --- a/Assets/Art/Animations/Characters/Pulver/AC_Pulver.controller +++ /dev/null @@ -1,43 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-3219251165592604306 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: [] - 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: 0} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AC_Pulver - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -3219251165592604306} - 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} diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle.anim b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Left.anim similarity index 54% rename from Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle.anim rename to Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Left.anim index c289f834..28022ec5 100644 --- a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle.anim +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Left.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ANIM_PulverIdle + m_Name: ANIM_PulverIdle_Left serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -16,7 +16,37 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_PPtrCurves: - serializedVersion: 2 curve: @@ -36,6 +66,15 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -68,7 +107,37 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk.anim.meta b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Left.anim.meta similarity index 79% rename from Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk.anim.meta rename to Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Left.anim.meta index 40e91b31..1a5e72a6 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk.anim.meta +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Left.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d08dcc21f60f2724bad639dec86e8931 +guid: 3add3d6703eef624abc7fa0dd8523aec NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Right.anim b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Right.anim new file mode 100644 index 00000000..2ff427c1 --- /dev/null +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Right.anim @@ -0,0 +1,144 @@ +%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: ANIM_PulverIdle_Right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -46950309, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - time: 1 + value: {fileID: -46950309, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -46950309, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - {fileID: -46950309, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle.anim.meta b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Right.anim.meta similarity index 100% rename from Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle.anim.meta rename to Assets/Art/Animations/Characters/Pulver/ANIM_PulverIdle_Right.anim.meta diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk.anim b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Left.anim similarity index 60% rename from Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk.anim rename to Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Left.anim index b98e2ba4..fc25bdfc 100644 --- a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk.anim +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Left.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ANIM_PulverWalk + m_Name: ANIM_PulverWalk_Left serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -16,7 +16,37 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_PPtrCurves: - serializedVersion: 2 curve: @@ -42,6 +72,15 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -77,7 +116,37 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Art/Animations/Characters/Pulver/AC_Pulver.controller.meta b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Left.anim.meta similarity index 64% rename from Assets/Art/Animations/Characters/Pulver/AC_Pulver.controller.meta rename to Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Left.anim.meta index 846ac1bd..4837c0da 100644 --- a/Assets/Art/Animations/Characters/Pulver/AC_Pulver.controller.meta +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Left.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 579e13fd45217ab4a9c275bb306a188b +guid: b2dec7cdb851c914f8ca1c93a0d1270c NativeFormatImporter: externalObjects: {} - mainObjectFileID: 9100000 + mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Right.anim b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Right.anim new file mode 100644 index 00000000..d3e23666 --- /dev/null +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Right.anim @@ -0,0 +1,153 @@ +%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: ANIM_PulverWalk_Right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 1814454124, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - time: 0.033333335 + value: {fileID: 1852438355, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - time: 0.06666667 + value: {fileID: -81975489, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - time: 0.1 + value: {fileID: 719705599, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - time: 0.13333334 + value: {fileID: -1913237, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 30 + 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: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1814454124, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - {fileID: 1852438355, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - {fileID: -81975489, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - {fileID: 719705599, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + - {fileID: -1913237, guid: 8af0253099943e84e960c630bafbbdb4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk.anim.meta b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Right.anim.meta similarity index 100% rename from Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk.anim.meta rename to Assets/Art/Animations/Characters/Pulver/ANIM_PulverWalk_Right.anim.meta diff --git a/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller b/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller index fbcd7cdf..f38ee1f0 100644 --- a/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller +++ b/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller @@ -1,17 +1,96 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-6908324641349580049 +--- !u!1102 &-8457947249421688616 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ANIM_PulverIdle 0 + m_Name: WalkBlendTree m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -701628290760732327} + - {fileID: 7072950364927956952} + 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: 8491515009676554182} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7247241238006876916 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_PulverIdle_Left + 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: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3add3d6703eef624abc7fa0dd8523aec, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6538542043237772027 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleBlendTree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5493228531130196948} + 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: 97496280082988622} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-5816699158483196731 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_PulverIdle_Right + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -27,57 +106,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-3761661305846931001 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ANIM_PulverWalk _Front - 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: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 0542618d0e476544790913fbde6f04e8, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &-2890685227036579189 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 4 - m_ConditionEvent: Speed - m_EventTreshold: 0.01 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6908324641349580049} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-2498421205022408257 AnimatorState: serializedVersion: 6 @@ -130,84 +158,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-1692759319462024916 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ANIM_PulverWalk _Back - 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: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 5095f7a137bd7124b9498b01b99b15f7, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-1562887171840619689 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ANIM_PulverWalk - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -2890685227036579189} - 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: 89a8cc0fc5d6bec4b869bf6e817d7005, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &-701628290760732327 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: Speed - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1562887171840619689} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75409836 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1107 &-218061781962429471 AnimatorStateMachine: serializedVersion: 6 @@ -217,36 +167,39 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -1562887171840619689} - m_Position: {x: 40, y: 360, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6908324641349580049} - m_Position: {x: 30, y: 230, z: 0} - - serializedVersion: 1 - m_State: {fileID: 6806729379030734002} - m_Position: {x: 65, y: 295, z: 0} - - serializedVersion: 1 - m_State: {fileID: -3761661305846931001} - m_Position: {x: 420, y: 190, z: 0} - - serializedVersion: 1 - m_State: {fileID: -1692759319462024916} - m_Position: {x: 420, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: 6371375805443383927} - m_Position: {x: 420, y: 290, z: 0} + m_Position: {x: 420, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: -2498421205022408257} - m_Position: {x: 420, y: 340, z: 0} + m_Position: {x: 640, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: 3364220882969471902} - m_Position: {x: 455, y: 405, z: 0} + m_Position: {x: 420, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: 5882640659329534007} - m_Position: {x: 490, y: 470, z: 0} + m_Position: {x: 640, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -2247811965598142207} - m_Position: {x: 525, y: 535, z: 0} + m_Position: {x: 540, y: 490, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7247241238006876916} + m_Position: {x: 420, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5816699158483196731} + m_Position: {x: 640, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1056871264170597655} + m_Position: {x: 420, y: 350, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7133699243886744631} + m_Position: {x: 640, y: 350, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6538542043237772027} + m_Position: {x: 30, y: 210, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8457947249421688616} + m_Position: {x: 30, y: 310, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -254,9 +207,9 @@ AnimatorStateMachine: 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_ExitPosition: {x: 820, y: 80, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -6908324641349580049} + m_DefaultState: {fileID: -6538542043237772027} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -272,6 +225,18 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: DirY + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: DirX + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -285,6 +250,79 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!206 &97496280082988622 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 554eeab140be1e841aa0c2aab2365512, type: 2} + m_Threshold: 0 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 3add3d6703eef624abc7fa0dd8523aec, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 3a5c5a8ee8d952443bc7534bc846845f, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: ede6b90fe32b7554fb2e4d46cf183923, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + m_BlendParameter: DirX + m_BlendParameterY: DirY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 +--- !u!1102 &1056871264170597655 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_PulverWalk_Left + 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: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b2dec7cdb851c914f8ca1c93a0d1270c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &3364220882969471902 AnimatorState: serializedVersion: 6 @@ -311,6 +349,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &5493228531130196948 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8457947249421688616} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5882640659329534007 AnimatorState: serializedVersion: 6 @@ -363,14 +426,39 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &6806729379030734002 +--- !u!1101 &7072950364927956952 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6538542043237772027} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &7133699243886744631 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ANIM_PulverIdle_ + m_Name: ANIM_PulverWalk_Right m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -383,9 +471,56 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: ede6b90fe32b7554fb2e4d46cf183923, type: 2} + m_Motion: {fileID: 7400000, guid: 89a8cc0fc5d6bec4b869bf6e817d7005, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!206 &8491515009676554182 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 89a8cc0fc5d6bec4b869bf6e817d7005, type: 2} + m_Threshold: 0 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: b2dec7cdb851c914f8ca1c93a0d1270c, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 0b8675aff2779274f89702786ef054e9, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: b04c19d93371c244c8aa1da690438f95, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + m_BlendParameter: DirX + m_BlendParameterY: DirY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle.anim b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Left.anim similarity index 54% rename from Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle.anim rename to Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Left.anim index 1f9c875a..411297da 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle.anim +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Left.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Trafalgar_Idle + m_Name: Trafalgar_Idle_Left serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -16,7 +16,37 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_PPtrCurves: - serializedVersion: 2 curve: @@ -36,6 +66,15 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -68,7 +107,37 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Left.anim.meta b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Left.anim.meta new file mode 100644 index 00000000..50b41678 --- /dev/null +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bcaf5d9c6bfce224ebd3a8eeecfb0972 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Right.anim b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Right.anim new file mode 100644 index 00000000..f5edc1f6 --- /dev/null +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Right.anim @@ -0,0 +1,144 @@ +%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: Trafalgar_Idle_Right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 757812146, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 1 + value: {fileID: 757812146, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 757812146, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 757812146, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.0166667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle.anim.meta b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Right.anim.meta similarity index 100% rename from Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle.anim.meta rename to Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Right.anim.meta diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk.anim b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Left.anim similarity index 73% rename from Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk.anim rename to Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Left.anim index 131a8095..66af3a50 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk.anim +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Left.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Trafalgar_Walk + m_Name: Trafalgar_Walk_Left serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -16,7 +16,37 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.53333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_PPtrCurves: - serializedVersion: 2 curve: @@ -64,6 +94,15 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -110,7 +149,37 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.53333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Left.anim.meta b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Left.anim.meta new file mode 100644 index 00000000..0212d8d9 --- /dev/null +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66c3a2525b308a64082f2ad57fd4bf6d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Right.anim b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Right.anim new file mode 100644 index 00000000..4d9058bb --- /dev/null +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Right.anim @@ -0,0 +1,186 @@ +%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: Trafalgar_Walk_Right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.53333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -2029046881, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.033333335 + value: {fileID: 441607401, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.06666667 + value: {fileID: -1548883300, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.1 + value: {fileID: 857525688, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.13333334 + value: {fileID: 1790911117, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.16666667 + value: {fileID: 2145791789, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.2 + value: {fileID: 226714897, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.23333333 + value: {fileID: -164126635, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.26666668 + value: {fileID: -1982042278, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.3 + value: {fileID: -430490313, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.33333334 + value: {fileID: -1324073028, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.36666667 + value: {fileID: -266345098, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.4 + value: {fileID: -374578319, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.43333334 + value: {fileID: -1617103026, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.46666667 + value: {fileID: 239798299, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - time: 0.5 + value: {fileID: 1295876740, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 30 + 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: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -2029046881, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 441607401, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -1548883300, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 857525688, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 1790911117, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 2145791789, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 226714897, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -164126635, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -1982042278, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -430490313, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -1324073028, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -266345098, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -374578319, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: -1617103026, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 239798299, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + - {fileID: 1295876740, guid: e4404d33f1649de418cc3741cd06bb8c, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.53333336 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.53333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Right.anim.meta b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Right.anim.meta new file mode 100644 index 00000000..f72da6ad --- /dev/null +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9889819dc1456024baf5a081987331cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller b/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller index fb473739..5ee03bad 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller +++ b/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller @@ -1,5 +1,132 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!206 &-9181796725921454154 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: b144808b37ccd6d49a1537f9cf802602, type: 2} + m_Threshold: 0 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: bcaf5d9c6bfce224ebd3a8eeecfb0972, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 4c8b41ce9ecee934eb1486edb476f88f, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: c296af7440d8fd6449942acae7c775c2, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + m_BlendParameter: DirX + m_BlendParameterY: DirY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 +--- !u!1102 &-9126242872206829132 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Trafalgar_Idle_Left + 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: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: bcaf5d9c6bfce224ebd3a8eeecfb0972, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-8581689444086939514 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleBlendTree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1360955616925482811} + 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: -9181796725921454154} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-8076980941366841249 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MoveBlendTree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6972668464383234541} + 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: 33740119092880589} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-7905659897279314362 AnimatorState: serializedVersion: 6 @@ -26,56 +153,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-4839866279015429749 -AnimatorStateTransition: +--- !u!1102 &-72408803254370772 +AnimatorState: + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: Speed - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3995218182378666308} - 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 &-700978565139536805 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 4 - m_ConditionEvent: Speed - m_EventTreshold: 0.01 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 5619525930558396358} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.53125 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_Name: Trafalgar_Idle_Right + 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: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b144808b37ccd6d49a1537f9cf802602, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -91,6 +194,18 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: DirY + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: DirX + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -104,6 +219,78 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!206 &33740119092880589 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 9889819dc1456024baf5a081987331cd, type: 2} + m_Threshold: 0 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 66c3a2525b308a64082f2ad57fd4bf6d, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 31c2053b4ee11b040a4a7fa473ebf7a7, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 7c474c8e31bdf4f458819f39d84eee55, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + m_BlendParameter: DirX + m_BlendParameterY: DirY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 +--- !u!1101 &1360955616925482811 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8076980941366841249} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1610360039336346648 AnimatorState: serializedVersion: 6 @@ -156,33 +343,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &3995218182378666308 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Trafalgar_Walk - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -700978565139536805} - 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: d08dcc21f60f2724bad639dec86e8931, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &4768840196775414213 AnimatorState: serializedVersion: 6 @@ -218,24 +378,36 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 3995218182378666308} - m_Position: {x: 30, y: 360, z: 0} - - serializedVersion: 1 - m_State: {fileID: 5619525930558396358} - m_Position: {x: 30, y: 220, z: 0} - serializedVersion: 1 m_State: {fileID: 1610360039336346648} - m_Position: {x: 460, y: 250, z: 0} + m_Position: {x: 540, y: 230, z: 0} - serializedVersion: 1 m_State: {fileID: 4768840196775414213} - m_Position: {x: 460, y: 350, z: 0} + m_Position: {x: 750, y: 230, z: 0} - serializedVersion: 1 m_State: {fileID: -7905659897279314362} - m_Position: {x: 495, y: 415, z: 0} + m_Position: {x: 540, y: 280, z: 0} - serializedVersion: 1 m_State: {fileID: 3675985781614168062} - m_Position: {x: 530, y: 480, z: 0} + m_Position: {x: 750, y: 280, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7944978939841534153} + m_Position: {x: 750, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8076980941366841249} + m_Position: {x: 30, y: 320, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8488974499692860468} + m_Position: {x: 540, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8581689444086939514} + m_Position: {x: 30, y: 220, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9126242872206829132} + m_Position: {x: 750, y: 380, z: 0} + - serializedVersion: 1 + m_State: {fileID: -72408803254370772} + m_Position: {x: 540, y: 380, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -245,19 +417,43 @@ AnimatorStateMachine: 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: 5619525930558396358} ---- !u!1102 &5619525930558396358 + m_DefaultState: {fileID: -8581689444086939514} +--- !u!1101 &6972668464383234541 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8581689444086939514} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.53846157 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &7944978939841534153 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Trafalgar_Idle + m_Name: Trafalgar_Walk_Left m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -4839866279015429749} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -267,7 +463,33 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: b144808b37ccd6d49a1537f9cf802602, type: 2} + m_Motion: {fileID: 7400000, guid: 66c3a2525b308a64082f2ad57fd4bf6d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8488974499692860468 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Trafalgar_Walk_Right + 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: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 9889819dc1456024baf5a081987331cd, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Scripts/Input/PlayerTouchController.cs b/Assets/Scripts/Input/PlayerTouchController.cs index 7b441228..45fbe3e2 100644 --- a/Assets/Scripts/Input/PlayerTouchController.cs +++ b/Assets/Scripts/Input/PlayerTouchController.cs @@ -39,6 +39,10 @@ namespace Input private Vector3 _lastDirectMoveDir = Vector3.right; public Vector3 LastDirectMoveDir => _lastDirectMoveDir; + // --- Last movement directions for animation blend tree --- + private float _lastDirX = 0f; // -1 (left) to 1 (right) + private float _lastDirY = -1f; // -1 (down) to 1 (up) + // --- MoveToAndNotify State --- public delegate void ArrivedAtTargetHandler(); private Coroutine moveToCoroutine; @@ -238,6 +242,7 @@ namespace Input { float normalizedSpeed = 0f; Vector3 velocity = Vector3.zero; + if (isHolding && GameManager.Instance.DefaultHoldMovementMode == HoldMovementMode.Direct) { normalizedSpeed = directMoveVelocity.magnitude / aiPath.maxSpeed; @@ -248,8 +253,30 @@ namespace Input normalizedSpeed = aiPath.velocity.magnitude / aiPath.maxSpeed; velocity = aiPath.velocity; } + + // Set speed parameter as before animator.SetFloat("Speed", Mathf.Clamp01(normalizedSpeed)); - SetSpriteFlip(velocity); + + // Calculate and set X and Y directions for 2D blend tree + if (velocity.sqrMagnitude > 0.01f) + { + // Normalize the velocity vector to get direction + Vector3 normalizedVelocity = velocity.normalized; + + // Update the stored directions when actively moving + _lastDirX = normalizedVelocity.x; + _lastDirY = normalizedVelocity.y; + + // Set the animator parameters + animator.SetFloat("DirX", _lastDirX); + animator.SetFloat("DirY", _lastDirY); + } + else + { + // When not moving, keep using the last direction + animator.SetFloat("DirX", _lastDirX); + animator.SetFloat("DirY", _lastDirY); + } } } @@ -286,17 +313,6 @@ namespace Input } } - private void SetSpriteFlip(Vector3 velocity) - { - if (spriteRenderer != null && velocity.sqrMagnitude > 0.001f) - { - if (velocity.x > 0.01f) - spriteRenderer.flipX = false; - else if (velocity.x < -0.01f) - spriteRenderer.flipX = true; - } - } - /// /// Coroutine for updating the AIPath destination during pathfinding hold movement. /// diff --git a/Assets/Scripts/Movement/FollowerController.cs b/Assets/Scripts/Movement/FollowerController.cs index 8ba3a42c..60bef864 100644 --- a/Assets/Scripts/Movement/FollowerController.cs +++ b/Assets/Scripts/Movement/FollowerController.cs @@ -28,6 +28,9 @@ public class FollowerController: MonoBehaviour private float _timer; private bool _isManualFollowing = true; private Vector3 _lastMoveDir = Vector3.right; + // Direction variables for 2D blend tree animation + private float _lastDirX = 0f; // -1 (left) to 1 (right) + private float _lastDirY = -1f; // -1 (down) to 1 (up) private float _currentSpeed = 0f; private Animator _animator; private Transform _artTransform; @@ -139,14 +142,6 @@ public class FollowerController: MonoBehaviour _currentSpeed = Mathf.Max(_currentSpeed, minSpeed); } Vector3 dir = (_targetPoint - transform.position).normalized; - // Sprite flipping based on movement direction - if (_spriteRenderer != null && dir.sqrMagnitude > 0.001f) - { - if (dir.x > 0.01f) - _spriteRenderer.flipX = false; - else if (dir.x < -0.01f) - _spriteRenderer.flipX = true; - } transform.position += dir * _currentSpeed * Time.deltaTime; } else @@ -154,30 +149,56 @@ public class FollowerController: MonoBehaviour _currentSpeed = 0f; } } + if (_isReturningToPlayer && _aiPath != null && _aiPath.enabled && _playerTransform != null) { _aiPath.destination = _playerTransform.position; } + if (_animator != null) { float normalizedSpeed = 0f; + Vector3 velocity = Vector3.zero; + if (_isManualFollowing) { normalizedSpeed = _currentSpeed / _followerMaxSpeed; + + // Calculate direction vector for manual movement + if (_currentSpeed > 0.01f) + { + velocity = (_targetPoint - transform.position).normalized * _currentSpeed; + } } else if (_aiPath != null) { normalizedSpeed = _aiPath.velocity.magnitude / _followerMaxSpeed; - // Sprite flipping for pathfinding mode - if (_spriteRenderer != null && _aiPath.velocity.sqrMagnitude > 0.001f) - { - if (_aiPath.velocity.x > 0.01f) - _spriteRenderer.flipX = false; - else if (_aiPath.velocity.x < -0.01f) - _spriteRenderer.flipX = true; - } + velocity = _aiPath.velocity; } + + // Set speed parameter for idle/walk transitions _animator.SetFloat("Speed", Mathf.Clamp01(normalizedSpeed)); + + // Calculate and set X and Y directions for 2D blend tree + if (velocity.sqrMagnitude > 0.01f) + { + // Normalize the velocity vector to get direction + Vector3 normalizedVelocity = velocity.normalized; + + // Update the stored directions when actively moving + _lastDirX = normalizedVelocity.x; + _lastDirY = normalizedVelocity.y; + + // Set the animator parameters + _animator.SetFloat("DirX", _lastDirX); + _animator.SetFloat("DirY", _lastDirY); + } + else + { + // When not moving, keep using the last direction + _animator.SetFloat("DirX", _lastDirX); + _animator.SetFloat("DirY", _lastDirY); + } } }