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

@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f945e777233a59f4aba40aeca29093a6, type: 3}
m_Name: TestShuikenGraph
m_EditorClassIdentifier: NodeCanvas::NodeCanvas.StateMachines.FSM
_serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_name":"ENTRY","_position":{"x":499.0,"y":476.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"0"},{"_actionList":{"executionMode":1,"actions":[{"boolVariable":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"setTo":0,"$type":"NodeCanvas.Tasks.Actions.SetBoolean"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":567.4302,"y":581.6329},"$type":"NodeCanvas.StateMachines.ActionState","$id":"1"},{"_name":"ATTACK
_serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_name":"ENTRY","_position":{"x":499.0,"y":476.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"0"},{"_actionList":{"executionMode":1,"actions":[{"boolVariable":{"_name":"_enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"setTo":0,"$type":"NodeCanvas.Tasks.Actions.SetBoolean"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":567.4302,"y":581.6329},"$type":"NodeCanvas.StateMachines.ActionState","$id":"1"},{"_name":"ATTACK
SWITCH","_position":{"x":809.8719,"y":712.0375},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"2"},{"_nestedBT":{"_value":1},"executionMode":0,"_position":{"x":998.8945,"y":361.9592},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"3"},{"_onEnterList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"valueB":{"_value":4},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[System.Int32,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},{"newGravity":{"_value":-0.03},"absolute":{"_value":true},"relativity":{"_value":1.0},"deltaTime":{},"decayRate":{},"$type":"Reset.Units.SetNewGravity"},{"moveSpeed":{"label":"Move
Speed","changeValue":{"_value":2},"value":{},"_changeSmoothing":{"_value":2},"_smoothing":{},"_changeEasing":{"_value":2},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{"_value":2},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{"_value":2},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"fieldOfView":{"label":"FOV","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitTargetOffset":{"label":"Target
@@ -28,22 +28,23 @@ MonoBehaviour:
Changing Softness","changeValue":{"_value":2},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"directionSpinningHardness":{"label":"Direction
Spinning Hardness","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"directionSpinningSpeed":{"label":"Direction
Spinning Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeDirectionSettings"}]},"_onUpdateList":{"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Melee
Grounded","_position":{"x":1295.94,"y":612.8193},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_position":{"x":1521.823,"y":876.7599},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"5"},{"_nestedBT":{"_value":2},"executionMode":0,"successEvent":"","_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"}],"_position":{"x":996.6152,"y":886.4272},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"6"},{"_actionList":{"executionMode":1,"actions":[{"eventName":{"_value":"Exit
Grounded","_position":{"x":1295.94,"y":612.8193},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_position":{"x":1521.823,"y":876.7599},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"5"},{"_nestedBT":{"_value":2},"executionMode":0,"successEvent":"","_variablesMap":[],"_position":{"x":996.9484,"y":886.4272},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"6"},{"_actionList":{"executionMode":1,"actions":[{"eventName":{"_value":"Exit
Combat"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1785.615,"y":517.4272},"$type":"NodeCanvas.StateMachines.ActionState"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"parameter":{"_value":"In
Combat"},"parameterHashID":{},"setTo":{"_value":true},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"},{"valueA":{"_name":"combatType","_targetVariableID":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293"},"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Core.CombatType,
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"trigger":{"_value":"Ranged
Combat"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_position":{"x":485.5682,"y":264.9219},"$type":"NodeCanvas.StateMachines.OnFSMEnter"}],"connections":[{"_condition":{"valueA":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":10.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Holster
Combat"},"$type":"Reset.Core.SendAnimationTrigger"},{"method":{"_baseInfo":"Reset.Units.PlayerCombat|OnDrawWeapon|System.Void","_paramsInfo":""},"parameters":[],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}]},"_position":{"x":485.5682,"y":264.9219},"$type":"NodeCanvas.StateMachines.OnFSMEnter"}],"connections":[{"_condition":{"valueA":{"_name":"enteredFromAttack","_targetVariableID":"9b695340-d8f3-4410-a3d6-29662cbeec36"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":10.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Holster
Weapon"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Ranged
Attack"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}}}'
Attack"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"enteredFromAttack":{"_name":"enteredFromAttack","_id":"9b695340-d8f3-4410-a3d6-29662cbeec36","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}}}'
_objectReferences:
- {fileID: 0}
- {fileID: 11400000, guid: 7c6c0968e94af5b449f1d79e163abb34, type: 2}
- {fileID: 11400000, guid: 37c6c49bd4cf00b47b46dcfe8f9a6a7b, type: 2}
- {fileID: 11400000, guid: 541517c63627087419778c30f1ed2102, type: 2}
_graphSource:
_version: 3.31
_category:
_comments:
_translation: {x: -283, y: -18}
_translation: {x: 225, y: -6}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

View File

@@ -12,6 +12,24 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b7f2c6caae048f64f91b54ae1442694c, type: 3}
m_Name: TestShuriken
m_EditorClassIdentifier: Assembly-CSharp::Reset.Items.Weapon
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: actorScript
Entry: 7
Data: 0|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: Reset.Items.ShurikenActor, Assembly-CSharp
- Name:
Entry: 8
Data:
itemName: Test Sword
permanency: 0
essenceRequiredForPermanency: 0
@@ -20,4 +38,4 @@ MonoBehaviour:
weaponFSM: {fileID: 0}
handPositionOffset: {x: 0.061, y: 0.089, z: 0.01}
handRotationOffset: {x: 36.154, y: 4.561, z: -29.413}
actorScriptName: ShurikenActor
actorScriptName:

View File

@@ -15,7 +15,16 @@ MonoBehaviour:
itemName: Test Sword
permanency: 0
essenceRequiredForPermanency: 0
combatType: 0
weaponModel: {fileID: 919132149155446097, guid: 5e444bf9ff5307044a15887a9378ff9e, type: 3}
weaponFSM: {fileID: 0}
handPositionOffset: {x: 0.061, y: 0.089, z: 0.01}
handRotationOffset: {x: 79.591, y: 17.049, z: 20.326}
handRotationOffset: {x: 58, y: -47, z: -59}
actorScriptName:
actorScript:
rid: -2
references:
version: 2
RefIds:
- rid: -2
type: {class: , ns: , asm: }

View File

@@ -30,8 +30,9 @@ MonoBehaviour:
Spinning Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeDirectionSettings"}]},"_onUpdateList":{"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Combat
Grounded","_position":{"x":465.325,"y":71.39201},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_position":{"x":691.2083,"y":335.3326},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"5"},{"_nestedBT":{"_value":2},"executionMode":0,"successEvent":"","_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"}],"_position":{"x":166.0,"y":345.0},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"6"},{"_actionList":{"executionMode":1,"actions":[{"eventName":{"_value":"Exit
Combat"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":955.0,"y":-24.0},"$type":"NodeCanvas.StateMachines.ActionState"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"parameter":{"_value":"In
Combat"},"parameterHashID":{},"setTo":{"_value":true},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"},{"valueA":{"_name":"combatType","_targetVariableID":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Core.CombatType,
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_position":{"x":-378.047,"y":-258.5053},"$type":"NodeCanvas.StateMachines.OnFSMEnter"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[]},"_position":{"x":878.0,"y":245.0},"$type":"NodeCanvas.StateMachines.OnFSMExit"}],"connections":[{"_condition":{"valueA":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":10.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Holster
Combat"},"parameterHashID":{},"setTo":{"_value":true},"$type":"NodeCanvas.Tasks.Actions.MecanimSetBool"},{"parameter":{"_value":"Melee
Combat"},"parameterHashID":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"valueA":{"_name":"combatType","_targetVariableID":"36ce5aee-f7f6-4d8a-971f-38e4b4a20293"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Core.CombatType,
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_position":{"x":-389.047,"y":-312.5053},"$type":"NodeCanvas.StateMachines.OnFSMEnter"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[]},"_position":{"x":878.0,"y":245.0},"$type":"NodeCanvas.StateMachines.OnFSMExit"}],"connections":[{"_condition":{"valueA":{"_name":"enteredFromAttack","_targetVariableID":"2946480c-7213-4bc1-af44-c4dd1f5bf309"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"inGoHard","_targetVariableID":"dc9f60c8-856e-4970-bf11-25745eff1201"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":10.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Holster
Weapon"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Melee"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"enteredFromAttack":{"_name":"enteredFromAttack","_id":"2946480c-7213-4bc1-af44-c4dd1f5bf309","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}}}'
_objectReferences:
@@ -42,7 +43,7 @@ MonoBehaviour:
_version: 3.31
_category:
_comments:
_translation: {x: 332, y: 433}
_translation: {x: 366, y: 449}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}