From ca54b5b9600799cdc7fc331221c5918e0c5d4d37 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 16 Jan 2026 17:40:32 -0500 Subject: [PATCH] feat: make weapons switchable --- Assets/Items/Weapons/TestShuikenGraph.asset | 13 +++-- Assets/Items/Weapons/TestSwordGraph.asset | 10 ++-- .../Attacks/TestMelee/TestMeleeAttack.asset | 6 +- .../PlayerTestAnimator.controller | 58 ++++++++++++++++++- Assets/Player/Objects/Player.prefab | 12 +++- Assets/Scripts/Items/Weapons/ShurikenActor.cs | 3 +- Assets/Scripts/Units/PlayerCombat.cs | 40 +++++++++---- 7 files changed, 110 insertions(+), 32 deletions(-) diff --git a/Assets/Items/Weapons/TestShuikenGraph.asset b/Assets/Items/Weapons/TestShuikenGraph.asset index 75917b2..6680a49 100644 --- a/Assets/Items/Weapons/TestShuikenGraph.asset +++ b/Assets/Items/Weapons/TestShuikenGraph.asset @@ -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} diff --git a/Assets/Items/Weapons/TestSwordGraph.asset b/Assets/Items/Weapons/TestSwordGraph.asset index 8561185..926c93c 100644 --- a/Assets/Items/Weapons/TestSwordGraph.asset +++ b/Assets/Items/Weapons/TestSwordGraph.asset @@ -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} diff --git a/Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset b/Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset index a4c13b7..88d0f47 100644 --- a/Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset +++ b/Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset @@ -13,9 +13,9 @@ MonoBehaviour: m_Name: TestMeleeAttack m_EditorClassIdentifier: NodeCanvas::NodeCanvas.BehaviourTrees.BehaviourTree _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":-215.9104,"y":-492.4742},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_action":{"actions":[{"facingDirection":{"label":"Facing - Direction","value":{"_value":{"$content":3,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation + Direction","value":{"_value":{"$content":0,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation Speed","changeValue":{"_value":1},"value":{"_value":0.5},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"moveSpeed":{"label":"Move - Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"parameter":{"_value":"Attack"},"parameterHashID":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"saveAs":{"_name":"_self"},"$type":"NodeCanvas.Tasks.Actions.GetSelf"},{"damage":{"_value":10.0},"source":{"_name":"_self"},"outputDamageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.CreateDamageSource"},{"method":{"_baseInfo":"Reset.Units.PlayerInventory|OnDrawWeapon|System.Void","_paramsInfo":""},"parameters":[],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-742.4763,"y":-264.9589},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_condition":{"eventName":{"_value":"Call + Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"parameter":{"_value":"Attack"},"parameterHashID":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"saveAs":{"_name":"_self"},"$type":"NodeCanvas.Tasks.Actions.GetSelf"},{"damage":{"_value":10.0},"source":{"_name":"_self"},"outputDamageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.CreateDamageSource"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-742.4763,"y":-264.9589},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_condition":{"eventName":{"_value":"Call Attack"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_position":{"x":-276.0,"y":-230.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"2"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-288.0766,"y":-110.9978},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"3"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-282.1451,"y":1.985321},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"4"},{"_condition":{"eventName":{"_value":"Call Attack"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_position":{"x":28.0,"y":-230.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"5"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":15.9234,"y":-110.9978},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"6"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":21.85489,"y":1.985321},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"7"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":-740.0711,"y":35.02289},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"8"},{"_action":{"actions":[{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"targetElement":{"_name":"_hitCurrentElement"},"$type":"NodeCanvas.Tasks.Actions.AddElementToList`1[[UnityEngine.Collider, UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-812.0646,"y":149.0206},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"9"},{"_position":{"x":-1697.86,"y":1169.414},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"10"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-1774.285,"y":1622.241},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"11"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1768.353,"y":1735.225},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"12"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1553.285,"y":1576.241},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"13"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-1326.285,"y":1618.241},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"14"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1320.353,"y":1731.225},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"15"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-1104.285,"y":1567.241},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"16"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{"_value":{"value":128}},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-881.2848,"y":1609.241},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"17"},{"_action":{"actions":[{"targets":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"damageSource":{"_name":"attackDamageSource","_targetVariableID":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08"},"$type":"Reset.Core.DealDamage"},{"unitsToDrag":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"dragTime":{"_name":"dragTime","_targetVariableID":"3955e75d-5905-4d99-ae5b-4feb671ac8bb"},"$type":"Reset.Units.DragUnits"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-875.3533,"y":1723.225},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"18"},{"_action":{"actions":[{"parameter":{"_value":"Melee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-667.2848,"y":1567.241},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"19"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"layerMask":{},"width":{},"size":{"_value":{"x":2.5,"y":2.5,"z":2.5}},"rotation":{},"drawGizmos":true,"drawGizmosOnlyWhenActive":true,"outputHit":{"_name":"_hit"},"outputHitArray":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"Reset.CheckGenericObserver"},"_position":{"x":-916.1649,"y":2047.202},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"20"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":-880.1649,"y":2167.202},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"21"},{"_action":{"actions":[{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"targetElement":{"_name":"_hitCurrentElement"},"$type":"NodeCanvas.Tasks.Actions.AddElementToList`1[[UnityEngine.Collider, @@ -33,7 +33,7 @@ MonoBehaviour: _version: 3.31 _category: _comments: - _translation: {x: 704, y: 720} + _translation: {x: 1028, y: 545} _zoomFactor: 1 _haltSerialization: 0 _externalSerializationFile: {fileID: 0} diff --git a/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller b/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller index aeac33b..295eef0 100644 --- a/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller +++ b/Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller @@ -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 diff --git a/Assets/Player/Objects/Player.prefab b/Assets/Player/Objects/Player.prefab index 8fe9ef8..a0ce962 100644 --- a/Assets/Player/Objects/Player.prefab +++ b/Assets/Player/Objects/Player.prefab @@ -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} diff --git a/Assets/Scripts/Items/Weapons/ShurikenActor.cs b/Assets/Scripts/Items/Weapons/ShurikenActor.cs index fbffc8e..686bc6a 100644 --- a/Assets/Scripts/Items/Weapons/ShurikenActor.cs +++ b/Assets/Scripts/Items/Weapons/ShurikenActor.cs @@ -1,5 +1,4 @@ - -using System; +using System; using System.Collections.Generic; using System.Numerics; using Unity.Collections.LowLevel.Unsafe; diff --git a/Assets/Scripts/Units/PlayerCombat.cs b/Assets/Scripts/Units/PlayerCombat.cs index 9fd0798..6c71604 100644 --- a/Assets/Scripts/Units/PlayerCombat.cs +++ b/Assets/Scripts/Units/PlayerCombat.cs @@ -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(); }