diff --git a/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackAnimation.anim b/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackAnimation.anim index c1116b1..7cb52c3 100644 --- a/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackAnimation.anim +++ b/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackAnimation.anim @@ -56,52 +56,52 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.76666665 - value: {x: 0.091759175, y: 0, z: 3} - inSlope: {x: -1.9670365, y: 0, z: 3.9130435} - outSlope: {x: -1.9670365, y: 0, z: 3.9130435} + value: {x: 0.13863416, y: 0, z: 3} + inSlope: {x: -0.95453656, y: 0, z: 3.9130435} + outSlope: {x: -0.95453656, y: 0, z: 3.9130435} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.81666666 - value: {x: -0.022328977, y: 0, z: 3.5} - inSlope: {x: -2.517807, y: 0, z: 4} - outSlope: {x: -2.517807, y: 0, z: 4} + value: {x: 0.08327103, y: 0, z: 3.5} + inSlope: {x: -1.2218069, y: 0, z: 4} + outSlope: {x: -1.2218069, y: 0, z: 4} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.0166667 - value: {x: -0.4, y: 0, z: 4} - inSlope: {x: 0, y: 0, z: 2.3571427} - outSlope: {x: 0, y: 0, z: 2.3571427} + value: {x: -0.099999994, y: 0, z: 4} + inSlope: {x: 0, y: 0, z: 1.9999998} + outSlope: {x: 0, y: 0, z: 1.9999998} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.2833333 - value: {x: 0.4910239, y: 0, z: 4.6} - inSlope: {x: 1.0551586, y: 0, z: 3.3333333} - outSlope: {x: 1.0551586, y: 0, z: 3.3333333} + time: 1.3666667 + value: {x: -0.1, y: 0, z: 4.6} + inSlope: {x: 1.0588237, y: 0, z: 3.9999993} + outSlope: {x: 1.0588237, y: 0, z: 3.9999993} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.3 - value: {x: 0.49999997, y: 0, z: 4.660289} - inSlope: {x: 0, y: 0, z: 3.8886654} - outSlope: {x: 0, y: 0, z: 3.8886654} + time: 1.4666667 + value: {x: 0.2, y: 0, z: 5.9408007} + inSlope: {x: 0, y: 0, z: 19.104004} + outSlope: {x: 0, y: 0, z: 19.104004} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.6166667 - value: {x: 0.49999997, y: 0, z: 6} + value: {x: 0.2, y: 0, z: 8} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -186,7 +186,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.0166667 - value: -0.4 + value: -0.099999994 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -194,8 +194,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3 - value: 0.49999997 + time: 1.3666667 + value: -0.1 + inSlope: 1.0588237 + outSlope: 1.0588237 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.4666667 + value: 0.2 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -283,24 +292,24 @@ AnimationClip: - serializedVersion: 3 time: 1.0166667 value: 4 - inSlope: 2.3571427 - outSlope: 2.3571427 + inSlope: 1.9999998 + outSlope: 1.9999998 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2833333 + time: 1.3666667 value: 4.6 - inSlope: 3.3333333 - outSlope: 3.3333333 + inSlope: 3.9999993 + outSlope: 3.9999993 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.6166667 - value: 6 + value: 8 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackBT.asset b/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackBT.asset index b4ead0a..46ee141 100644 --- a/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackBT.asset +++ b/Assets/Player/Attacks/TestGoHardMelee/TestGoHardAttackBT.asset @@ -16,12 +16,12 @@ MonoBehaviour: Direction","value":{"_value":{"$content":3,"$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":20.0},"_changeEasing":{"_value":1},"_easing":{"_value":10.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"parameter":{"_value":"GoHardAttack"},"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":-793.4763,"y":-268.9589},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_action":{"waitTime":{"_value":0.05},"$type":"NodeCanvas.Tasks.Actions.Wait"},"_position":{"x":-533.0,"y":-276.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"2"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_value":{"value":1}},"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":-396.0,"y":-208.3206},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"3"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":-360.0,"y":-87.0},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"4"},{"_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":-488.0039,"y":37.86944},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.15},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-176.0,"y":-302.0002},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":58.01416,"y":-181.0443},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$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":94.01416,"y":-61.04428},"$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":-43.98584,"y":63.95232},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"9"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.15},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":254.0,"y":-293.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"10"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":490.1199,"y":-162.0396},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"11"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":526.1199,"y":-42.03958},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"12"},{"_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":388.1199,"y":83.96042},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"13"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.23},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":693.0,"y":-308.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"14"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":945.6828,"y":-145.6483},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"15"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":981.6828,"y":-25.64828},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"16"},{"_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":843.6828,"y":100.3517},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"17"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.23},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":1166.563,"y":-276.6087},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"18"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":1424.534,"y":-157.8564},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"19"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":1460.534,"y":-34.88651},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"20"},{"_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":1322.534,"y":91.11349},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"21"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.23},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":1644.414,"y":-285.8469},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"22"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":1875.226,"y":-112.1956},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"23"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":1911.226,"y":7.804413},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"24"},{"_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":1773.226,"y":133.8044},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"25"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":2095.106,"y":-244.2104},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"26"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"18"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"19"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"22"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"23"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"16"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"draggedEnemies":{"_propertyPath":"UnitCombat.draggedUnits","_name":"draggedEnemies","_id":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`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":-488.0039,"y":37.86944},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.15},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":-176.0,"y":-302.0002},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":58.01416,"y":-181.0443},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$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":94.01416,"y":-61.04428},"$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":-43.98584,"y":63.95232},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"9"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.15},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":254.0,"y":-293.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"10"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":490.1199,"y":-162.0396},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"11"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":526.1199,"y":-42.03958},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"12"},{"_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":388.1199,"y":83.96042},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"13"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":693.0,"y":-308.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"14"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":945.6828,"y":-145.6483},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"15"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":981.6828,"y":-25.64828},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"16"},{"_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":843.6828,"y":100.3517},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"17"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":1166.563,"y":-276.6087},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"18"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":1424.534,"y":-157.8564},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"19"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":1460.534,"y":-34.88651},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"20"},{"_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":1322.534,"y":91.11349},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"21"},{"_action":{"actions":[{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"waitTime":{"_value":0.5},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":1644.414,"y":-288.0515},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"22"},{"conditionFailReturn":1,"_condition":{"castType":{"_value":1},"length":{"_value":1.0},"direction":{"_value":{"z":1.0}},"offset":{"_value":{"z":1.0}},"ignoreLayers":{"_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":1875.226,"y":-112.1956},"$type":"NodeCanvas.BehaviourTrees.ConditionalEvaluator","$id":"23"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"current":{"_type":"UnityEngine.Collider","_name":"_hitCurrentElement"},"storeIndex":{"_name":"_index"},"maxIteration":{"_value":-1},"_position":{"x":1911.226,"y":7.804413},"$type":"NodeCanvas.BehaviourTrees.Iterator","$id":"24"},{"_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":1773.226,"y":133.8044},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"25"},{"_action":{"actions":[{"waitTime":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.Wait"},{"targetList":{"_name":"hitTargets","_targetVariableID":"0e35b4ec-628d-4911-9e92-0c05d0b928ec"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"targetList":{"_name":"draggedEnemies","_targetVariableID":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f"},"$type":"NodeCanvas.Tasks.Actions.ClearList"},{"parameter":{"_value":"GoHardMelee"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":2091.568,"y":-244.2105},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"26"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"18"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"19"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"22"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"23"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"16"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"draggedEnemies":{"_propertyPath":"UnitCombat.draggedUnits","_name":"draggedEnemies","_id":"efe1a2b3-c11f-47b5-a1de-99e42e65be5f","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Collider, UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"hitTargets":{"_value":[],"_name":"hitTargets","_id":"0e35b4ec-628d-4911-9e92-0c05d0b928ec","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Collider, UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], @@ -32,7 +32,7 @@ MonoBehaviour: _version: 3.31 _category: _comments: - _translation: {x: 38, y: 729} - _zoomFactor: 0.7500933 + _translation: {x: -435, y: 903} + _zoomFactor: 1 _haltSerialization: 0 _externalSerializationFile: {fileID: 0} diff --git a/Assets/Player/Graphs/PlayerBaseFSM.asset b/Assets/Player/Graphs/PlayerBaseFSM.asset index f7432bb..a7653b6 100644 --- a/Assets/Player/Graphs/PlayerBaseFSM.asset +++ b/Assets/Player/Graphs/PlayerBaseFSM.asset @@ -130,7 +130,7 @@ MonoBehaviour: Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation Speed","changeValue":{"_value":1},"value":{"_value":6.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"moveSpeed":{"label":"Move Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"newDirection":{"_value":{"y":1.0}},"absolute":{},"relativity":{},"setRawAsWell":{},"relativeTo":{},"$type":"Reset.Units.SetNewDirection"},{"newSpeed":{"_value":22.0},"absolute":{},"relativity":{},"$type":"Reset.Units.SetNewSpeed"}]},"_onUpdateList":{"executionMode":1,"actions":[{"newGravity":{"_value":2.0},"absolute":{},"relativity":{"_value":0.86},"deltaTime":{"_value":true},"decayRate":{"_value":0.3},"$type":"Reset.Units.SetNewGravity"}]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":0.4117647,"g":0.945098,"b":0.254902,"a":1.0},"_name":"Run - Jump","_position":{"x":1043.577,"y":32.57642},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"25"},{"_nestedBT":{"_value":1},"executionMode":0,"_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"}],"_position":{"x":60.0,"y":885.998},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"26"},{"_nestedBT":{"_value":2},"executionMode":0,"_position":{"x":162.9912,"y":682.5885},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"27"},{"_nestedBT":{"_value":3},"executionMode":0,"_position":{"x":295.3429,"y":1059.416},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"28"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"foldEnter":true,"foldExit":true,"_color":{"r":0.4117647,"g":0.945098,"b":0.254902,"a":1.0},"_name":"Run + Jump","_position":{"x":1043.577,"y":32.57642},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"25"},{"_nestedBT":{"_value":1},"executionMode":0,"_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"}],"_position":{"x":60.0,"y":885.998},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"26"},{"_nestedBT":{"_value":2},"executionMode":0,"_position":{"x":162.9912,"y":682.5885},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"27"},{"_nestedBT":{"_value":3},"executionMode":0,"_position":{"x":295.3429,"y":1058.412},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"28"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"foldEnter":true,"foldExit":true,"_color":{"r":0.4117647,"g":0.945098,"b":0.254902,"a":1.0},"_name":"Run Jump","_position":{"x":1030.708,"y":167.7085},"$type":"NodeCanvas.StateMachines.SuperActionState"},{"_subTree":{"_value":4},"_variablesMap":[{"_targetSubGraphVariableID":"e1cfd0be-7f55-420d-bdd8-e72531fc61ba","_canWrite":true,"_type":"UnityEngine.Transform","_name":"mainCamera"},{"_targetSubGraphVariableID":"c4e68b75-5129-428c-8177-abb7b38986f5","_canWrite":true,"_type":"Reset.Units.PlayerFacingDirection","_value":{"$content":0,"$type":"Reset.Units.PlayerFacingDirection"}}],"_position":{"x":-513.2321,"y":190.793},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subTree":{"_value":5},"_tag":"","_position":{"x":88.88626,"y":312.6888},"_comment":"","$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"resolvedVector2":{"_name":"resolvedMoveVector2","_targetVariableID":"2aee664e-07ba-4e85-9d6a-a1393398789d"},"resolvedVector3":{"_name":"resolvedMoveVector3","_targetVariableID":"5d907161-2896-4b95-bfd2-0ea9426145d7"},"resolvedGravity":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"resolvedSpeed":{"_name":"resolvedSpeed","_targetVariableID":"a81cae83-1fb4-4a2c-bc68-ebf1781c2037"},"resolvedRotation":{"_name":"resolvedRotation","_targetVariableID":"f2ba350a-0fea-438e-9ad3-ed77db853d34"},"$type":"Reset.Units.GetResolvedMovementData"}]},"_position":{"x":43.41211,"y":188.3668},"$type":"NodeCanvas.StateMachines.OnFSMUpdate"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"_color":{"r":0.4980392,"g":1.0,"b":0.9803922,"a":1.0},"_name":"Airborne Standby","_position":{"x":1509.989,"y":-548.8954},"$type":"NodeCanvas.StateMachines.SuperActionState"},{"_subTree":{"_value":6},"_position":{"x":1126.753,"y":-309.6837},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subFSM":{"_value":7},"_position":{"x":-97.23633,"y":603.6638},"$type":"NodeCanvas.StateMachines.ConcurrentSubFSM"}],"connections":[{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"observerLabel":{"_value":"itemdrop"},"outputHitTo":{},"deactivateOnFinish":false,"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple Launch"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, @@ -163,7 +163,7 @@ MonoBehaviour: _version: 3.31 _category: _comments: - _translation: {x: 411, y: -135} - _zoomFactor: 0.82052666 + _translation: {x: 350, y: -218} + _zoomFactor: 0.9962658 _haltSerialization: 0 _externalSerializationFile: {fileID: 0} diff --git a/Assets/Player/Input/PlayerInputs.inputactions b/Assets/Player/Input/PlayerInputs.inputactions index 8d3d000..5fc1470 100644 --- a/Assets/Player/Input/PlayerInputs.inputactions +++ b/Assets/Player/Input/PlayerInputs.inputactions @@ -399,26 +399,37 @@ "isPartOfComposite": false }, { - "name": "", - "id": "2c9b5cb3-9cf6-483f-862e-c46e06466465", - "path": "", + "name": "One Modifier", + "id": "0cf334c8-5dd8-4b7c-ac01-a97af8348856", + "path": "OneModifier", + "interactions": "", + "processors": "", + "groups": "", + "action": "Go Hard", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "modifier", + "id": "9b2405b5-a4e5-4c9e-b273-b758877bf703", + "path": "/rightShoulder", "interactions": "", "processors": "", "groups": "", "action": "Go Hard", "isComposite": false, - "isPartOfComposite": false + "isPartOfComposite": true }, { - "name": "", - "id": "bf806a4e-8a1d-4e50-9e94-b23b8995509f", - "path": "/rightStickPress", + "name": "binding", + "id": "090e2e08-14ca-4594-a4f5-d1ce1ba505fd", + "path": "/leftShoulder", "interactions": "", "processors": "", - "groups": ";Controller", + "groups": "", "action": "Go Hard", "isComposite": false, - "isPartOfComposite": false + "isPartOfComposite": true } ] } diff --git a/Assets/Player/Models/MaruTestModel/MaruTestController.controller b/Assets/Player/Models/MaruTestModel/MaruTestController.controller index a334eae..dbbfc99 100644 --- a/Assets/Player/Models/MaruTestModel/MaruTestController.controller +++ b/Assets/Player/Models/MaruTestModel/MaruTestController.controller @@ -514,9 +514,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.12456438 - m_TransitionOffset: 0.009477334 - m_ExitTime: 0.24454185 + m_TransitionDuration: 0.053584673 + m_TransitionOffset: 0 + m_ExitTime: 0.101668455 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -697,8 +697,8 @@ AnimatorStateTransition: m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.05516836 - m_TransitionOffset: 0.010627146 - m_ExitTime: 0.27531987 + m_TransitionOffset: 0 + m_ExitTime: 0.19354816 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -739,7 +739,7 @@ AnimatorStateMachine: m_Position: {x: 1020, y: 30, z: 0} - serializedVersion: 1 m_State: {fileID: -2290474202546603612} - m_Position: {x: 1450, y: 120, z: 0} + m_Position: {x: 1460, y: 30, z: 0} - serializedVersion: 1 m_State: {fileID: -1099361323905305773} m_Position: {x: 1710, y: 220, z: 0}