feat: added the early parts of a basic attack system for enemies

2025-11-23 14:10:43 -05:00
parent 8b9d2c21ce
commit ed4298b1da
9 changed files with 201 additions and 26 deletions
--- a/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset
+++ b/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset
@@ -16,14 +16,15 @@ MonoBehaviour:
    Stand-by","_position":{"x":83.0,"y":289.0},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"1"},{"_onEnterList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move
    Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"newSpeed":{},"absolute":{},"relativity":{},"$type":"Reset.Units.SetNewSpeed"},{"log":{"_value":"!?"},"secondsToRun":3.0,"verboseMode":2,"$type":"NodeCanvas.Tasks.Actions.DebugLogText"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Detect","_position":{"x":486.012,"y":-16.01074},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"2"},{"_actionList":{"executionMode":1,"actions":[{"log":{"_value":"Entering
    Combat!"},"$type":"NodeCanvas.Tasks.Actions.DebugLogText"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Enter
-    Combat","_position":{"x":756.0,"y":-110.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"3"},{"_nestedFSM":{"_value":1},"_name":"In
-    Combat","_position":{"x":966.3979,"y":378.1194},"$type":"NodeCanvas.StateMachines.NestedFSMState","$id":"4"},{"_actionList":{"executionMode":1,"actions":[{"$type":"Reset.Units.SetWanderingPath"},{"minValue":{"_value":2.0},"maxValue":{"_value":7.0},"floatVariable":{"_name":"_newSpeed"},"$type":"NodeCanvas.Tasks.Actions.SetFloatRandom"},{"moveSpeed":{"label":"Move
+    Combat","_position":{"x":756.0,"y":-110.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"3"},{"_nestedFSM":{"_value":1},"_variablesMap":[{"_targetSubGraphVariableID":"7222df40-dd9e-41ce-a85a-a5221009180e","_canWrite":true,"_type":"UnityEngine.Animator","_name":"testModelAnimator","_targetVariableID":"2a36b4ca-c66b-4748-9a01-d054a460e3d3"},{"_targetSubGraphVariableID":"00b78a8a-fb9e-44d0-b9a8-81c6992abd41","_canWrite":true,"_type":"UnityEngine.Animator","_name":"bodyAnimator","_targetVariableID":"596577fd-def2-446f-855c-d366b7f6cc67"}],"_name":"In
+    Combat","_position":{"x":970.3454,"y":363.9611},"$type":"NodeCanvas.StateMachines.NestedFSMState","$id":"4"},{"_actionList":{"executionMode":1,"actions":[{"$type":"Reset.Units.SetWanderingPath"},{"minValue":{"_value":2.0},"maxValue":{"_value":7.0},"floatVariable":{"_name":"_newSpeed"},"$type":"NodeCanvas.Tasks.Actions.SetFloatRandom"},{"moveSpeed":{"label":"Move
    Speed","changeValue":{"_value":1},"value":{"_name":"_newSpeed"},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"newSpeed":{"_name":"_newSpeed"},"absolute":{},"relativity":{},"$type":"Reset.Units.SetNewSpeed"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Get
    New Wandering Path","_position":{"x":-134.0,"y":112.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"5"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"New
    Target Detected"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_name":"_wanderTimer"},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Drop
    Target"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Enter
    Combat"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Drop
-    Target"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}}}'
+    Target"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"testModelAnimator":{"_propertyPath":"Reset.Units.Enemy.testModelAnimator","_name":"testModelAnimator","_id":"2a36b4ca-c66b-4748-9a01-d054a460e3d3","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+    UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}}'
  _objectReferences:
  - {fileID: 0}
  - {fileID: 11400000, guid: 66d780be76d914c40afd1b3f00df719f, type: 2}
@@ -31,7 +32,7 @@ MonoBehaviour:
    _version: 3.31
    _category: 
    _comments: 
-    _translation: {x: 178, y: 300}
+    _translation: {x: 206, y: 338}
    _zoomFactor: 1
  _haltSerialization: 0
  _externalSerializationFile: {fileID: 0}
