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

feat: make weapons switchable

Browse Source
This commit is contained in:
Chris
2026-01-16 17:40:32 -05:00
parent 6c3317014a
commit ca54b5b960
7 changed files with 110 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Items/Weapons/TestShuikenGraph.asset
View File

@@ -13,7 +13,7 @@ MonoBehaviour:
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
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,
SWITCH","_position":{"x":824.8719,"y":741.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
Offset","value":{},"changeX":{},"changeY":{},"changeZ":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitPositionDamping":{"label":"Position
@@ -28,13 +28,14 @@ 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":[],"_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
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"},{"_actionList":{"executionMode":1,"actions":[{"eventName":{"_value":"To
Melee"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1516.0,"y":376.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"6"},{"_nestedBT":{"_value":2},"executionMode":0,"successEvent":"","_variablesMap":[],"_position":{"x":996.9484,"y":885.4272},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"7"},{"_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":1904.615,"y":478.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"},{"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
Combat"},"$type":"Reset.Core.SendAnimationTrigger"},{"method":{"_baseInfo":"Reset.Units.PlayerCombat|DrawWeapon|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":"7"},"$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":{"enteredFromAttack":{"_name":"enteredFromAttack","_id":"9b695340-d8f3-4410-a3d6-29662cbeec36","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
Attack"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Melee"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"enteredFromAttack":{"_name":"enteredFromAttack","_id":"9b695340-d8f3-4410-a3d6-29662cbeec36","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}}}'
_objectReferences:
- {fileID: 0}
@@ -44,7 +45,7 @@ MonoBehaviour:
_version: 3.31
_category:
_comments:
_translation: {x: 225, y: -6}
_translation: {x: -241, y: -73}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

10
Assets/Items/Weapons/TestSwordGraph.asset
View File

@@ -28,12 +28,14 @@ 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":"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
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"},{"_actionList":{"executionMode":1,"actions":[{"eventName":{"_value":"To
Ranged"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":697.0,"y":-190.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"6"},{"_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":343.0},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"7"},{"_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"},{"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,
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"method":{"_baseInfo":"Reset.Units.PlayerCombat|DrawWeapon|System.Void","_paramsInfo":""},"parameters":[],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}]},"_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":"7"},"$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"},{"_condition":{"actionName":{"_value":"Ranged
Attack"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"7"},"_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:
- {fileID: 0}
@@ -43,7 +45,7 @@ MonoBehaviour:
_version: 3.31
_category:
_comments:
_translation: {x: 366, y: 449}
_translation: {x: 997, y: 470}
_zoomFactor: 1
_haltSerialization: 0
_externalSerializationFile: {fileID: 0}

6
Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset
View File

File diff suppressed because one or more lines are too long

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

@@ -100,7 +100,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -5807180696605908168}
m_Position: {x: 280, y: 240, z: 0}
m_Position: {x: 110, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: -5118064861454726822}
m_Position: {x: 380, y: 110, z: 0}
@@ -126,10 +126,35 @@ AnimatorStateMachine:
second: []
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 790, y: 240, z: 0}
m_EntryPosition: {x: 30, y: 250, z: 0}
m_EntryPosition: {x: -140, y: 250, z: 0}
m_ExitPosition: {x: 1000, y: 380, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -5807180696605908168}
--- !u!1101 &-7643812424950176358
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: Ranged Combat
m_EventTreshold: 0
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.7457627
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-7517949062573905506
AnimatorState:
serializedVersion: 6
@@ -301,6 +326,7 @@ AnimatorState:
m_Transitions:
- {fileID: -3039493824836840586}
- {fileID: -2657416407466679892}
- {fileID: -7643812424950176358}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -368,6 +394,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4083647245948460410
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: Melee Combat
m_EventTreshold: 0
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.7457627
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3672400458932457120
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -544,7 +595,7 @@ AnimatorStateTransition:
m_DstStateMachine: {fileID: -1683434005185618408}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
@@ -1018,6 +1069,7 @@ AnimatorState:
m_Transitions:
- {fileID: -4127415286275366694}
- {fileID: 2734374599067492937}
- {fileID: -4083647245948460410}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0

12
Assets/Player/Objects/Player.prefab
View File

@@ -399,6 +399,7 @@ MonoBehaviour:
- label: left-wallstick
castType: 4
active: 0
castOrigin: 0
length: 1.23
direction: {x: -1.18, y: 0, z: 0.95}
offset: {x: 0.57, y: 1.28, z: -0.38}
@@ -426,6 +427,7 @@ MonoBehaviour:
- label: right-wallstick
castType: 4
active: 0
castOrigin: 0
length: 1.23
direction: {x: 1.18, y: 0, z: 0.95}
offset: {x: -0.57, y: 1.28, z: -0.38}
@@ -453,6 +455,7 @@ MonoBehaviour:
- label: left-walljump
castType: 4
active: 0
castOrigin: 0
length: 1.66
direction: {x: -1, y: 0, z: 0}
offset: {x: 0, y: 0.5, z: 0}
@@ -480,6 +483,7 @@ MonoBehaviour:
- label: right-walljump
castType: 4
active: 0
castOrigin: 0
length: 1.66
direction: {x: 1, y: 0, z: 0}
offset: {x: 0, y: 0.5, z: 0}
@@ -507,6 +511,7 @@ MonoBehaviour:
- label: grapple
castType: 4
active: 0
castOrigin: 0
length: 10
direction: {x: 0, y: 0, z: 0}
offset: {x: 0, y: 0, z: 0}
@@ -534,6 +539,7 @@ MonoBehaviour:
- label: wallclimb
castType: 3
active: 0
castOrigin: 0
length: 1
direction: {x: 0, y: 0, z: 1}
offset: {x: 0, y: 1, z: 0}
@@ -561,6 +567,7 @@ MonoBehaviour:
- label: itemdrop
castType: 3
active: 1
castOrigin: 0
length: 2.25
direction: {x: 0, y: 0, z: 1}
offset: {x: 0, y: 0.8, z: 0}
@@ -588,6 +595,7 @@ MonoBehaviour:
- label: player
castType: 4
active: 1
castOrigin: 0
length: 2
direction: {x: 0, y: 0, z: 1}
offset: {x: 0, y: 0.75, z: -0.5}
@@ -868,8 +876,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Core::Reset.Units.Inventory
ShowTopMostFoldoutHeaderGroup: 1
rangedWeapon: {fileID: 0}
meleeWeapon: {fileID: 11400000, guid: f04acfb543d2d634781b55c9081fcffa, type: 2}
rangedWeapon: {fileID: 11400000, guid: f04acfb543d2d634781b55c9081fcffa, type: 2}
meleeWeapon: {fileID: 11400000, guid: 18020bf6266740d4dab9dbcae8073424, type: 2}
spellAbility1: {fileID: 0}
spellAbility2: {fileID: 0}
toolAbility1: {fileID: 0}

3
Assets/Scripts/Items/Weapons/ShurikenActor.cs
View File

@@ -1,5 +1,4 @@

using System;
using System;
using System.Collections.Generic;
using System.Numerics;
using Unity.Collections.LowLevel.Unsafe;

40
Assets/Scripts/Units/PlayerCombat.cs
View File

@@ -11,7 +11,7 @@ namespace Reset.Units{
private IEquipable currentWeapon;
private GameObject currentWeaponItem;
public void OnDrawWeapon(){
public void DrawWeapon(){
if (Unit.UnitIsNetworked()) {
CreatePlayerWeaponRpc();
} else {
@@ -28,20 +28,36 @@ namespace Reset.Units{
// Remove a current weapon
DisposeCurrentWeapon();
// Reference inventory and inventory
PlayerInventory playerInventory = Unit.Inventory as PlayerInventory;
PlayerAnimation playerAnimation = Unit.Animation as PlayerAnimation;
// Remove a current weapon
if (currentWeapon != null) {
Destroy(currentWeaponItem);
currentWeaponItem = null;
}
// Switch which weapopn gets pulled out
Weapon weaponType = null;
switch ((Unit.Combat as PlayerCombat).currentCombatType) {
case CombatType.Melee:
weaponType = ((PlayerInventory)Unit.Inventory).meleeWeapon;
break;
case CombatType.Ranged:
weaponType = ((PlayerInventory)Unit.Inventory).rangedWeapon;
break;
default:
throw new ArgumentOutOfRangeException();
}
// Add weapon to status and hand
currentWeapon = playerInventory.meleeWeapon;
currentWeaponItem = playerInventory.meleeWeapon.InstantiateItemObject();
currentWeapon = weaponType;
currentWeaponItem = weaponType.InstantiateItemObject();
// Move item to hand
currentWeaponItem.transform.SetParent(playerAnimation.rightHand);
currentWeaponItem.transform.localPosition = playerInventory.meleeWeapon.handPositionOffset;
currentWeaponItem.transform.rotation = playerAnimation.rightHand.rotation * Quaternion.Euler(playerInventory.meleeWeapon.handRotationOffset);
// Add related weapon's actor script
currentWeaponItem.transform.SetParent((Unit.Animation as PlayerAnimation).rightHand);
currentWeaponItem.transform.localPosition = weaponType.handPositionOffset;
currentWeaponItem.transform.rotation = (Unit.Animation as PlayerAnimation).rightHand.rotation * Quaternion.Euler(weaponType.handRotationOffset);
// Add the weapon script for this weapon
(currentWeapon as Weapon).AddActorScript();
}
@@ -49,7 +65,7 @@ namespace Reset.Units{
return currentWeaponItem;
}
public void OnHolsterWeapon(){
public void HolsterWeapon(){
DisposeCurrentWeapon();
}