From 5ce787251d81987ba39fa9c43dff75abe66fd275 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 23 Oct 2025 20:37:35 -0400 Subject: [PATCH] maint: enemy asset folder restructuring, animations added, animators added, created enemy spawners --- Assets/Enemies/Common.meta | 8 + Assets/Enemies/Common/Graphs.meta | 8 + .../Enemies/Common/Graphs/BasicEnemyFSM.asset | 24 + .../Common/Graphs/BasicEnemyFSM.asset.meta | 8 + Assets/Enemies/TestEnemy.meta | 8 + Assets/Enemies/TestEnemy/Attacks.meta | 8 + Assets/Enemies/{ => TestEnemy}/Models.meta | 0 .../{ => TestEnemy}/Models/TestMonster.meta | 0 .../TestEnemy/Models/TestMonster/Attack2.anim | 267 ++++++ .../Models/TestMonster/Attack2.anim.meta | 8 + .../TestMonsterModelAnimController.controller | 323 ++++--- ...MonsterModelAnimController.controller.meta | 0 ...stMonsterObjectAnimController 1.controller | 33 +- ...sterObjectAnimController 1.controller.meta | 0 .../Models}/TestMonsterModel.fbx | Bin .../Models}/TestMonsterModel.fbx.meta | 6 +- Assets/Enemies/{ => TestEnemy}/Objects.meta | 0 .../Objects/TestMonster.prefab | 0 .../Objects/TestMonster.prefab.meta | 0 Assets/Player/Graphs/PlayerBaseFSM.asset | 28 +- Assets/Scenes/CombatTest.unity | 842 +++++++++++++++++- Assets/Scripts/Units/Enemy.meta | 8 + Assets/Scripts/Units/Enemy/EnemySpawn.cs | 47 + Assets/Scripts/Units/Enemy/EnemySpawn.cs.meta | 2 + 24 files changed, 1491 insertions(+), 137 deletions(-) create mode 100644 Assets/Enemies/Common.meta create mode 100644 Assets/Enemies/Common/Graphs.meta create mode 100644 Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset create mode 100644 Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset.meta create mode 100644 Assets/Enemies/TestEnemy.meta create mode 100644 Assets/Enemies/TestEnemy/Attacks.meta rename Assets/Enemies/{ => TestEnemy}/Models.meta (100%) rename Assets/Enemies/{ => TestEnemy}/Models/TestMonster.meta (100%) create mode 100644 Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim create mode 100644 Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim.meta rename Assets/Enemies/{ => TestEnemy}/Models/TestMonster/TestMonsterModelAnimController.controller (77%) rename Assets/Enemies/{ => TestEnemy}/Models/TestMonster/TestMonsterModelAnimController.controller.meta (100%) rename Assets/Enemies/{ => TestEnemy}/Models/TestMonster/TestMonsterObjectAnimController 1.controller (58%) rename Assets/Enemies/{ => TestEnemy}/Models/TestMonster/TestMonsterObjectAnimController 1.controller.meta (100%) rename Assets/Enemies/{Models/TestMonster => TestEnemy/Models}/TestMonsterModel.fbx (100%) rename Assets/Enemies/{Models/TestMonster => TestEnemy/Models}/TestMonsterModel.fbx.meta (99%) rename Assets/Enemies/{ => TestEnemy}/Objects.meta (100%) rename Assets/Enemies/{ => TestEnemy}/Objects/TestMonster.prefab (100%) rename Assets/Enemies/{ => TestEnemy}/Objects/TestMonster.prefab.meta (100%) create mode 100644 Assets/Scripts/Units/Enemy.meta create mode 100644 Assets/Scripts/Units/Enemy/EnemySpawn.cs create mode 100644 Assets/Scripts/Units/Enemy/EnemySpawn.cs.meta diff --git a/Assets/Enemies/Common.meta b/Assets/Enemies/Common.meta new file mode 100644 index 0000000..fc32551 --- /dev/null +++ b/Assets/Enemies/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8c20c1d5366e204294376ef8fdc0f9b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Common/Graphs.meta b/Assets/Enemies/Common/Graphs.meta new file mode 100644 index 0000000..3b6d1b4 --- /dev/null +++ b/Assets/Enemies/Common/Graphs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1922a71f51212f4287f9dfed61d5038 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset b/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset new file mode 100644 index 0000000..3f83e8e --- /dev/null +++ b/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset @@ -0,0 +1,24 @@ +%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: f945e777233a59f4aba40aeca29093a6, type: 3} + m_Name: BasicEnemyFSM + m_EditorClassIdentifier: NodeCanvas::NodeCanvas.StateMachines.FSM + _serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Standby","_position":{"x":570.0,"y":447.0},"$type":"NodeCanvas.StateMachines.SuperActionState"}],"connections":[],"canvasGroups":[],"localBlackboard":{"_variables":{}}}' + _objectReferences: [] + _graphSource: + _version: 3.31 + _category: + _comments: + _translation: {x: 135, y: 18} + _zoomFactor: 1 + _haltSerialization: 0 + _externalSerializationFile: {fileID: 0} diff --git a/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset.meta b/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset.meta new file mode 100644 index 0000000..9494518 --- /dev/null +++ b/Assets/Enemies/Common/Graphs/BasicEnemyFSM.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db5b23d2ee7fffd49a42d5a120c50e94 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/TestEnemy.meta b/Assets/Enemies/TestEnemy.meta new file mode 100644 index 0000000..65f8d9b --- /dev/null +++ b/Assets/Enemies/TestEnemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12c7925108f654a45b1ec44f92291312 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/TestEnemy/Attacks.meta b/Assets/Enemies/TestEnemy/Attacks.meta new file mode 100644 index 0000000..d9ebbd8 --- /dev/null +++ b/Assets/Enemies/TestEnemy/Attacks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70d4c7427170df94e82ed19fa584ad86 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Models.meta b/Assets/Enemies/TestEnemy/Models.meta similarity index 100% rename from Assets/Enemies/Models.meta rename to Assets/Enemies/TestEnemy/Models.meta diff --git a/Assets/Enemies/Models/TestMonster.meta b/Assets/Enemies/TestEnemy/Models/TestMonster.meta similarity index 100% rename from Assets/Enemies/Models/TestMonster.meta rename to Assets/Enemies/TestEnemy/Models/TestMonster.meta diff --git a/Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim b/Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim new file mode 100644 index 0000000..dbd9742 --- /dev/null +++ b/Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim @@ -0,0 +1,267 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack2 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -10.72, y: -0.0000009536743, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 18.418364} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.46313047} + - serializedVersion: 3 + time: 0.41666666 + value: {x: -10.72, y: -0.0000009536743, z: 3} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 36.96396} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.18476684} + - serializedVersion: 3 + time: 0.78333336 + value: {x: -10.72, y: -0.0000009536743, z: 6.113785} + inSlope: {x: 0, y: 0, z: 4.9565926} + outSlope: {x: 0, y: 0, z: 31.988409} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.27278635} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.21229048} + - serializedVersion: 3 + time: 1 + value: {x: -10.72, y: -0.0000009536743, z: 8.987598} + inSlope: {x: 0, y: 0, z: 0.8098437} + outSlope: {x: 0, y: 0, z: 0.8098437} + 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.1166667 + value: {x: -10.72, y: -0.0000009536743, z: 8.905767} + inSlope: {x: 0, y: 0, z: -0.39450917} + outSlope: {x: 0, y: 0, z: -0.39450917} + 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.1833333 + value: {x: -10.72, y: -0.0000009536743, z: 9} + inSlope: {x: 0, y: 0, z: 3.81515} + outSlope: {x: 0, y: 0, z: 27.071112} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.22113527} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.24055922} + - serializedVersion: 3 + time: 1.5666667 + value: {x: -10.72, y: -0.0000009536743, z: 12} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 23.549534} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.3756444} + - serializedVersion: 3 + time: 1.9833333 + value: {x: -10.72, y: -0.0000009536743, z: 15.442279} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.9833333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -10.72 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -10.72 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.0000009536743 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1166667 + value: -0.0000009536743 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 18.418364 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.46313047 + - serializedVersion: 3 + time: 0.41666666 + value: 3 + inSlope: 0 + outSlope: 36.96396 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.18476684 + - serializedVersion: 3 + time: 0.78333336 + value: 6.113785 + inSlope: 4.9565926 + outSlope: 31.988409 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.27278635 + outWeight: 0.21229048 + - serializedVersion: 3 + time: 1.1833333 + value: 9 + inSlope: 3.81515 + outSlope: 27.071112 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.22113527 + outWeight: 0.24055922 + - serializedVersion: 3 + time: 1.5666667 + value: 12 + inSlope: 0 + outSlope: 23.549534 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.3756444 + - serializedVersion: 3 + time: 1.9833333 + value: 15.442279 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim.meta b/Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim.meta new file mode 100644 index 0000000..e143a13 --- /dev/null +++ b/Assets/Enemies/TestEnemy/Models/TestMonster/Attack2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8dc4712be321ea2438dcd70a1af48da4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Models/TestMonster/TestMonsterModelAnimController.controller b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterModelAnimController.controller similarity index 77% rename from Assets/Enemies/Models/TestMonster/TestMonsterModelAnimController.controller rename to Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterModelAnimController.controller index 8ed1668..3dd3b90 100644 --- a/Assets/Enemies/Models/TestMonster/TestMonsterModelAnimController.controller +++ b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterModelAnimController.controller @@ -26,31 +26,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-8534861239787951524 -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: Hit - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7739802095274071406} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.02 - m_TransitionOffset: 0.014190764 - m_ExitTime: 0.0012524996 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 2 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-7838002281315577225 AnimatorState: serializedVersion: 6 @@ -88,7 +63,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 6289592108717075239} + - {fileID: -2896483219205038615} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -115,62 +90,66 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -8894196964764803202} - m_Position: {x: 290, y: 400, z: 0} + m_Position: {x: 290, y: 540, z: 0} - serializedVersion: 1 m_State: {fileID: -762329493899166440} - m_Position: {x: 10, y: 400, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6331071955438319008} - m_Position: {x: 310, y: 90, z: 0} + m_Position: {x: 10, y: 540, z: 0} - serializedVersion: 1 m_State: {fileID: -3708334509902770229} - m_Position: {x: 560, y: 410, z: 0} + m_Position: {x: 560, y: 550, z: 0} - serializedVersion: 1 m_State: {fileID: -853705697146182325} - m_Position: {x: 840, y: 410, z: 0} + m_Position: {x: 840, y: 550, z: 0} - serializedVersion: 1 m_State: {fileID: 3379675004845603719} - m_Position: {x: 300, y: 560, z: 0} + m_Position: {x: 300, y: 700, z: 0} - serializedVersion: 1 m_State: {fileID: 2846885752072739483} - m_Position: {x: 20, y: 560, z: 0} + m_Position: {x: 20, y: 700, z: 0} - serializedVersion: 1 m_State: {fileID: 216270272570043207} - m_Position: {x: 580, y: 570, z: 0} + m_Position: {x: 580, y: 710, z: 0} - serializedVersion: 1 m_State: {fileID: -7838002281315577225} - m_Position: {x: 860, y: 570, z: 0} - - serializedVersion: 1 - m_State: {fileID: 2674828334277978819} - m_Position: {x: -46, y: 308.5, z: 0} + m_Position: {x: 860, y: 710, z: 0} - serializedVersion: 1 m_State: {fileID: -7739802095274071406} m_Position: {x: 640, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -2129754743114529880} - m_Position: {x: 310, y: 0, z: 0} + m_Position: {x: 310, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3681834314654821130} + m_Position: {x: 640, y: -10, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5478294846319106365} + m_Position: {x: 330, y: -120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6278834590196608118} + m_Position: {x: 230, y: 260, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] + m_AnyStateTransitions: + - {fileID: 6050553813420038917} + m_EntryTransitions: + - {fileID: -6104077598451673648} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 250, y: 370, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 940, y: 40, z: 0} + m_ExitPosition: {x: 1000, y: 170, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -6331071955438319008} ---- !u!1102 &-6331071955438319008 + m_DefaultState: {fileID: -2129754743114529880} +--- !u!1102 &-6278834590196608118 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewIdle-40 - m_Speed: 0.2 + m_Name: Die-60 + m_Speed: 0.5 m_CycleOffset: 0 - m_Transitions: - - {fileID: -8534861239787951524} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -180,12 +159,26 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -747295086443886786, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3} + m_Motion: {fileID: 8915747620852973273, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1109 &-6104077598451673648 +AnimatorTransition: + 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: -2129754743114529880} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!1101 &-4872988204597852695 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -274,6 +267,50 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-2896483219205038615 +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: -2129754743114529880} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.059113443 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2879270276895609086 +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: -2129754743114529880} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8846154 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2129754743114529880 AnimatorState: serializedVersion: 6 @@ -284,7 +321,9 @@ AnimatorState: m_Name: Blend Tree 0 m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1762903771197777033} + - {fileID: 5120510497768700528} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -300,6 +339,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1762903771197777033 +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: Hit + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7739802095274071406} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.24999994 + m_TransitionOffset: 0.14040057 + m_ExitTime: 0.030737108 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-853705697146182325 AnimatorState: serializedVersion: 6 @@ -374,6 +438,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - 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 @@ -436,32 +506,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &2674828334277978819 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 9024195164895604365} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &2846885752072739483 AnimatorState: serializedVersion: 6 @@ -537,6 +581,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &3681834314654821130 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack2-130 + m_Speed: 1.5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2879270276895609086} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -6061412660744093124, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &4299374430097347064 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -559,7 +630,58 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &6289592108717075239 +--- !u!1101 &5120510497768700528 +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: 3681834314654821130} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5909091 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5478294846319106365 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack-45 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 6410907019033591260, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6050553813420038917 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -568,47 +690,16 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6331071955438319008} + m_DstState: {fileID: -6278834590196608118} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.47 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.25000006 - m_HasExitTime: 1 + m_ExitTime: 0.75 + m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 1 + m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!206 &9024195164895604365 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: -1304387373167265313, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3} - m_Threshold: 0 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: -3100369314251171874, guid: 64c95eab532c57d4eb98569c66e7455a, type: 3} - m_Threshold: 1 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - m_BlendParameter: Blend - m_BlendParameterY: Blend - m_MinThreshold: 0 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 1 - m_NormalizedBlendValues: 0 - m_BlendType: 0 diff --git a/Assets/Enemies/Models/TestMonster/TestMonsterModelAnimController.controller.meta b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterModelAnimController.controller.meta similarity index 100% rename from Assets/Enemies/Models/TestMonster/TestMonsterModelAnimController.controller.meta rename to Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterModelAnimController.controller.meta diff --git a/Assets/Enemies/Models/TestMonster/TestMonsterObjectAnimController 1.controller b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterObjectAnimController 1.controller similarity index 58% rename from Assets/Enemies/Models/TestMonster/TestMonsterObjectAnimController 1.controller rename to Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterObjectAnimController 1.controller index 4c8180a..cfddbe3 100644 --- a/Assets/Enemies/Models/TestMonster/TestMonsterObjectAnimController 1.controller +++ b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterObjectAnimController 1.controller @@ -8,7 +8,10 @@ AnimatorStateMachine: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Base Layer - m_ChildStates: [] + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6611013841474026752} + m_Position: {x: 520, y: 120, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -18,7 +21,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} + m_DefaultState: {fileID: 6611013841474026752} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -41,3 +44,29 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &6611013841474026752 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 8dc4712be321ea2438dcd70a1af48da4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Enemies/Models/TestMonster/TestMonsterObjectAnimController 1.controller.meta b/Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterObjectAnimController 1.controller.meta similarity index 100% rename from Assets/Enemies/Models/TestMonster/TestMonsterObjectAnimController 1.controller.meta rename to Assets/Enemies/TestEnemy/Models/TestMonster/TestMonsterObjectAnimController 1.controller.meta diff --git a/Assets/Enemies/Models/TestMonster/TestMonsterModel.fbx b/Assets/Enemies/TestEnemy/Models/TestMonsterModel.fbx similarity index 100% rename from Assets/Enemies/Models/TestMonster/TestMonsterModel.fbx rename to Assets/Enemies/TestEnemy/Models/TestMonsterModel.fbx diff --git a/Assets/Enemies/Models/TestMonster/TestMonsterModel.fbx.meta b/Assets/Enemies/TestEnemy/Models/TestMonsterModel.fbx.meta similarity index 99% rename from Assets/Enemies/Models/TestMonster/TestMonsterModel.fbx.meta rename to Assets/Enemies/TestEnemy/Models/TestMonsterModel.fbx.meta index a300820..7fd55e5 100644 --- a/Assets/Enemies/Models/TestMonster/TestMonsterModel.fbx.meta +++ b/Assets/Enemies/TestEnemy/Models/TestMonsterModel.fbx.meta @@ -361,8 +361,8 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 + loopTime: 1 + loopBlend: 1 loopBlendOrientation: 0 loopBlendPositionY: 0 loopBlendPositionXZ: 0 @@ -407,7 +407,7 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Enemies/Objects.meta b/Assets/Enemies/TestEnemy/Objects.meta similarity index 100% rename from Assets/Enemies/Objects.meta rename to Assets/Enemies/TestEnemy/Objects.meta diff --git a/Assets/Enemies/Objects/TestMonster.prefab b/Assets/Enemies/TestEnemy/Objects/TestMonster.prefab similarity index 100% rename from Assets/Enemies/Objects/TestMonster.prefab rename to Assets/Enemies/TestEnemy/Objects/TestMonster.prefab diff --git a/Assets/Enemies/Objects/TestMonster.prefab.meta b/Assets/Enemies/TestEnemy/Objects/TestMonster.prefab.meta similarity index 100% rename from Assets/Enemies/Objects/TestMonster.prefab.meta rename to Assets/Enemies/TestEnemy/Objects/TestMonster.prefab.meta diff --git a/Assets/Player/Graphs/PlayerBaseFSM.asset b/Assets/Player/Graphs/PlayerBaseFSM.asset index 5d3c07f..5237ce6 100644 --- a/Assets/Player/Graphs/PlayerBaseFSM.asset +++ b/Assets/Player/Graphs/PlayerBaseFSM.asset @@ -100,16 +100,16 @@ MonoBehaviour: Jump","_position":{"x":697.7955,"y":220.1157},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"21"},{"_actionList":{"actions":[{"valueA":{"_name":"newAirMoveSmoothing"},"valueB":{"_value":1.0},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"eventName":{"_value":"Air Reset Received"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":0.3647059,"g":0.3215686,"b":1.0,"a":1.0},"_name":"Airborne Standard Movement","_position":{"x":227.1761,"y":27.24033},"$type":"NodeCanvas.StateMachines.ActionState","$id":"22"},{"_name":"INTERACT - OPTIONS","_position":{"x":967.8022,"y":970.8088},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"23"},{"_actionList":{"executionMode":1,"actions":[{"raycastHit":{"_name":"_hit"},"transform":{},"collider":{},"gameObject":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"distance":{},"normal":{},"point":{},"$type":"NodeCanvas.Tasks.Actions.DecomposeRaycastHit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1979.639,"y":835.3054},"$type":"NodeCanvas.StateMachines.ActionState","$id":"24"},{"_name":"Check - if interactable","_position":{"x":2261.751,"y":1168.912},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"25"},{"_actionList":{"executionMode":1,"actions":[{"log":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"NodeCanvas.Tasks.Actions.DebugLogText"},{"moveSpeed":{"label":"Move + OPTIONS","_position":{"x":967.8022,"y":970.8088},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"23"},{"_actionList":{"executionMode":1,"actions":[{"raycastHit":{"_name":"_hit"},"transform":{},"collider":{},"gameObject":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"distance":{},"normal":{},"point":{},"$type":"NodeCanvas.Tasks.Actions.DecomposeRaycastHit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1979.639,"y":835.3054},"$type":"NodeCanvas.StateMachines.ActionState","$id":"24"},{"_name":"Check + if interactable","_position":{"x":2261.751,"y":1168.912},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"25"},{"_actionList":{"executionMode":1,"actions":[{"log":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"$type":"NodeCanvas.Tasks.Actions.DebugLogText"},{"moveSpeed":{"label":"Move Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation - Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick + Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"target":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"eventToSend":"Pick Up Start","$type":"Reset.Units.SendEventToUnit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Start - Ally Pickup","_position":{"x":2476.157,"y":1375.323},"$type":"NodeCanvas.StateMachines.ActionState","$id":"26"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick + Ally Pickup","_position":{"x":2476.157,"y":1375.323},"$type":"NodeCanvas.StateMachines.ActionState","$id":"26"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"eventToSend":"Pick Up Failed","$type":"Reset.Units.SendEventToUnit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Pickup - Failed","_position":{"x":2149.82,"y":1512.374},"$type":"NodeCanvas.StateMachines.ActionState","$id":"27"},{"_position":{"x":1982.633,"y":1100.114},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"28"},{"_actionList":{"executionMode":1,"actions":[{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[UnityEngine.GameObject, - UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1682.273,"y":1020.806},"$type":"NodeCanvas.StateMachines.ActionState","$id":"29"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick + Failed","_position":{"x":2149.82,"y":1512.374},"$type":"NodeCanvas.StateMachines.ActionState","$id":"27"},{"_position":{"x":1982.633,"y":1100.114},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"28"},{"_actionList":{"executionMode":1,"actions":[{"valueA":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[UnityEngine.GameObject, + UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1682.273,"y":1020.806},"$type":"NodeCanvas.StateMachines.ActionState","$id":"29"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"eventToSend":"Pick Up Success","$type":"Reset.Units.SendEventToUnit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Pickup Success","_position":{"x":2141.71,"y":1271.081},"$type":"NodeCanvas.StateMachines.ActionState","$id":"30"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move Speed","changeValue":{"_value":1},"value":{"_value":30.0},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":0.1},"_changeEasing":{"_value":1},"_easing":{"_value":0.1}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"fieldOfView":{"label":"FOV","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitTargetOffset":{"label":"Target @@ -142,15 +142,15 @@ 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":"33"},{"_nestedBT":{"_value":1},"executionMode":0,"_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"}],"_position":{"x":6.297241,"y":862.5489},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"34"},{"_nestedBT":{"_value":2},"executionMode":0,"_position":{"x":171.2884,"y":699.1394},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"35"},{"_nestedBT":{"_value":3},"executionMode":0,"_position":{"x":265.6401,"y":1002.963},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"36"},{"_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 + Jump","_position":{"x":1043.577,"y":32.57642},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"33"},{"_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":6.297241,"y":862.5489},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"34"},{"_nestedBT":{"_value":2},"executionMode":0,"_position":{"x":171.2884,"y":699.1394},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"35"},{"_nestedBT":{"_value":3},"executionMode":0,"_position":{"x":265.6401,"y":1002.963},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"36"},{"_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"},{"_position":{"x":1205.416,"y":1652.661},"$type":"NodeCanvas.StateMachines.AnyState","$id":"43"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation - Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"trigger":{"_value":"Downed"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Downed","_position":{"x":1104.305,"y":1898.447},"$type":"NodeCanvas.StateMachines.ActionState","$id":"44"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move + Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"trigger":{"_value":"Downed"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Downed","_position":{"x":1104.305,"y":1898.447},"$type":"NodeCanvas.StateMachines.ActionState","$id":"44"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation - Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Die","_position":{"x":1341.81,"y":1339.448},"$type":"NodeCanvas.StateMachines.ActionState","$id":"45"},{"_actionList":{"executionMode":1,"actions":[{"position":{},"$type":"Reset.Units.MoveUnit"},{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Respawn","_position":{"x":1013.765,"y":1441.579},"$type":"NodeCanvas.StateMachines.ActionState","$id":"46"},{"_actionList":{"executionMode":1,"actions":[{"$type":"NodeCanvas.Tasks.Actions.DrawReviveBar"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Getting - Picked Up","_position":{"x":922.8077,"y":1766.312},"$type":"NodeCanvas.StateMachines.ActionState","$id":"47"},{"_actionList":{"executionMode":1,"actions":[{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Picked + Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Die","_position":{"x":1341.81,"y":1339.448},"$type":"NodeCanvas.StateMachines.ActionState","$id":"45"},{"_actionList":{"executionMode":1,"actions":[{"position":{},"$type":"Reset.Units.MoveUnit"},{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Respawn","_position":{"x":1013.765,"y":1441.579},"$type":"NodeCanvas.StateMachines.ActionState","$id":"46"},{"_actionList":{"executionMode":1,"actions":[{"$type":"NodeCanvas.Tasks.Actions.DrawReviveBar"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Getting + Picked Up","_position":{"x":922.8077,"y":1766.312},"$type":"NodeCanvas.StateMachines.ActionState","$id":"47"},{"_actionList":{"executionMode":1,"actions":[{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"64fd28ff-2ca7-4b11-89b9-2c0cf8961bf8"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Picked Up","_position":{"x":675.3742,"y":1598.958},"$type":"NodeCanvas.StateMachines.ActionState","$id":"48"},{"_position":{"x":66.05099,"y":1392.763},"$type":"NodeCanvas.StateMachines.AnyState","$id":"49"},{"_actionList":{"executionMode":1,"actions":[{"control":1,"$type":"NodeCanvas.Tasks.Actions.GraphOwnerControl"}]},"_color":{"r":0.2358491,"g":0.2358491,"b":0.2358491,"a":1.0},"_name":"Not Owned","_position":{"x":30.03195,"y":1494.638},"$type":"NodeCanvas.StateMachines.ActionState","$id":"50"}],"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":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"23"},"$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, @@ -167,9 +167,9 @@ MonoBehaviour: Launch"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple Pull"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3, - UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"timeout":{"_value":0.2},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"13"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":2.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"18"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkAgainst":2,"checkAgainstValue":{"_name":"_wallJumpHitNormal"},"desiredValue":{"_value":1.0},"tolerance":{"_value":0.5},"considerCameraRotation":{"_value":true},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"valueA":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"checkType":2,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckFloat"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"21"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"22"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"player"},"outputHitTo":{"_name":"_hit"},"deactivateOnFinish":false,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[UnityEngine.GameObject, - UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[Reset.Units.Player, - Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"Reset.Core.IsInteractable"},"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"27"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":5.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"30"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"27"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"28"},"_targetNode":{"$ref":"29"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"29"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"30"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"31"},"_targetNode":{"$ref":"32"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"33"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"33"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"34"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"35"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"36"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Downed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Killed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick + UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"timeout":{"_value":0.2},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"13"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":2.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"18"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkAgainst":2,"checkAgainstValue":{"_name":"_wallJumpHitNormal"},"desiredValue":{"_value":1.0},"tolerance":{"_value":0.5},"considerCameraRotation":{"_value":true},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"valueA":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"checkType":2,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckFloat"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"21"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"22"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"player"},"outputHitTo":{"_name":"_hit"},"deactivateOnFinish":false,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[UnityEngine.GameObject, + UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[Reset.Units.Player, + Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"target":{"_name":"pickupTarget","_targetVariableID":"bf809a37-76c1-4dd7-8528-cc09527cb016"},"$type":"Reset.Core.IsInteractable"},"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"27"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":5.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"30"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"27"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"28"},"_targetNode":{"$ref":"29"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"29"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"30"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"31"},"_targetNode":{"$ref":"32"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"33"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"33"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"34"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"35"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"36"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Downed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Killed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick Up Start"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"47"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"45"},"_targetNode":{"$ref":"46"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"46"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick Up Success"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"47"},"_targetNode":{"$ref":"48"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick Up Failed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"47"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"48"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"method":{"_baseInfo":"Reset.Units.Player|UnitIsLocal|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":false,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_sourceNode":{"$ref":"49"},"_targetNode":{"$ref":"50"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGroundedOld":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGroundedOld","_id":"619300a4-be8b-4ad4-ba2a-978468094ba2","_debugBoundValue":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean, @@ -188,7 +188,7 @@ MonoBehaviour: _version: 3.31 _category: _comments: - _translation: {x: -587, y: -941} + _translation: {x: -371, y: -784} _zoomFactor: 0.9994002 _haltSerialization: 0 _externalSerializationFile: {fileID: 0} diff --git a/Assets/Scenes/CombatTest.unity b/Assets/Scenes/CombatTest.unity index 88573e6..ba7e919 100644 --- a/Assets/Scenes/CombatTest.unity +++ b/Assets/Scenes/CombatTest.unity @@ -3172,6 +3172,56 @@ RectTransform: m_AnchoredPosition: {x: 814, y: -315.5} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &797489996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 797489998} + - component: {fileID: 797489997} + m_Layer: 0 + m_Name: EnemySpawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &797489997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797489996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd8d1c9c0ddc5c14497e74371d4b0350, type: 3} + m_Name: + m_EditorClassIdentifier: Core::EnemySpawn + radius: 30 + minimumEnemies: 1 + maximumEnemies: 5 + enemyCount: {x: 0, y: 0} + enemy: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + enemies: [] +--- !u!4 &797489998 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797489996} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.9143, y: 0, z: 21.8518} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &804831197 GameObject: m_ObjectHideFlags: 0 @@ -5148,11 +5198,18 @@ MonoBehaviour: TransitionStateInfoList: - IsCrossFadeExit: 0 Layer: 0 - OriginatingState: 1815278964 + OriginatingState: 545524378 DestinationState: 2133702664 - TransitionDuration: 0.02 + TransitionDuration: 0.24999994 TriggerNameHash: 1654612129 TransitionIndex: 0 + - IsCrossFadeExit: 0 + Layer: 0 + OriginatingState: 545524378 + DestinationState: -1809674494 + TransitionDuration: 0.25 + TriggerNameHash: 1080829965 + TransitionIndex: 1 m_Animator: {fileID: 4518178797721885225} --- !u!43 &1232968165 Mesh: @@ -6103,6 +6160,785 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!1001 &1668865122 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 317771288710234046, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 4.502045 + objectReference: {fileID: 0} + - target: {fileID: 317771288710234046, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 2.162825 + objectReference: {fileID: 0} + - target: {fileID: 317771288710234046, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 7.3166847 + objectReference: {fileID: 0} + - target: {fileID: 735011060838397175, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 72.853966 + objectReference: {fileID: 0} + - target: {fileID: 735011060838397175, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -48.12671 + objectReference: {fileID: 0} + - target: {fileID: 735011060838397175, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -36.597397 + objectReference: {fileID: 0} + - target: {fileID: 778336466844962677, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -64.67658 + objectReference: {fileID: 0} + - target: {fileID: 778336466844962677, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 778336466844962677, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 1581458538724617100, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 18.034752 + objectReference: {fileID: 0} + - target: {fileID: 1581458538724617100, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.6811892 + objectReference: {fileID: 0} + - target: {fileID: 1581458538724617100, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 2.600578 + objectReference: {fileID: 0} + - target: {fileID: 1586033721591244307, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -2.1177132 + objectReference: {fileID: 0} + - target: {fileID: 1586033721591244307, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.3535057 + objectReference: {fileID: 0} + - target: {fileID: 1586033721591244307, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -1.1162076 + objectReference: {fileID: 0} + - target: {fileID: 1677206556345419530, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -36.64801 + objectReference: {fileID: 0} + - target: {fileID: 1677206556345419530, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.0081627 + objectReference: {fileID: 0} + - target: {fileID: 1677206556345419530, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -95.95746 + objectReference: {fileID: 0} + - target: {fileID: 1985515047893440889, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 3.6523414 + objectReference: {fileID: 0} + - target: {fileID: 1985515047893440889, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -5.6990256e-16 + objectReference: {fileID: 0} + - target: {fileID: 1985515047893440889, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 2175660030800803363, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 15.281988 + objectReference: {fileID: 0} + - target: {fileID: 2175660030800803363, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.0649419 + objectReference: {fileID: 0} + - target: {fileID: 2175660030800803363, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 1.7599096 + objectReference: {fileID: 0} + - target: {fileID: 2184248530127204649, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -11.991719 + objectReference: {fileID: 0} + - target: {fileID: 2184248530127204649, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.5706639 + objectReference: {fileID: 0} + - target: {fileID: 2184248530127204649, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -2.881432 + objectReference: {fileID: 0} + - target: {fileID: 2253554388756063120, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -16.33928 + objectReference: {fileID: 0} + - target: {fileID: 2253554388756063120, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 10.55029 + objectReference: {fileID: 0} + - target: {fileID: 2253554388756063120, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -5.854935 + objectReference: {fileID: 0} + - target: {fileID: 2562293259993124465, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: GlobalObjectIdHash + value: 1043550553 + objectReference: {fileID: 0} + - target: {fileID: 2562293259993124465, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: InScenePlacedSourceGlobalObjectIdHash + value: 1434729210 + objectReference: {fileID: 0} + - target: {fileID: 2914044900146270665, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 10.06946 + objectReference: {fileID: 0} + - target: {fileID: 2914044900146270665, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 3.3156934 + objectReference: {fileID: 0} + - target: {fileID: 2914044900146270665, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -9.585445 + objectReference: {fileID: 0} + - target: {fileID: 3149068050864721366, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 17.38682 + objectReference: {fileID: 0} + - target: {fileID: 3149068050864721366, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 8.39329 + objectReference: {fileID: 0} + - target: {fileID: 3149068050864721366, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 13.8025465 + objectReference: {fileID: 0} + - target: {fileID: 3159434418142095149, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -65.38902 + objectReference: {fileID: 0} + - target: {fileID: 3159434418142095149, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 167.73589 + objectReference: {fileID: 0} + - target: {fileID: 3159434418142095149, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -171.27606 + objectReference: {fileID: 0} + - target: {fileID: 3336142510729697439, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.637619 + objectReference: {fileID: 0} + - target: {fileID: 3336142510729697439, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -3.148806 + objectReference: {fileID: 0} + - target: {fileID: 3336142510729697439, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -55.30239 + objectReference: {fileID: 0} + - target: {fileID: 3428415627849171540, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 28.353235 + objectReference: {fileID: 0} + - target: {fileID: 3428415627849171540, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -10.522018 + objectReference: {fileID: 0} + - target: {fileID: 3428415627849171540, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -16.544603 + objectReference: {fileID: 0} + - target: {fileID: 3499663913874415923, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 16.779821 + objectReference: {fileID: 0} + - target: {fileID: 3499663913874415923, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 108.96812 + objectReference: {fileID: 0} + - target: {fileID: 3499663913874415923, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 52.148205 + objectReference: {fileID: 0} + - target: {fileID: 3640078751993110099, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -2.1182735 + objectReference: {fileID: 0} + - target: {fileID: 3640078751993110099, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.35337105 + objectReference: {fileID: 0} + - target: {fileID: 3640078751993110099, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 1.1161119 + objectReference: {fileID: 0} + - target: {fileID: 3680294468504567973, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 74.57862 + objectReference: {fileID: 0} + - target: {fileID: 3680294468504567973, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -4.370973 + objectReference: {fileID: 0} + - target: {fileID: 3680294468504567973, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -5.953803 + objectReference: {fileID: 0} + - target: {fileID: 3692587941558270589, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 17.386452 + objectReference: {fileID: 0} + - target: {fileID: 3692587941558270589, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -8.39339 + objectReference: {fileID: 0} + - target: {fileID: 3692587941558270589, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -13.80227 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalPosition.x + value: -10.72 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000009536743 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalPosition.z + value: 9.42 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4118401780831850168, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578932808745110370, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 3.6523414 + objectReference: {fileID: 0} + - target: {fileID: 4578932808745110370, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 5.6990256e-16 + objectReference: {fileID: 0} + - target: {fileID: 4578932808745110370, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 5120725346855661651, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -28.653074 + objectReference: {fileID: 0} + - target: {fileID: 5120725346855661651, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 18.287384 + objectReference: {fileID: 0} + - target: {fileID: 5120725346855661651, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 3.0184026 + objectReference: {fileID: 0} + - target: {fileID: 5345297475377583494, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 17.528267 + objectReference: {fileID: 0} + - target: {fileID: 5345297475377583494, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.553181 + objectReference: {fileID: 0} + - target: {fileID: 5345297475377583494, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 102.52804 + objectReference: {fileID: 0} + - target: {fileID: 5403084861446168510, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 10.167782 + objectReference: {fileID: 0} + - target: {fileID: 5403084861446168510, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 57.304996 + objectReference: {fileID: 0} + - target: {fileID: 5403084861446168510, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 82.91259 + objectReference: {fileID: 0} + - target: {fileID: 6172334664054337884, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 15.281956 + objectReference: {fileID: 0} + - target: {fileID: 6172334664054337884, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.065096 + objectReference: {fileID: 0} + - target: {fileID: 6172334664054337884, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -1.7599012 + objectReference: {fileID: 0} + - target: {fileID: 6387062575078788402, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -87.10998 + objectReference: {fileID: 0} + - target: {fileID: 6525850977346927133, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -15.185022 + objectReference: {fileID: 0} + - target: {fileID: 6525850977346927133, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 20.990797 + objectReference: {fileID: 0} + - target: {fileID: 6525850977346927133, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 12.67384 + objectReference: {fileID: 0} + - target: {fileID: 6742477011147191236, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -8.5058565 + objectReference: {fileID: 0} + - target: {fileID: 6742477011147191236, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 2.5747786 + objectReference: {fileID: 0} + - target: {fileID: 6742477011147191236, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 4.7623973 + objectReference: {fileID: 0} + - target: {fileID: 6867209477930907800, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 18.261408 + objectReference: {fileID: 0} + - target: {fileID: 6867209477930907800, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -88.71929 + objectReference: {fileID: 0} + - target: {fileID: 6867209477930907800, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -65.31758 + objectReference: {fileID: 0} + - target: {fileID: 6929190659609457359, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 87.66107 + objectReference: {fileID: 0} + - target: {fileID: 6929190659609457359, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 40.655743 + objectReference: {fileID: 0} + - target: {fileID: 6929190659609457359, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 42.086956 + objectReference: {fileID: 0} + - target: {fileID: 7036888329901946550, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 89.184105 + objectReference: {fileID: 0} + - target: {fileID: 7036888329901946550, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.020779114 + objectReference: {fileID: 0} + - target: {fileID: 7036888329901946550, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.020781798 + objectReference: {fileID: 0} + - target: {fileID: 7292934551955801563, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -8.505997 + objectReference: {fileID: 0} + - target: {fileID: 7292934551955801563, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -2.5749872 + objectReference: {fileID: 0} + - target: {fileID: 7292934551955801563, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -4.7624373 + objectReference: {fileID: 0} + - target: {fileID: 7527392756254899528, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 89.184105 + objectReference: {fileID: 0} + - target: {fileID: 7527392756254899528, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.020779114 + objectReference: {fileID: 0} + - target: {fileID: 7527392756254899528, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.020781798 + objectReference: {fileID: 0} + - target: {fileID: 7811419746553573032, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -83.49633 + objectReference: {fileID: 0} + - target: {fileID: 7811419746553573032, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -34.97736 + objectReference: {fileID: 0} + - target: {fileID: 7811419746553573032, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 37.631626 + objectReference: {fileID: 0} + - target: {fileID: 8352365412773029781, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -11.991405 + objectReference: {fileID: 0} + - target: {fileID: 8352365412773029781, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.5703189 + objectReference: {fileID: 0} + - target: {fileID: 8352365412773029781, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 2.8816702 + objectReference: {fileID: 0} + - target: {fileID: 8452216325206990857, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -28.80759 + objectReference: {fileID: 0} + - target: {fileID: 8452216325206990857, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -6.3478966 + objectReference: {fileID: 0} + - target: {fileID: 8452216325206990857, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 77.70379 + objectReference: {fileID: 0} + - target: {fileID: 8493314680745828732, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -4.3122797 + objectReference: {fileID: 0} + - target: {fileID: 8493314680745828732, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -12.26089 + objectReference: {fileID: 0} + - target: {fileID: 8493314680745828732, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 41.23382 + objectReference: {fileID: 0} + - target: {fileID: 8850818641709699335, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 18.034714 + objectReference: {fileID: 0} + - target: {fileID: 8850818641709699335, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.6811763 + objectReference: {fileID: 0} + - target: {fileID: 8850818641709699335, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -2.6005507 + objectReference: {fileID: 0} + - target: {fileID: 8984079304142386397, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 17.52848 + objectReference: {fileID: 0} + - target: {fileID: 8984079304142386397, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.55150527 + objectReference: {fileID: 0} + - target: {fileID: 8984079304142386397, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -102.52716 + objectReference: {fileID: 0} + - target: {fileID: 9057416996320346052, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9057416996320346052, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9069970153423701405, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 29.959785 + objectReference: {fileID: 0} + - target: {fileID: 9069970153423701405, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 8.833204 + objectReference: {fileID: 0} + - target: {fileID: 9069970153423701405, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 37.911476 + objectReference: {fileID: 0} + - target: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + propertyPath: m_Name + value: TestMonster (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + insertIndex: -1 + addedObject: {fileID: 1668865125} + - targetCorrespondingSourceObject: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + insertIndex: -1 + addedObject: {fileID: 1668865132} + - targetCorrespondingSourceObject: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + insertIndex: -1 + addedObject: {fileID: 1668865131} + - targetCorrespondingSourceObject: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + insertIndex: -1 + addedObject: {fileID: 1668865133} + - targetCorrespondingSourceObject: {fileID: 8573086128984434046, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + insertIndex: -1 + addedObject: {fileID: 1668865126} + m_SourcePrefab: {fileID: 100100000, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} +--- !u!1 &1668865123 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + m_PrefabInstance: {fileID: 1668865122} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1668865124 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8573086128984434046, guid: 7dca717b905799e4cb7f64180d31be25, type: 3} + m_PrefabInstance: {fileID: 1668865122} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1668865125 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1668865123} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4f5596a1d63365d4cba1b75587fe5939, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!95 &1668865126 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1668865124} + 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!114 &1668865131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1668865123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b98a6db0b653f764eac834f85857a9dd, type: 3} + m_Name: + m_EditorClassIdentifier: ParadoxNotion::NodeCanvas.Framework.Blackboard + _parentBlackboard: {fileID: 0} + _serializedBlackboard: '{"_variables":{}}' + _objectReferences: [] + _serializedVariables: [] +--- !u!114 &1668865132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1668865123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a7dbb6bbdf4ffb46ab7dd87ba8191e7, type: 3} + m_Name: + m_EditorClassIdentifier: NodeCanvas::NodeCanvas.StateMachines.FSMOwner + _serializedExposedParameters: [] + _boundGraphSerialization: + _boundGraphObjectReferences: [] + _boundGraphSource: + _version: 0 + _category: + _comments: + _translation: {x: 0, y: 0} + _zoomFactor: 1 + _firstActivation: 0 + _enableAction: 0 + _disableAction: 0 + _lockBoundGraphPrefabOverrides: 1 + _preInitializeSubGraphs: 0 + _updateMode: 0 + _graph: {fileID: 11400000, guid: db5b23d2ee7fffd49a42d5a120c50e94, type: 2} + _blackboard: {fileID: 1668865131} +--- !u!114 &1668865133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1668865123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3b4e13d59527d1429a62dde97c6a001, type: 3} + m_Name: + m_EditorClassIdentifier: Core::Reset.Units.UnitMovementHandler + ShowTopMostFoldoutHeaderGroup: 1 + data: + directionChangingSoftness: + targetValue: 1 + currentValue: 1 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 1 + defaultSmoothing: 1 + defaultEasing: 2 + directionSpinningHardness: + targetValue: 3 + currentValue: 3 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 3 + defaultSmoothing: 1 + defaultEasing: 2 + directionSpinningSpeed: + targetValue: 3 + currentValue: 3 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 3 + defaultSmoothing: 1 + defaultEasing: 2 + airDirectionDecay: + targetValue: 1 + currentValue: 1 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 1 + defaultSmoothing: 1 + defaultEasing: 2 + acceleration: + targetValue: 5 + currentValue: 5 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 5 + defaultSmoothing: 1 + defaultEasing: 2 + deacceleration: + targetValue: 5 + currentValue: 5 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 5 + defaultSmoothing: 1 + defaultEasing: 2 + moveSpeed: + targetValue: 15 + currentValue: 15 + targetSmoothing: 10 + targetEasing: 2 + currentSmoothing: 10 + defaultValue: 15 + defaultSmoothing: 10 + defaultEasing: 2 + gravityPower: + targetValue: 1 + currentValue: 1 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 1 + defaultSmoothing: 1 + defaultEasing: 2 + gravityMax: + targetValue: 8 + currentValue: 8 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 8 + defaultSmoothing: 1 + defaultEasing: 2 + gravityAcceleration: + targetValue: 1 + currentValue: 1 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 1 + defaultSmoothing: 1 + defaultEasing: 2 + gravityScale: + targetValue: 1 + currentValue: 1 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 1 + defaultSmoothing: 1 + defaultEasing: 2 + facingDirection: + targetValue: 4 + currentValue: 4 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 4 + defaultSmoothing: 1 + defaultEasing: 2 + rotationSpeed: + targetValue: 5 + currentValue: 5 + targetSmoothing: 1 + targetEasing: 2 + currentSmoothing: 1 + defaultValue: 5 + defaultSmoothing: 1 + defaultEasing: 2 + specifiedRotation: {x: 0, y: 0, z: 0} --- !u!1 &1698015116 GameObject: m_ObjectHideFlags: 0 @@ -8629,3 +9465,5 @@ SceneRoots: - {fileID: 1113569334} - {fileID: 4518178797721885223} - {fileID: 1291419217} + - {fileID: 797489998} + - {fileID: 1668865122} diff --git a/Assets/Scripts/Units/Enemy.meta b/Assets/Scripts/Units/Enemy.meta new file mode 100644 index 0000000..9c2e49c --- /dev/null +++ b/Assets/Scripts/Units/Enemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e73b4c62d7c3214db04bcea1fb9f856 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Units/Enemy/EnemySpawn.cs b/Assets/Scripts/Units/Enemy/EnemySpawn.cs new file mode 100644 index 0000000..ca1fcae --- /dev/null +++ b/Assets/Scripts/Units/Enemy/EnemySpawn.cs @@ -0,0 +1,47 @@ +using System.Collections.Generic; +using Drawing; +using Sirenix.OdinInspector; +using UnityEngine; + +public class EnemySpawn : MonoBehaviour{ + public float radius = 30f; + + public int minimumEnemies = 1; + public int maximumEnemies = 5; + + public Vector2 enemyCount; + + // TODO: Replace this with an Enemy selector based on difficulty, random chance, etc? + public GameObject enemy; + + public List enemies; + + void Start(){ + SpawnEnemies(); + } + + void SpawnEnemies(){ + int count = Random.Range(minimumEnemies, maximumEnemies + 1); + + for (int i = 0; i < count; i++) { + Vector3 newPosition = transform.position; + + float randomX = Random.Range(-(radius / 2f), radius / 2f); + float randomZ = Random.Range(-(radius / 2f), radius / 2f); + + newPosition += new Vector3(randomX, transform.position.y, randomZ); + + float randomRot = Random.Range(0f, 360f); + + GameObject newEnemy = Instantiate(enemy, newPosition, Quaternion.AngleAxis(randomRot, Vector3.up)); + + enemies.Add(newEnemy); + } + } + + // Update is called once per frame + void Update() + { + Draw.WireCylinder(transform.position, transform.position + Vector3.up * 7f, radius); + } +} diff --git a/Assets/Scripts/Units/Enemy/EnemySpawn.cs.meta b/Assets/Scripts/Units/Enemy/EnemySpawn.cs.meta new file mode 100644 index 0000000..f073e2c --- /dev/null +++ b/Assets/Scripts/Units/Enemy/EnemySpawn.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dd8d1c9c0ddc5c14497e74371d4b0350 \ No newline at end of file