--- a/Assets/Enemies/TestEnemy/Attacks/TestEnemySimpleSwipe.asset
+++ b/Assets/Enemies/TestEnemy/Attacks/TestEnemySimpleSwipe.asset
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
+  m_Name: TestEnemySimpleSwipe
+  m_EditorClassIdentifier: NodeCanvas::NodeCanvas.BehaviourTrees.BehaviourTree
+  _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":670.0,"y":446.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_action":{"actions":[{"parameter":{"_value":"Attack"},"parameterHashID":{},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"parameter":{"_value":"Attack"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"5c66985d-3dce-49ff-a5eb-fb807771b577"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}],"$type":"NodeCanvas.Framework.ActionList"},"_position":{"x":438.0,"y":633.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"bodyAnimator":{"_name":"bodyAnimator","_id":"c96d2e2b-e09d-4abc-a287-3e6821b42c4b","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+    UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
+  _objectReferences: []
+  _graphSource:
+    _version: 3.31
+    _category: 
+    _comments: 
+    _translation: {x: 215, y: -275}
+    _zoomFactor: 1
+  _haltSerialization: 0
+  _externalSerializationFile: {fileID: 0}
--- a/Assets/Enemies/TestEnemy/Attacks/TestEnemySimpleSwipe.asset.meta
+++ b/Assets/Enemies/TestEnemy/Attacks/TestEnemySimpleSwipe.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ef911f8ce63263d4cafc6ca3a8b30a1f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Enemies/TestEnemy/Graphs/TestEnemyCombatFSM.asset
+++ b/Assets/Enemies/TestEnemy/Graphs/TestEnemyCombatFSM.asset
@@ -12,13 +12,17 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: f945e777233a59f4aba40aeca29093a6, type: 3}
  m_Name: TestEnemyCombatFSM
  m_EditorClassIdentifier: NodeCanvas::NodeCanvas.StateMachines.FSM
-  _serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[],"connections":[],"canvasGroups":[],"localBlackboard":{"_variables":{}}}'
-  _objectReferences: []
+  _serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_position":{"x":859.0,"y":328.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"0"},{"_nestedBT":{"_value":1},"executionMode":0,"_variablesMap":[{"_targetSubGraphVariableID":"c96d2e2b-e09d-4abc-a287-3e6821b42c4b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"bodyAnimator","_targetVariableID":"00b78a8a-fb9e-44d0-b9a8-81c6992abd41"}],"_position":{"x":1346.0,"y":467.0},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"1"},{"_actionList":{"executionMode":1,"actions":[{"minValue":{"_value":3.0},"maxValue":{"_value":5.0},"floatVariable":{"_name":"_randomWait"},"$type":"NodeCanvas.Tasks.Actions.SetFloatRandom"},{"waitTime":{"_name":"_randomWait"},"$type":"NodeCanvas.Tasks.Actions.Wait"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":487.0,"y":399.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"2"},{"_actionList":{"executionMode":1,"actions":[]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1110.0,"y":487.0},"$type":"NodeCanvas.StateMachines.ActionState"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"testModelAnimator":{"_name":"testModelAnimator","_id":"7222df40-dd9e-41ce-a85a-a5221009180e","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+    UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"bodyAnimator":{"_name":"bodyAnimator","_id":"00b78a8a-fb9e-44d0-b9a8-81c6992abd41","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+    UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}}'
+  _objectReferences:
+  - {fileID: 0}
+  - {fileID: 11400000, guid: ef911f8ce63263d4cafc6ca3a8b30a1f, type: 2}
  _graphSource:
    _version: 3.31
    _category: 
    _comments: 
-    _translation: {x: 0, y: 0}
+    _translation: {x: -320, y: 28}
    _zoomFactor: 1
  _haltSerialization: 0
  _externalSerializationFile: {fileID: 0}
--- a/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterModelAnimController.controller
+++ b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterModelAnimController.controller
@@ -675,7 +675,7 @@ AnimatorState:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Attack2-130
-  m_Speed: 1.5
+  m_Speed: 1.2
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: -2879270276895609086}
@@ -733,7 +733,7 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0
  m_TransitionOffset: 0
  m_ExitTime: 0.5909091
  m_HasExitTime: 0
--- a/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterObjectAnimController
+++ b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterObjectAnimController
@@ -1,5 +1,27 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8701926306649203889
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -7846314796881791032}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8739496
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-7846314796881791032
 AnimatorState:
  serializedVersion: 6
@@ -10,7 +32,8 @@ AnimatorState:
  m_Name: New State
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -1439225884702868440}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -37,7 +60,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 6611013841474026752}
-    m_Position: {x: 520, y: 120, z: 0}
+    m_Position: {x: 340, y: 190, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -7846314796881791032}
    m_Position: {x: 280, y: 40, z: 0}
@@ -51,6 +74,31 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -7846314796881791032}
+--- !u!1101 &-1439225884702868440
+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: Attack
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 6611013841474026752}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 4
+  m_OrderedInterruption: 0
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@@ -59,7 +107,13 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: TestMonsterObjectAnimController 1
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Attack
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -83,7 +137,8 @@ AnimatorState:
  m_Name: Attack2
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -8701926306649203889}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
--- a/Assets/Enemies/TestEnemy/Objects/TestMonster.prefab
+++ b/Assets/Enemies/TestEnemy/Objects/TestMonster.prefab
@@ -151,7 +151,7 @@ MonoBehaviour:
        byte0060: 0
        byte0061: 0
  relatedSpawner: {fileID: 0}
