thunderstargames/project-reset
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: player now properly responds to root motion

Browse Source 
also contains changes to the animation controller for all the currently made animations, events for the singular attack animation, corresponding methods, and graph changes to utilize them
This commit is contained in:
Chris
2026-01-07 01:10:59 -05:00
parent 78573d9f5d
commit 2e28fe17cd
20 changed files with 17728 additions and 576539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller
View File

@@ -9,23 +9,23 @@ BlendTree:
m_Name: Blend Tree
m_Childs:
- serializedVersion: 2
m_Motion: {fileID: -78638954318744386, guid: af57850141d47244a8c7c021d10baeed, type: 3}
m_Motion: {fileID: 4646074752401857823, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Threshold: 0
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_TimeScale: 0.001
m_CycleOffset: 0
m_DirectBlendParameter: Move Direction X
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 5782633955143103724, guid: af57850141d47244a8c7c021d10baeed, type: 3}
m_Motion: {fileID: 5522812681064789136, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Threshold: 0.1
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_TimeScale: 0.5
m_CycleOffset: 0
m_DirectBlendParameter: Move Direction X
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 5782633955143103724, guid: af57850141d47244a8c7c021d10baeed, type: 3}
m_Motion: {fileID: 5522812681064789136, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Threshold: 1
m_Position: {x: 0, y: 0}
m_TimeScale: 1.3
@@ -50,7 +50,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -5807180696605908168}
m_Position: {x: 380, y: 140, z: 0}
m_Position: {x: 380, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: -3460776153395501506}
m_Position: {x: 240, y: -10, z: 0}
@@ -59,10 +59,7 @@ AnimatorStateMachine:
m_Position: {x: 500, y: -10, z: 0}
- serializedVersion: 1
m_State: {fileID: -5118064861454726822}
m_Position: {x: 380, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 5724930721123095735}
m_Position: {x: 0, y: 0, z: 0}
m_Position: {x: 380, y: 110, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 2256285109070000650}
@@ -74,7 +71,7 @@ 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: -3460776153395501506}
m_DefaultState: {fileID: -5807180696605908168}
--- !u!1102 &-7139813020054202934
AnimatorState:
serializedVersion: 6
@@ -85,7 +82,8 @@ AnimatorState:
m_Name: AttackSword2
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: -2656076906570638267}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -142,7 +140,7 @@ AnimatorStateTransition:
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5118064861454726822}
m_Solo: 0
m_Mute: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
@@ -190,7 +188,8 @@ AnimatorState:
m_Name: AttackSword1
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: 8384401300724406585}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -223,7 +222,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.43
m_TransitionOffset: 0
m_ExitTime: 0.8867925
m_HasExitTime: 0
@@ -231,6 +230,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2656076906570638267
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: -5118064861454726822}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.89830506
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-754458811588506750
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -284,7 +305,7 @@ AnimatorController:
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Attack
m_Type: 9
@@ -339,32 +360,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &5724930721123095735
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AttackSword1 0
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: 6164891689389619749, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!206 &7068036982611019673
BlendTree:
m_ObjectHideFlags: 1
@@ -404,3 +399,25 @@ BlendTree:
m_UseAutomaticThresholds: 0
m_NormalizedBlendValues: 0
m_BlendType: 0
--- !u!1101 &8384401300724406585
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: -5118064861454726822}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.5332681
m_TransitionOffset: 0.09979316
m_ExitTime: 1.2094368
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1