kronic/Project-M
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Melee feel overhaul: SwordCombat anims at heavy cadence, salvage axe, damage-at-contact + buffer + dash law (guidelines forks 1-6)

Browse Source 
07-18/19/20 arc: LightCombo01/HeavyCombo01 clips onto Swing1-3/Slam at
~natural speed (26-tick window, 30-tick recover, DPS-held damage retune),
Menacing01 combat idle (InCombat), SM_Wep_Axe_Large_01 rigid-skinned to
Hand_R at x1.25, LANTERN FX retone + blade-smear ribbon. Forks 1-6 per
Combat_Attack_Feel_Guidelines (design review wf_000bc247): cleave resolves
at the CONTACT tick (MeleeCleavePending schedule-and-consume, knob 31,
0=legacy; connect cues moved to contact), MeleeRange 2.2 + reach-only
finisher mult 1.25 (knob 30), BufferedAttackTick GhostField input buffer
(knob 29, unlock-edge validity), dash refused pre-contact (lookup-based).
Tests: MeleeComboTests pin legacy knobs; +3 fork tests (414 green); live
server proof: HP drop exactly at swing+16 under tick batching.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Luis Gonzalez
2026-07-20 21:03:18 -07:00
parent 2c187a17a9
commit 7b65912f30
22 changed files with 1327 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Project/Animation/AC_PlayerTopDown.controller
+129 -16
View File
@@ -42,7 +42,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.03
m_TransitionDuration: 0.06
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
@@ -58,7 +58,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SpecialSlam
m_Speed: 1
m_Speed: 1.5
m_CycleOffset: 0
m_Transitions:
- {fileID: -1718360560449278314}
@@ -71,7 +71,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -623603649343465320, guid: da76a86fe339c6444a0c1c040a9b5105, type: 3}
m_Motion: {fileID: -1787871631005901691, guid: f3800f1bd189abc469fcc7c374371a91, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -124,7 +124,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.04
m_TransitionDuration: 0.07
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
@@ -149,7 +149,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.12
m_TransitionDuration: 0.15
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
@@ -202,7 +202,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.03
m_TransitionDuration: 0.06
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
@@ -365,7 +365,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.12
m_TransitionDuration: 0.15
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
@@ -390,7 +390,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.12
m_TransitionDuration: 0.15
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
@@ -633,7 +633,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Swing3
m_Speed: 1
m_Speed: 1.1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7246856984932168808}
@@ -646,7 +646,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -623603649343465320, guid: 594271330704f684e85012825546489b, type: 3}
m_Motion: {fileID: -8890989884591690541, guid: c9e0b6900401fcb42980df96b84db76c, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -727,6 +727,12 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: InCombat
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -786,7 +792,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -623603649343465320, guid: 42d545cebb3c8b54ebedba77f9435c49, type: 3}
m_Motion: {fileID: 5800342443961765143, guid: 95697c3218923dd43aa160c110bfbc79, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -868,7 +874,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.03
m_TransitionDuration: 0.06
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
@@ -896,12 +902,37 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -623603649343465320, guid: 65d8851d683f4784b9f64c2f37c952c7, type: 3}
m_Motion: {fileID: -1444214504022159124, guid: a0b8f6f252ea03c46b36b357f5ea81e5, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &3694240317838589182
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: InCombat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8302574255206078140}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.4
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5014557051428573475
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -963,6 +994,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -8219464881866229938}
m_Position: {x: 515, y: 585, z: 0}
- serializedVersion: 1
m_State: {fileID: 5692497731704029855}
m_Position: {x: 550, y: 650, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 5014557051428573475}
@@ -980,6 +1014,34 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8302574255206078140}
--- !u!1102 &5692497731704029855
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CombatIdle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 3694240317838589182}
- {fileID: 5811251164301445305}
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: -3634702890504892199, guid: f574f64a099779248beea90d27b2dde0, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5736576975501273399
AnimatorState:
serializedVersion: 6
@@ -988,7 +1050,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Swing1
m_Speed: 1
m_Speed: 1.25
m_CycleOffset: 0
m_Transitions:
- {fileID: -1792799526728587842}
@@ -1001,12 +1063,37 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -623603649343465320, guid: dd80b656157b2b441b2466c7646c8441, type: 3}
m_Motion: {fileID: -7717634560727564301, guid: 9f773338b2a96174ebe9b63870034ca3, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5811251164301445305
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.1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8102868851794693864}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &6065214076707455157
AnimatorStateMachine:
serializedVersion: 7
@@ -1046,7 +1133,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.12
m_TransitionDuration: 0.15
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
@@ -1066,6 +1153,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -1505565898738729052}
- {fileID: 9125527510138141906}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -1081,6 +1169,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &9125527510138141906
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: InCombat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5692497731704029855}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &9217853296350750828
AnimatorState:
serializedVersion: 6