-  testModelAnimator: {fileID: 0}
+  testModelAnimator: {fileID: 8332864352631384059}
 --- !u!114 &5956987736849929195
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -334,7 +334,7 @@ MonoBehaviour:
  _preInitializeSubGraphs: 0
  _updateMode: 0
  _graph: {fileID: 11400000, guid: db5b23d2ee7fffd49a42d5a120c50e94, type: 2}
-  _blackboard: {fileID: 0}
+  _blackboard: {fileID: 6881462958115636691}
 --- !u!114 &6881462958115636691
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -348,9 +348,24 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: ParadoxNotion::NodeCanvas.Framework.Blackboard
  _parentBlackboard: {fileID: 0}
-  _serializedBlackboard: '{"_variables":{}}'
-  _objectReferences: []
-  _serializedVariables: []
+  _serializedBlackboard: '{"_variables":{"bodyAnimator":{"_value":1,"_name":"bodyAnimator","_id":"596577fd-def2-446f-855c-d366b7f6cc67","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+    UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"modelAnimator":{"_value":2,"_name":"modelAnimator","_id":"5c66985d-3dce-49ff-a5eb-fb807771b577","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+    UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
+  _objectReferences:
+  - {fileID: 0}
+  - {fileID: 4447190118606394553}
+  - {fileID: 8332864352631384059}
+  _serializedVariables:
+  - _json: '{"_value":1,"_name":"bodyAnimator","_id":"596577fd-def2-446f-855c-d366b7f6cc67","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+      UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+    _references:
+    - {fileID: 0}
+    - {fileID: 4447190118606394553}
+  - _json: '{"_value":1,"_name":"modelAnimator","_id":"5c66985d-3dce-49ff-a5eb-fb807771b577","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+      UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+    _references:
+    - {fileID: 0}
+    - {fileID: 8332864352631384059}
 --- !u!114 &5075083518210584453
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -729,8 +744,38 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 8332864352631384059}
  m_SourcePrefab: {fileID: 100100000, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3}
