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

38
Assets/Player/Models/MaruTestModel/Animations/Attacks/AttackCombo1.asset
View File

@@ -12,21 +12,39 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
m_Name: AttackCombo1
m_EditorClassIdentifier: NodeCanvas::NodeCanvas.BehaviourTrees.BehaviourTree
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"policy":1,"_position":{"x":358.7176,"y":177.9743},"$type":"NodeCanvas.BehaviourTrees.Parallel","$id":"0"},{"repeaterMode":2,"repeatTimes":{"_value":1},"_position":{"x":208.7047,"y":317.9743},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"1"},{"_action":{"actions":[{"method":{"_baseInfo":"Reset.Units.UnitMovementHandler|SmoothToSpeed|System.Void","_paramsInfo":"System.Single|System.Single"},"parameters":[{"_type":"System.Single","_value":{"$content":10.0,"$type":"System.Single"}},{"_type":"System.Single","_value":{"$content":0.1,"$type":"System.Single"}}],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"},{"method":{"_baseInfo":"Reset.Units.UnitMovementHandler|SetNewDirection|System.Void","_paramsInfo":"UnityEngine.Vector3"},"parameters":[{"_type":"UnityEngine.Vector3","_value":{"z":0.1,"$type":"UnityEngine.Vector3"}}],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"},{"moveSpeed":{"label":"Move
Speed","value":{}},"moveSpeedSoothing":{"label":"Move Speed Smoothing","value":{}},"airDirectionDecay":{"label":"Air
Direction Decay","value":{}},"accelerationSmoothing":{"label":"Acceleration Smoothing","value":{}},"deaccelerationSmoothing":{"label":"Deacceleration
Smoothing","value":{}},"addDirectionFromInput":{"x":5.0,"y":4.0},"addInputStrength":0.69,"jumpPower":{"label":"Jump
Power","value":{}},"jumpPowerDecay":{"label":"Jump Decay Speed","value":{}},"gravityPower":{"label":"Gravity
Power","value":{}},"gravityMax":{"label":"Gravity Max","value":{}},"gravityAcceleration":{"label":"Gravity
Acceleration Speed","value":{}},"gravityScale":{"label":"Gravity Scale","value":{}},"settingsChangeSmoothing":{"label":"Settings
Change Smoothing","value":{}},"rotationSpeed":{"label":"Rotation Speed","value":{}},"rotationSmoothing":{"label":"Rotation
Smoothing","value":{}},"rotationInputBlending":{"label":"Rotation Input Blending","value":{}},"feedNewRotation":{},"feedRelativeTo":{},"$type":"Reset.Core.ChangeMovementSettings"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":83.7561,"y":445.308},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"2"},{"_position":{"x":506.0,"y":339.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"3"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"myAnimator","_targetVariableID":"2b9f09c0-47f9-42d4-8832-3ba15765ced5"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.35},"$type":"NodeCanvas.Tasks.Actions.Wait"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":477.0,"y":445.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"4"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"myAnimator","_targetVariableID":"2b9f09c0-47f9-42d4-8832-3ba15765ced5"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.Wait"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":675.0,"y":445.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"myAnimator","_targetVariableID":"2b9f09c0-47f9-42d4-8832-3ba15765ced5"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.5},"$type":"NodeCanvas.Tasks.Actions.Wait"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":874.0,"y":444.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"policy":1,"_position":{"x":358.7176,"y":177.9743},"$type":"NodeCanvas.BehaviourTrees.Parallel","$id":"0"},{"repeaterMode":2,"repeatTimes":{"_value":1},"_position":{"x":208.7047,"y":317.9743},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"1"},{"_action":{"actions":[{"method":{"_baseInfo":"Reset.Units.UnitMovementHandler|SmoothToSpeed|System.Void","_paramsInfo":"System.Single|System.Single"},"parameters":[{"_type":"System.Single","_value":{"$content":10.0,"$type":"System.Single"}},{"_type":"System.Single","_value":{"$content":0.1,"$type":"System.Single"}}],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"},{"method":{"_baseInfo":"Reset.Units.UnitMovementHandler|SetNewDirection|System.Void","_paramsInfo":"UnityEngine.Vector3"},"parameters":[{"_type":"UnityEngine.Vector3","_value":{"z":0.1,"$type":"UnityEngine.Vector3"}}],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"},{"_missingType":"Reset.Core.ChangeMovementSettings","_recoveryState":"{\r\n
\"moveSpeed\": {\r\n \"label\": \"Move Speed\",\r\n \"value\":
{\r\n\r\n }\r\n },\r\n \"moveSpeedSoothing\": {\r\n \"label\":
\"Move Speed Smoothing\",\r\n \"value\": {\r\n\r\n }\r\n },\r\n
\"airDirectionDecay\": {\r\n \"label\": \"Air Direction Decay\",\r\n
\"value\": {\r\n\r\n }\r\n },\r\n \"accelerationSmoothing\": {\r\n
\"label\": \"Acceleration Smoothing\",\r\n \"value\": {\r\n\r\n
}\r\n },\r\n \"deaccelerationSmoothing\": {\r\n \"label\": \"Deacceleration
Smoothing\",\r\n \"value\": {\r\n\r\n }\r\n },\r\n \"addDirectionFromInput\":
{\r\n \"x\": 5.0,\r\n \"y\": 4.0\r\n },\r\n \"addInputStrength\":
0.69,\r\n \"jumpPower\": {\r\n \"label\": \"Jump Power\",\r\n
\"value\": {\r\n\r\n }\r\n },\r\n \"jumpPowerDecay\": {\r\n
\"label\": \"Jump Decay Speed\",\r\n \"value\": {\r\n\r\n }\r\n
},\r\n \"gravityPower\": {\r\n \"label\": \"Gravity Power\",\r\n
\"value\": {\r\n\r\n }\r\n },\r\n \"gravityMax\": {\r\n \"label\":
\"Gravity Max\",\r\n \"value\": {\r\n\r\n }\r\n },\r\n \"gravityAcceleration\":
{\r\n \"label\": \"Gravity Acceleration Speed\",\r\n \"value\":
{\r\n\r\n }\r\n },\r\n \"gravityScale\": {\r\n \"label\":
\"Gravity Scale\",\r\n \"value\": {\r\n\r\n }\r\n },\r\n
\"settingsChangeSmoothing\": {\r\n \"label\": \"Settings Change Smoothing\",\r\n
\"value\": {\r\n\r\n }\r\n },\r\n \"rotationSpeed\": {\r\n
\"label\": \"Rotation Speed\",\r\n \"value\": {\r\n\r\n }\r\n
},\r\n \"rotationSmoothing\": {\r\n \"label\": \"Rotation Smoothing\",\r\n
\"value\": {\r\n\r\n }\r\n },\r\n \"rotationInputBlending\": {\r\n
\"label\": \"Rotation Input Blending\",\r\n \"value\": {\r\n\r\n
}\r\n },\r\n \"feedNewRotation\": {\r\n\r\n },\r\n \"feedRelativeTo\":
{\r\n\r\n },\r\n \"$type\": \"Reset.Core.ChangeMovementSettings\"\r\n}","$type":"NodeCanvas.Framework.Internal.MissingAction"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":83.7561,"y":445.308},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"2"},{"_position":{"x":506.0,"y":339.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"3"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"myAnimator","_targetVariableID":"2b9f09c0-47f9-42d4-8832-3ba15765ced5"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.35},"$type":"NodeCanvas.Tasks.Actions.Wait"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":477.0,"y":445.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"4"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"myAnimator","_targetVariableID":"2b9f09c0-47f9-42d4-8832-3ba15765ced5"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.Wait"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":675.0,"y":445.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"myAnimator","_targetVariableID":"2b9f09c0-47f9-42d4-8832-3ba15765ced5"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.5},"$type":"NodeCanvas.Tasks.Actions.Wait"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":874.0,"y":444.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
_objectReferences: []
_graphSource:
_version: 3.31
_category:
_comments:
_translation: {x: 483, y: 63}
_translation: {x: 253, y: 122}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

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