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

added: go hard state and a melee combo for it

Browse Source
This commit is contained in:
Chris
2025-10-04 15:40:13 -04:00
parent 19f8662bad
commit 1240afb051
16 changed files with 441 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Assets/Player/Models/MaruTestModel/MaruTestController.controller
View File

@@ -7,7 +7,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: GoHardMelee
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4992776422871333339}
m_Solo: 0
@@ -17,7 +20,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.030371755
m_TransitionOffset: 0.0035423615
m_ExitTime: 0.28948936
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -311,7 +314,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: GoHardStart
m_ConditionEvent: GoHardActivate
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7016200926053457853}
@@ -374,9 +377,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.07566202
m_TransitionOffset: 0.025827888
m_ExitTime: 0.66569173
m_TransitionDuration: 0.059500255
m_TransitionOffset: 0.0666673
m_ExitTime: 4.2082973e-10
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -501,7 +504,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: GoHardMelee
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1099361323905305773}
m_Solo: 0
@@ -511,7 +517,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.12456438
m_TransitionOffset: 0.009477334
m_ExitTime: 0.24454185
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -629,7 +635,7 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: GoHardStart
- m_Name: GoHardActivate
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
@@ -680,7 +686,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: GoHardMelee
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2290474202546603612}
m_Solo: 0
@@ -690,7 +699,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.05516836
m_TransitionOffset: 0.010627146
m_ExitTime: 0.27531987
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -730,10 +739,10 @@ AnimatorStateMachine:
m_Position: {x: 1020, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: -2290474202546603612}
m_Position: {x: 1460, y: 30, z: 0}
m_Position: {x: 1450, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -1099361323905305773}
m_Position: {x: 1680, y: 30, z: 0}
m_Position: {x: 1710, y: 220, z: 0}
- serializedVersion: 1
m_State: {fileID: -6675179652033795009}
m_Position: {x: 790, y: 30, z: 0}
@@ -859,7 +868,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: GoHardMelee
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -954895225657406694}
m_Solo: 0
@@ -869,7 +881,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.08350754
m_TransitionOffset: 0.12398361
m_ExitTime: 0.23635373
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -936,7 +948,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: GoHardMelee
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6675179652033795009}
m_Solo: 0
@@ -946,7 +961,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.048083633
m_TransitionOffset: 0
m_ExitTime: 0.1867602
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1