+--- !u!1 &8573086128984434046 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3}
+  m_PrefabInstance: {fileID: 8807019661255186479}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &8332864352631384059
+Animator:
+  serializedVersion: 7
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8573086128984434046}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 4b4d74abfd4433841a36537d7aa224db, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!4 &9057416996320346052 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3}
--- a/Assets/Player/Attacks/TestMelee/TestAttackBT.asset
+++ b/Assets/Player/Attacks/TestMelee/TestAttackBT.asset
@@ -24,13 +24,13 @@ MonoBehaviour:
    UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"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]],
    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"attackDamageSource":{"_name":"attackDamageSource","_id":"93af52d4-3d5f-41a9-aadb-fbeb60d44b08","$type":"NodeCanvas.Framework.Variable`1[[Reset.Core.DamageSource,
-    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
+    Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
  _objectReferences: []
  _graphSource:
    _version: 3.31
    _category: 
    _comments: 
-    _translation: {x: 917, y: 727}
-    _zoomFactor: 1
+    _translation: {x: 756, y: 687}
+    _zoomFactor: 0.82284415
  _haltSerialization: 0
  _externalSerializationFile: {fileID: 0}
--- a/Assets/Scenes/CombatTest.unity
+++ b/Assets/Scenes/CombatTest.unity
@@ -3372,7 +3372,6 @@ MonoBehaviour:
  enemyCount: {x: 0, y: 0}
  enemy: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
  enemies: []
-  unitsInCombat: 0
 --- !u!4 &797489998
 Transform:
  m_ObjectHideFlags: 0
@@ -4582,7 +4581,6 @@ MonoBehaviour:
  enemyCount: {x: 0, y: 0}
  enemy: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
  enemies: []
-  unitsInCombat: 0
 --- !u!4 &1048541691
 Transform:
  m_ObjectHideFlags: 0
@@ -5479,7 +5477,7 @@ MonoBehaviour:
    Layer: 0
    OriginatingState: 545524378
    DestinationState: -1809674494
-    TransitionDuration: 0.25
+    TransitionDuration: 0
    TriggerNameHash: 1080829965
    TransitionIndex: 1
  m_Animator: {fileID: 4518178797721885225}
@@ -6825,6 +6823,10 @@ PrefabInstance:
      value: '{"_variables":{"target":{"_propertyPath":"Reset.Units.EnemyCombat.UnitTarget","_name":"target","_id":"6661b63d-1d1f-4620-945e-7769012891f2","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
        UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _objectReferences.Array.size
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
      propertyPath: _serializedVariables.Array.size
      value: 1
@@ -6834,6 +6836,10 @@ PrefabInstance:
      value: '{"_propertyPath":"Reset.Units.EnemyCombat.UnitTarget","_name":"target","_id":"6661b63d-1d1f-4620-945e-7769012891f2","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
        UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _serializedVariables.Array.data[0]._references.Array.size
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6929190659609457359, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 57.05409
@@ -6894,6 +6900,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 4.340281
      objectReference: {fileID: 0}
+    - target: {fileID: 8206397622550667234, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: testModelAnimator
+      value: 
+      objectReference: {fileID: 0}
    - target: {fileID: 8352365412773029781, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: -11.991471
@@ -8570,7 +8580,6 @@ MonoBehaviour:
  enemyCount: {x: 0, y: 0}
  enemy: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
  enemies: []
-  unitsInCombat: 0
 --- !u!4 &1895301036
 Transform:
  m_ObjectHideFlags: 0
@@ -9682,6 +9691,34 @@ PrefabInstance:
      propertyPath: data.deacceleration.defaultValue
      value: 20
      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _serializedBlackboard
+      value: '{"_variables":{"bodyAnimator":{"_name":"bodyAnimator","_id":"596577fd-def2-446f-855c-d366b7f6cc67","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+        UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"modelAnimator":{"_name":"modelAnimator","_id":"5c66985d-3dce-49ff-a5eb-fb807771b577","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+        UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _objectReferences.Array.size
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _serializedVariables.Array.data[0]._json
+      value: '{"_name":"bodyAnimator","_id":"596577fd-def2-446f-855c-d366b7f6cc67","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+        UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _serializedVariables.Array.data[1]._json
+      value: '{"_name":"modelAnimator","_id":"5c66985d-3dce-49ff-a5eb-fb807771b577","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator,
+        UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _serializedVariables.Array.data[0]._references.Array.size
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6881462958115636691, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+      propertyPath: _serializedVariables.Array.data[1]._references.Array.size
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8206397622550667234, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
      propertyPath: testModelAnimator
      value: