diff --git a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller index 2a00527fe..14e591460 100644 --- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller +++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller @@ -136,6 +136,24 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 1 +--- !u!114 &-8909809133941230916 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} + m_Name: + m_EditorClassIdentifier: + stateInfos: [] + debug: 0 + tags: + - tagName: Attack + tagType: 3 + normalizedTime: {x: 0.1, y: 0.8} --- !u!206 &-8907925124256200702 BlendTree: m_ObjectHideFlags: 1 @@ -2581,6 +2599,24 @@ BlendTree: m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!114 &-5026086598927267809 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3} + m_Name: + m_EditorClassIdentifier: + stateInfos: [] + debug: 0 + tags: + - tagName: Attack + tagType: 3 + normalizedTime: {x: 0.1, y: 0.8} --- !u!1101 &-5018228735855003063 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -3596,6 +3632,37 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-3801079781883241350 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 4 level D end + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2752798594692797968} + m_StateMachineBehaviours: + - {fileID: 2223896234809273292} + - {fileID: -5026086598927267809} + - {fileID: 8407295702874445002} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 1 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 1827226128182048838, guid: 9ea3d471ba5f47f4dba10e92cd18dd3a, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-3796210511374273109 AnimatorState: serializedVersion: 6 @@ -4104,6 +4171,25 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!114 &-2870668572552535696 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 106114, guid: e652bf5892ec3b84b85b55b491f584a6, type: 3} + sounds: + - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} + - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} + - {fileID: 8300000, guid: 00b2eee1adec33444b30707d7e89f5b1, type: 3} + - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} + triggerTime: 0 --- !u!114 &-2836588654973374975 MonoBehaviour: m_ObjectHideFlags: 1 @@ -4376,6 +4462,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-2670217054629400972 +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: -493156934175870501} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.86725664 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-2666341531136078217 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -5230,6 +5338,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-1115075941929099510 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.88188976 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1090849263029511128 AnimatorState: serializedVersion: 6 @@ -5696,6 +5826,37 @@ AnimatorStateMachine: m_ExitPosition: {x: 504, y: 120, z: 0} m_ParentStateMachinePosition: {x: 20, y: -20, z: 0} m_DefaultState: {fileID: 6149878427214158291} +--- !u!1102 &-493156934175870501 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: '4 level D start ' + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8090932747858019706} + m_StateMachineBehaviours: + - {fileID: -2870668572552535696} + - {fileID: -8909809133941230916} + - {fileID: 7069479602677940053} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 1 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 1827226128182048838, guid: d47c433a51e40974f8aaf2065beac139, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-455727239110576240 AnimatorState: serializedVersion: 6 @@ -35336,6 +35497,7 @@ AnimatorState: m_Transitions: - {fileID: 1101473625656561818} - {fileID: 7610205736540009510} + - {fileID: -2670217054629400972} m_StateMachineBehaviours: - {fileID: 114304692954732270} - {fileID: 114263588767966834} @@ -35348,7 +35510,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400024, guid: a9e228972999b0d46a21e30edf97d812, type: 3} + m_Motion: {fileID: 7400026, guid: fb07a934dbc1969468121112ca048964, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -36457,8 +36619,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 1827226128182048838, guid: 6a317b388658f81408b11b9f07b421fd, - type: 3} + m_Motion: {fileID: 7400032, guid: fb07a934dbc1969468121112ca048964, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -38253,8 +38414,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 1827226128182048838, guid: 172113928f75d4f4a8928581fcf29f33, - type: 3} + m_Motion: {fileID: 7400036, guid: fb07a934dbc1969468121112ca048964, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -40579,7 +40739,13 @@ AnimatorStateMachine: m_Position: {x: 240, y: -10, z: 0} - serializedVersion: 1 m_State: {fileID: 2206263804988382436} - m_Position: {x: 240, y: -80, z: 0} + m_Position: {x: 240, y: -120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -493156934175870501} + m_Position: {x: -30, y: -130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3801079781883241350} + m_Position: {x: 270, y: -330, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -40588,7 +40754,7 @@ AnimatorStateMachine: m_AnyStatePosition: {x: 48, y: 60, z: 0} m_EntryPosition: {x: 30, y: 120, z: 0} m_ExitPosition: {x: 528, y: 60, z: 0} - m_ParentStateMachinePosition: {x: 504, y: -36, z: 0} + m_ParentStateMachinePosition: {x: 710, y: -50, z: 0} m_DefaultState: {fileID: 1102466317250516052} --- !u!1107 &1107517961391708756 AnimatorStateMachine: @@ -45192,11 +45358,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: D + m_Name: default D m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 5583419063270116368} + - {fileID: -1115075941929099510} m_StateMachineBehaviours: - {fileID: 6975622290643910291} - {fileID: 3529834855832333734} @@ -45209,12 +45375,32 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400096, guid: a9e228972999b0d46a21e30edf97d812, type: 3} + m_Motion: {fileID: 1827226128182048838, guid: 33155b0e0a894984aaa6d5beee3b6e77, + type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &2223896234809273292 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae6dcf6552bd02645a9ceb894d7a6cfa, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 106114, guid: e652bf5892ec3b84b85b55b491f584a6, type: 3} + sounds: + - {fileID: 8300000, guid: 60fdfa301881bae48ae59759cc83b842, type: 3} + - {fileID: 8300000, guid: f82a7d93926f978479349ce3a9e025f6, type: 3} + - {fileID: 8300000, guid: 00b2eee1adec33444b30707d7e89f5b1, type: 3} + - {fileID: 8300000, guid: cf35a39ed3f005d49bf846fdd9eee7a0, type: 3} + triggerTime: 0 --- !u!114 &2372017269621928998 MonoBehaviour: m_ObjectHideFlags: 1 @@ -45440,6 +45626,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &2752798594692797968 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.88188976 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &2776476192666058960 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -47249,28 +47457,6 @@ MonoBehaviour: stateInfos: [] tags: - CustomAction ---- !u!1101 &5583419063270116368 -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: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.87068963 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &5629918298555864736 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -48214,6 +48400,50 @@ MonoBehaviour: rotatePlayerTowardsTarget: 0 rotationActivationAngle: 45 debug: 0 +--- !u!114 &7069479602677940053 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c0e8cc669ad24ae3bcdae73fa4c003b, type: 3} + m_Name: + m_EditorClassIdentifier: + startDamage: 0.42 + endDamage: 0.62 + damageMultiplier: 3 + recoilID: 2 + reactionID: 0 + meleeAttackType: 1 + damageType: + bodyParts: + - RightLowerArm + ignoreDefense: 1 + activeRagdoll: 0 + senselessTime: 0 + resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.6 + unlockRotationTime: 0.7 + lerpPositionTowardsTarget: 1 + maxLerpDistance: 3.5 + positionLerpSpeed: 2 + stoppingDistance: 1.2 + useComboTimingWindow: 0 + comboWindowStartTime: 0.9 + comboWindowDuration: 0.5 + comboWindowTimeScale: 0.3 + useAttackTimeScale: 0 + maxTargetDistance: 3 + lowHealthTh: 35 + attackTimeScale: 0.2 + attackTimeScaleStart: 0.28 + attackTimeScaleEnd: 0.58 + rotatePlayerTowardsTarget: 1 + degreeThreshold: 100 + debug: 0 --- !u!1101 &7084117839568741563 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -48834,6 +49064,28 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 1 +--- !u!1101 &8090932747858019706 +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: -3801079781883241350} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5833334 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &8110638347516475149 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -49037,6 +49289,50 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -1652084758722085866} +--- !u!114 &8407295702874445002 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c0e8cc669ad24ae3bcdae73fa4c003b, type: 3} + m_Name: + m_EditorClassIdentifier: + startDamage: 0.42 + endDamage: 0.62 + damageMultiplier: 3 + recoilID: 2 + reactionID: 0 + meleeAttackType: 1 + damageType: + bodyParts: + - RightLowerArm + ignoreDefense: 1 + activeRagdoll: 0 + senselessTime: 0 + resetAttackTrigger: 0 + resetTriggerBeforeTime: 0.6 + unlockRotationTime: 0.7 + lerpPositionTowardsTarget: 1 + maxLerpDistance: 3.5 + positionLerpSpeed: 2 + stoppingDistance: 1.2 + useComboTimingWindow: 0 + comboWindowStartTime: 0.9 + comboWindowDuration: 0.5 + comboWindowTimeScale: 0.3 + useAttackTimeScale: 0 + maxTargetDistance: 3 + lowHealthTh: 35 + attackTimeScale: 0.2 + attackTimeScaleStart: 0.28 + attackTimeScaleEnd: 0.58 + rotatePlayerTowardsTarget: 1 + degreeThreshold: 100 + debug: 0 --- !u!1101 &8436517890948117470 AnimatorStateTransition: m_ObjectHideFlags: 1