feat: more combat tweaks

shuriken can now be thrown
jumping animtions
jumping animations timing
state machine changes
start of online integration
This commit is contained in:
Chris
2026-01-15 14:42:25 -05:00
parent a06784f7b6
commit 25b7fae339
45 changed files with 28662 additions and 250 deletions

View File

@@ -17,7 +17,7 @@ BlendTree:
m_DirectBlendParameter: Move Direction X
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 199366884485362299, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Motion: {fileID: -9063138054437102302, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Threshold: 0.5155598
m_Position: {x: 0, y: 0}
m_TimeScale: 0.5
@@ -25,7 +25,7 @@ BlendTree:
m_DirectBlendParameter: Move Direction X
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 199366884485362299, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Motion: {fileID: -9063138054437102302, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Threshold: 1
m_Position: {x: 0, y: 0}
m_TimeScale: 1.8
@@ -64,6 +64,31 @@ AnimatorStateTransition:
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-8578720785926311839
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: Grounded
m_EventTreshold: 0.01
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3303347849624952746}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.0786407
m_TransitionOffset: 1.08
m_ExitTime: 0.87394965
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-7831893988088785558
AnimatorStateMachine:
serializedVersion: 6
@@ -117,7 +142,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 1464555850770191113}
- {fileID: 1003839303391055649}
- {fileID: 6922667274086674103}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -133,6 +158,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-7285723131094683967
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: Jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1341390560438426007}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.04172797
m_TransitionOffset: 0
m_ExitTime: 0.08297222
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 3
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1102 &-5807180696605908168
AnimatorState:
serializedVersion: 6
@@ -150,7 +200,7 @@ AnimatorState:
- {fileID: -9011342763023408979}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_IKOnFeet: 1
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
@@ -163,6 +213,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-5609994953046462806
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: Grounded
m_EventTreshold: 0.01
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3303347849624952746}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.0786407
m_TransitionOffset: 1.08
m_ExitTime: 0.87394965
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-5380831712939141202
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -191,6 +266,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-5335171594713968129
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: -3231053178844433393}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.81707317
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 1
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1102 &-5118064861454726822
AnimatorState:
serializedVersion: 6
@@ -266,7 +363,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9481268
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -296,28 +393,35 @@ AnimatorStateTransition:
m_InterruptionSource: 3
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3578693359707166933
AnimatorStateTransition:
--- !u!1102 &-3404979395967366747
AnimatorState:
serializedVersion: 6
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.91549295
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
m_Name: JumpDoubleJump
m_Speed: 1.5
m_CycleOffset: 0
m_Transitions:
- {fileID: -5609994953046462806}
- {fileID: 5907325166013281409}
- {fileID: -7285723131094683967}
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: -228057056772693152, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3303347849624952746
AnimatorState:
serializedVersion: 6
@@ -357,6 +461,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -3672400458932457120}
- {fileID: -2973852975355548571}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -386,7 +491,7 @@ AnimatorStateTransition:
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5807180696605908168}
m_Solo: 0
m_Mute: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.43
@@ -397,6 +502,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2973852975355548571
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: Jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3404979395967366747}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0.06
m_ExitTime: 0.000000010326137
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2924008851715793263
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -445,7 +575,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9481268
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -494,6 +624,35 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8285867021611363252}
--- !u!1102 &-1341390560438426007
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: JumpDoubleJump 0
m_Speed: 1.5
m_CycleOffset: 0
m_Transitions:
- {fileID: -5335171594713968129}
- {fileID: -8578720785926311839}
- {fileID: 2767556359357260872}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 1
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -228057056772693152, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-568376608702641341
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -621,37 +780,12 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.00020503998
m_TransitionDuration: 0.03
m_TransitionOffset: 0
m_ExitTime: 0.8558567
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1003839303391055649
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: Grounded
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3303347849624952746}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.033032164
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1464555850770191113
@@ -661,21 +795,74 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Grounded
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3231053178844433393}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.45036888
m_TransitionDuration: 0.43
m_TransitionOffset: 0
m_ExitTime: 0.0000000019332473
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &2734374599067492937
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: In Combat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5807180696605908168}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.43
m_TransitionOffset: 0
m_ExitTime: 0.8867925
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &2767556359357260872
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: Jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3404979395967366747}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.03
m_TransitionOffset: 0
m_ExitTime: 0.81707317
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 3
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1107 &3643258136328604056
AnimatorStateMachine:
serializedVersion: 6
@@ -690,19 +877,25 @@ AnimatorStateMachine:
m_Position: {x: 670, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: -3231053178844433393}
m_Position: {x: 390, y: -30, z: 0}
m_Position: {x: 360, y: -10, z: 0}
- serializedVersion: 1
m_State: {fileID: -7517949062573905506}
m_Position: {x: 110, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: -3404979395967366747}
m_Position: {x: 210, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: -1341390560438426007}
m_Position: {x: 450, y: 270, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 20, y: -80, z: 0}
m_EntryPosition: {x: 610, y: 210, z: 0}
m_EntryPosition: {x: 670, y: 220, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 360, y: -150, z: 0}
m_ParentStateMachinePosition: {x: 110, y: -200, z: 0}
m_DefaultState: {fileID: -3303347849624952746}
--- !u!206 &4305200882559291722
BlendTree:
@@ -750,21 +943,46 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Grounded
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5807180696605908168}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_TransitionDuration: 0.34
m_TransitionOffset: 0.06
m_ExitTime: 0
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5907325166013281409
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: -3231053178844433393}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.99
m_TransitionOffset: 0.57
m_ExitTime: 0.81707317
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 1
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1101 &5964194081600354834
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -799,6 +1017,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -4127415286275366694}
- {fileID: 2734374599067492937}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -814,6 +1033,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &6922667274086674103
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: Jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3404979395967366747}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.04172797
m_TransitionOffset: 0
m_ExitTime: 0.08297222
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!206 &7068036982611019673
BlendTree:
m_ObjectHideFlags: 1
@@ -864,7 +1108,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3578693359707166933}
- {fileID: 8811136920541626623}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -903,6 +1147,28 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.64705884
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8811136920541626623
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: 6805044894854728404}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.87288135
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0