Fixes

2025-09-13 12:53:49 +02:00
parent 959cc35c7d
commit 8fadab05e8
13 changed files with 2960 additions and 835 deletions
--- a/Assets/AI/Demon/FireBall
+++ b/Assets/AI/Demon/FireBall
@@ -0,0 +1,213 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1947871717301538
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4209731392266258}
+  - component: {fileID: -5586632368230897359}
+  - component: {fileID: 6785567375430979834}
+  m_Layer: 30
+  m_Name: FireBall new
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4209731392266258
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1947871717301538}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 6.67, y: 1, z: -53.73}
+  m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6802751815913059821}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!136 &-5586632368230897359
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1947871717301538}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 1
+  m_Height: 0
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6785567375430979834
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1947871717301538}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1a863cb5e6092ec4a936c4eb21bb9166, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetTag: Player
+  targetHeightOffset: 1
+  speed: 12
+  lockTime: 0.5
+  maxLifeTime: 60
+  arrivalTolerance: 0.25
+  damage: 5
+  knockbackForce: 5
+  enableDebug: 0
+--- !u!1001 &6802374026672139437
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4209731392266258}
+    m_Modifications:
+    - target: {fileID: 1363404153839300, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_Name
+      value: Effect12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      propertyPath: Speed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      propertyPath: Distance
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      propertyPath: CollidesWith.m_Bits
+      value: 256
+      objectReference: {fileID: 0}
+    - target: {fileID: 114587680334040632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 199693142139168640, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 199728937019303074, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 114430605913307632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+    - {fileID: 114587680334040632, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 1294706121055886, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1570972138348746864}
+  m_SourcePrefab: {fileID: 100100000, guid: 6fca1031e82d1264a8f6d8d1d7a7cced, type: 3}
+--- !u!1 &6801133233205277219 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1294706121055886, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+    type: 3}
+  m_PrefabInstance: {fileID: 6802374026672139437}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1570972138348746864
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6801133233205277219}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_RenderingLayers: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_ShadowRenderingLayers: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 0
+--- !u!4 &6802751815913059821 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4179900483688768, guid: 6fca1031e82d1264a8f6d8d1d7a7cced,
+    type: 3}
+  m_PrefabInstance: {fileID: 6802374026672139437}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/AI/Demon/Turet.prefab.meta
+++ b/Assets/AI/Demon/Turet.prefab.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: b5eabfbed738a224284015c33b62e54b
-timeCreated: 1431698653
-licenseType: Store
+guid: 10813082aa17ea94f9eb5edcc37ac632
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/AI/Demon/SA_CallMeteor.cs
+++ b/Assets/AI/Demon/SA_CallMeteor.cs
@@ -129,7 +129,6 @@ namespace DemonBoss.Magic
 			}
 		}

-		// -------- Playables helpers (no Animator params) --------
 		private void PlayOverlayOnce(Transform owner)
 		{
 			if (overlayClip == null) return;
--- a/Assets/AI/Demon/Turet.prefab
+++ b/Assets/AI/Demon/Turet.prefab
@@ -1,232 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &115880
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 417168}
-  - component: {fileID: 3365858}
-  - component: {fileID: 2323612}
-  - component: {fileID: 13662188}
-  - component: {fileID: 7020133711031364094}
-  - component: {fileID: -8194063383422297065}
-  - component: {fileID: 1536958584606674588}
-  - component: {fileID: 8851143338676511289}
-  m_Layer: 26
-  m_Name: Turet
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
-  m_IsActive: 1
--- !u!4 &417168
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.8250632, y: -7.1673625e-17, z: 3.2278929}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8411050209285398990}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3365858
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  m_Mesh: {fileID: 4300002, guid: dee9a5e3bb15d7740bde7911bad2ba90, type: 3}
--- !u!23 &2323612
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 30d0d8732a281d349a5abc48f8171e83, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!136 &13662188
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.58
-  m_Height: 2.64
-  m_Direction: 1
-  m_Center: {x: 0.0078576505, y: 1.0259461, z: -0.052128524}
--- !u!114 &7020133711031364094
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 906d915677721914dbe9708f218f574a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  muzzle: {fileID: 8411050209285398990}
-  fireballPrefab: {fileID: 1947871717301538, guid: 9591667a35466484096c6e63785e136c,
-    type: 3}
-  fireRate: 6
-  maxShots: 10
-  despawnDelay: 10
-  initialStaggerRange: {x: 0, y: 0.6}
-  fireRateJitter: 5
-  aimJitterDegrees: 0
-  turnSpeed: 0
-  idleSpinSpeed: 0
-  aimTolerance: 360
-  autoFindPlayer: 1
-  playerTag: Player
-  maxShootingRange: 50
-  useShootEffects: 1
-  muzzleFlashPrefab: {fileID: 1514282284419572, guid: ad259b29cbefa54479b68c8a4960565a,
-    type: 3}
-  shootSound: {fileID: 8300000, guid: f58578c3593cfcd40a4b21417e49421a, type: 3}
-  enableDebug: 1
-  showGizmos: 1
--- !u!114 &-8194063383422297065
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 06579ea47ceeddd42a05f7720c15b5de, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxHealth: 50
-  currentHealth: 0
-  destructionEffect: {fileID: 8876690725160639820, guid: c1b3da9fe585c44479dda2cd5c3a7b83,
-    type: 3}
-  destructionSound: {fileID: 8300000, guid: 3c1f8b87da670734991b73bf5c30f0af, type: 3}
-  hitSound: {fileID: 8300000, guid: 0af332725d9792840a4caa29e8991d08, type: 3}
-  damagedMaterial: {fileID: 2100000, guid: f94eea72c30ac2e45ab55894421ea48c, type: 2}
-  damagedThreshold: 0.5
-  enableDebug: 1
--- !u!114 &1536958584606674588
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 605ff11ee57b0c241a82c0c37c40c0bc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  openCloseEvents: 0
-  openCloseWindow: 0
-  selectedToolbar: 0
-  messagesListeners: []
--- !u!114 &8851143338676511289
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 115880}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 312629d966d1a40e3874daa93364e1f3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetIcon: {fileID: 8317937118480752073, guid: 82581d6c5dd5945b89394d83db5f4c8b,
-    type: 3}
--- !u!1 &6534933121460188189
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8411050209285398990}
-  m_Layer: 26
-  m_Name: Spawnpoint
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &8411050209285398990
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6534933121460188189}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 3.114, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 417168}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/AI/Demon/Turret.prefab
+++ b/Assets/AI/Demon/Turret.prefab
--- a/Assets/AI/Demon/Turret.prefab.meta
+++ b/Assets/AI/Demon/Turret.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0d20e89d7557c3b41b7ef0e6be87e319
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AI/FSM/FSM_Demon.asset
+++ b/Assets/AI/FSM/FSM_Demon.asset
@@ -164,11 +164,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: -595
-    y: 70
+    x: -335
+    y: 125
    width: 150
    height: 62
-  positionRect: {x: -595, y: 70}
+  positionRect: {x: -335, y: 125}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 0, g: 1, b: 1, a: 1}
@@ -195,14 +195,14 @@ MonoBehaviour:
    parentState: {fileID: -6568372008305276654}
    trueRect:
      serializedVersion: 2
-      x: -445
-      y: 100
+      x: -185
+      y: 155
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -445
-      y: 110
+      x: -185
+      y: 165
      width: 10
      height: 10
    selectedTrue: 0
@@ -297,11 +297,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: -560
-    y: 220
+    x: -300
+    y: 270
    width: 150
    height: 106
-  positionRect: {x: -560, y: 220}
+  positionRect: {x: -300, y: 270}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -328,14 +328,14 @@ MonoBehaviour:
    parentState: {fileID: -6144582714324757854}
    trueRect:
      serializedVersion: 2
-      x: -410
-      y: 250
+      x: -150
+      y: 300
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -410
-      y: 260
+      x: -150
+      y: 310
      width: 10
      height: 10
    selectedTrue: 0
@@ -356,14 +356,14 @@ MonoBehaviour:
    parentState: {fileID: -6144582714324757854}
    trueRect:
      serializedVersion: 2
-      x: -410
-      y: 272
+      x: -150
+      y: 322
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -410
-      y: 282
+      x: -150
+      y: 332
      width: 10
      height: 10
    selectedTrue: 0
@@ -392,14 +392,14 @@ MonoBehaviour:
    parentState: {fileID: -6144582714324757854}
    trueRect:
      serializedVersion: 2
-      x: -410
-      y: 294
+      x: -150
+      y: 344
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -410
-      y: 304
+      x: -150
+      y: 354
      width: 10
      height: 10
    selectedTrue: 0
@@ -550,11 +550,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: -285
-    y: 75
+    x: -40
+    y: 130
    width: 150
    height: 62
-  positionRect: {x: -285, y: 75}
+  positionRect: {x: -40, y: 130}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -573,14 +573,14 @@ MonoBehaviour:
    parentState: {fileID: -3177478727897100882}
    trueRect:
      serializedVersion: 2
-      x: -135
-      y: 105
+      x: 110
+      y: 160
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -135
-      y: 115
+      x: 110
+      y: 170
      width: 10
      height: 10
    selectedTrue: 0
@@ -619,11 +619,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: 0
-    y: 35
+    x: 230
+    y: 90
    width: 150
    height: 62
-  positionRect: {x: 0, y: 35}
+  positionRect: {x: 230, y: 90}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -646,14 +646,14 @@ MonoBehaviour:
    parentState: {fileID: -2904979146780567904}
    trueRect:
      serializedVersion: 2
-      x: -10
-      y: 65
+      x: 220
+      y: 120
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 150
-      y: 75
+      x: 380
+      y: 130
      width: 10
      height: 10
    selectedTrue: 0
@@ -790,11 +790,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: -285
-    y: 20
+    x: -40
+    y: 80
    width: 150
    height: 30
-  positionRect: {x: -285, y: 20}
+  positionRect: {x: -40, y: 80}
  rectWidth: 150
  editingName: 0
  nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -866,11 +866,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: -480
-    y: 480
+    x: -225
+    y: 530
    width: 150
    height: 150
-  positionRect: {x: -480, y: 480}
+  positionRect: {x: -225, y: 530}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -897,14 +897,14 @@ MonoBehaviour:
    parentState: {fileID: -312774025800194259}
    trueRect:
      serializedVersion: 2
-      x: -330
-      y: 510
+      x: -75
+      y: 560
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -330
-      y: 520
+      x: -75
+      y: 570
      width: 10
      height: 10
    selectedTrue: 0
@@ -929,14 +929,14 @@ MonoBehaviour:
    parentState: {fileID: -312774025800194259}
    trueRect:
      serializedVersion: 2
-      x: -330
-      y: 532
+      x: -75
+      y: 582
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -330
-      y: 542
+      x: -75
+      y: 592
      width: 10
      height: 10
    selectedTrue: 0
@@ -969,14 +969,14 @@ MonoBehaviour:
    parentState: {fileID: -312774025800194259}
    trueRect:
      serializedVersion: 2
-      x: -490
-      y: 554
+      x: -235
+      y: 604
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -330
-      y: 564
+      x: -75
+      y: 614
      width: 10
      height: 10
    selectedTrue: 0
@@ -1005,14 +1005,14 @@ MonoBehaviour:
    parentState: {fileID: -312774025800194259}
    trueRect:
      serializedVersion: 2
-      x: -330
-      y: 576
+      x: -75
+      y: 626
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -330
-      y: 586
+      x: -75
+      y: 636
      width: 10
      height: 10
    selectedTrue: 0
@@ -1037,14 +1037,14 @@ MonoBehaviour:
    parentState: {fileID: -312774025800194259}
    trueRect:
      serializedVersion: 2
-      x: -330
-      y: 598
+      x: -75
+      y: 648
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: -330
-      y: 608
+      x: -75
+      y: 658
      width: 10
      height: 10
    selectedTrue: 0
@@ -1091,7 +1091,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
  m_Name: FSM_Demon
  m_EditorClassIdentifier: 
-  selectedNode: {fileID: 766956384951898899}
+  selectedNode: {fileID: 2986668563461644515}
  wantConnection: 0
  connectionNode: {fileID: 0}
  showProperties: 1
@@ -1108,7 +1108,7 @@ MonoBehaviour:
  - {fileID: 9112689765763526057}
  - {fileID: 766956384951898899}
  - {fileID: 4162026404432437805}
-  panOffset: {x: -860, y: -90}
+  panOffset: {x: -600, y: -5}
  overNode: 0
  actions:
  - {fileID: 0}
@@ -1139,6 +1139,7 @@ MonoBehaviour:
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
+  - {fileID: 0}
  icon: {fileID: 0}
 --- !u!114 &117913083446138218
 MonoBehaviour:
@@ -1192,11 +1193,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: 515
-    y: 710
+    x: 745
+    y: 760
    width: 150
    height: 62
-  positionRect: {x: 515, y: 710}
+  positionRect: {x: 745, y: 760}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1215,14 +1216,14 @@ MonoBehaviour:
    parentState: {fileID: 762670965814380212}
    trueRect:
      serializedVersion: 2
-      x: 505
-      y: 740
+      x: 735
+      y: 790
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 665
-      y: 750
+      x: 895
+      y: 800
      width: 10
      height: 10
    selectedTrue: 0
@@ -1259,14 +1260,14 @@ MonoBehaviour:
  canEditName: 1
  canEditColor: 1
  isOpen: 1
-  isSelected: 1
+  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: 580
-    y: 165
+    x: 810
+    y: 220
    width: 150
    height: 62
-  positionRect: {x: 580, y: 165}
+  positionRect: {x: 810, y: 220}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1285,14 +1286,14 @@ MonoBehaviour:
    parentState: {fileID: 766956384951898899}
    trueRect:
      serializedVersion: 2
-      x: 570
-      y: 195
+      x: 800
+      y: 250
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 730
-      y: 205
+      x: 960
+      y: 260
      width: 10
      height: 10
    selectedTrue: 0
@@ -1309,6 +1310,36 @@ MonoBehaviour:
  useDecisions: 1
  parentGraph: {fileID: 11400000}
  defaultTransition: {fileID: 0}
+--- !u!114 &1848419507865303702
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 57041025c9fb3ad459fbfb7da1224d25, type: 3}
+  m_Name: Check Health > 75
+  m_EditorClassIdentifier: 
+  parentFSM: {fileID: 11400000}
+  editingName: 0
+  trueRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 10
+    height: 10
+  falseRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 10
+    height: 10
+  selectedTrue: 0
+  selectedFalse: 0
+  checkValue: 2
+  value: 75
 --- !u!114 &1913506767753201076
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -1381,11 +1412,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: 305
-    y: 710
+    x: 535
+    y: 760
    width: 150
    height: 62
-  positionRect: {x: 305, y: 710}
+  positionRect: {x: 535, y: 760}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1404,14 +1435,14 @@ MonoBehaviour:
    parentState: {fileID: 2691300596403639167}
    trueRect:
      serializedVersion: 2
-      x: 295
-      y: 740
+      x: 525
+      y: 790
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 455
-      y: 750
+      x: 685
+      y: 800
      width: 10
      height: 10
    selectedTrue: 0
@@ -1451,11 +1482,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: 50
-    y: 430
+    x: 280
+    y: 480
    width: 150
    height: 150
-  positionRect: {x: 50, y: 430}
+  positionRect: {x: 280, y: 480}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1478,14 +1509,14 @@ MonoBehaviour:
    parentState: {fileID: 2986668563461644515}
    trueRect:
      serializedVersion: 2
-      x: 40
-      y: 460
+      x: 270
+      y: 510
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 200
-      y: 470
+      x: 430
+      y: 520
      width: 10
      height: 10
    selectedTrue: 0
@@ -1510,14 +1541,14 @@ MonoBehaviour:
    parentState: {fileID: 2986668563461644515}
    trueRect:
      serializedVersion: 2
-      x: 40
-      y: 482
+      x: 270
+      y: 532
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 200
-      y: 492
+      x: 430
+      y: 542
      width: 10
      height: 10
    selectedTrue: 0
@@ -1529,14 +1560,14 @@ MonoBehaviour:
    scroolView: {x: 0, y: 0, z: 0}
    sameTargetCount: 0
  - decisions:
-    - trueValue: 0
-      decision: {fileID: -6379838510941931433}
-      isValid: 1
-      validated: 0
    - trueValue: 1
      decision: {fileID: -7938248970223304488}
      isValid: 0
      validated: 0
+    - trueValue: 0
+      decision: {fileID: 1848419507865303702}
+      isValid: 1
+      validated: 0
    trueState: {fileID: 766956384951898899}
    falseState: {fileID: 0}
    muteTrue: 0
@@ -1546,14 +1577,14 @@ MonoBehaviour:
    parentState: {fileID: 2986668563461644515}
    trueRect:
      serializedVersion: 2
-      x: 200
-      y: 504
+      x: 430
+      y: 554
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 200
-      y: 514
+      x: 430
+      y: 564
      width: 10
      height: 10
    selectedTrue: 0
@@ -1565,14 +1596,14 @@ MonoBehaviour:
    scroolView: {x: 0, y: 0, z: 0}
    sameTargetCount: 0
  - decisions:
-    - trueValue: 0
-      decision: {fileID: -6379838510941931433}
-      isValid: 1
-      validated: 0
    - trueValue: 1
      decision: {fileID: 8113515040269600600}
      isValid: 1
      validated: 0
+    - trueValue: 0
+      decision: {fileID: 1848419507865303702}
+      isValid: 1
+      validated: 0
    trueState: {fileID: 9112689765763526057}
    falseState: {fileID: 0}
    muteTrue: 0
@@ -1582,14 +1613,14 @@ MonoBehaviour:
    parentState: {fileID: 2986668563461644515}
    trueRect:
      serializedVersion: 2
-      x: 200
-      y: 526
+      x: 430
+      y: 576
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 200
-      y: 536
+      x: 430
+      y: 586
      width: 10
      height: 10
    selectedTrue: 0
@@ -1618,14 +1649,14 @@ MonoBehaviour:
    parentState: {fileID: 2986668563461644515}
    trueRect:
      serializedVersion: 2
-      x: 200
-      y: 548
+      x: 430
+      y: 598
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 200
-      y: 558
+      x: 430
+      y: 608
      width: 10
      height: 10
    selectedTrue: 0
@@ -1725,11 +1756,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: 575
-    y: 375
+    x: 805
+    y: 425
    width: 150
    height: 30
-  positionRect: {x: 575, y: 375}
+  positionRect: {x: 805, y: 425}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1748,14 +1779,14 @@ MonoBehaviour:
    parentState: {fileID: 4162026404432437805}
    trueRect:
      serializedVersion: 2
-      x: 650
-      y: 390
+      x: 880
+      y: 440
      width: 0
      height: 0
    falseRect:
      serializedVersion: 2
-      x: 650
-      y: 390
+      x: 880
+      y: 440
      width: 0
      height: 0
    selectedTrue: 0
@@ -1921,11 +1952,11 @@ MonoBehaviour:
  isSelected: 0
  nodeRect:
    serializedVersion: 2
-    x: 585
-    y: -5
+    x: 815
+    y: 65
    width: 150
    height: 62
-  positionRect: {x: 585, y: -5}
+  positionRect: {x: 815, y: 65}
  rectWidth: 150
  editingName: 1
  nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1944,14 +1975,14 @@ MonoBehaviour:
    parentState: {fileID: 9112689765763526057}
    trueRect:
      serializedVersion: 2
-      x: 575
-      y: 25
+      x: 805
+      y: 95
      width: 10
      height: 10
    falseRect:
      serializedVersion: 2
-      x: 735
-      y: 35
+      x: 965
+      y: 105
      width: 10
      height: 10
    selectedTrue: 0
--- a/Assets/AI/FSM/FSM_Giant.asset
+++ b/Assets/AI/FSM/FSM_Giant.asset
@@ -134,7 +134,13 @@ MonoBehaviour:
    type: 3}
  shieldDuration: 10
  animatorBlockingBool: IsBlocking
-  enableDebug: 1
+  startClip: {fileID: 0}
+  keepClip: {fileID: 0}
+  endClip: {fileID: 0}
+  clipSpeed: 1
+  crossfadeTime: 0.12
+  playEndOnEarlyExit: 1
+  debugLogs: 0
 --- !u!114 &-7016508256595524775
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -206,7 +212,7 @@ MonoBehaviour:
  - decisions:
    - trueValue: 1
      decision: {fileID: 5430119601860107240}
-      isValid: 1
+      isValid: 0
      validated: 0
    - trueValue: 1
      decision: {fileID: 117913083446138218}
@@ -260,13 +266,14 @@ MonoBehaviour:
  executionType: -1
  editingName: 0
  meteorPrefab: {fileID: 0}
-  decalPrefab: {fileID: 1743301284569550, guid: ad2ab49d0a2a17148bd51c93d977bdbc,
-    type: 3}
-  spawnHeight: 40
+  behindBossDistance: 3
+  aboveBossHeight: 8
  castDelay: 1.5
-  groundMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
+  targetTag: Player
+  overlayClip: {fileID: 0}
+  overlaySpeed: 1
+  overlayFadeIn: 0.1
+  overlayFadeOut: 0.1
  enableDebug: 1
 --- !u!114 &-6379838510941931433
 MonoBehaviour:
@@ -659,7 +666,7 @@ MonoBehaviour:
  - decisions:
    - trueValue: 0
      decision: {fileID: 7927421991537792917}
-      isValid: 1
+      isValid: 0
      validated: 0
    trueState: {fileID: -312774025800194259}
    falseState: {fileID: 0}
@@ -778,8 +785,17 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 4294967295
  animatorBlockingBool: IsBlocking
-  backPreferenceMultiplier: 2
-  maxSpawnAttempts: 12
+  perTurretAdjustmentTries: 10
+  maxAngleAdjust: 25
+  maxRadiusAdjust: 1
+  minSeparationBetweenTurrets: 1.5
+  globalStartAngleRandom: 1
+  perTurretAngleJitter: 10
+  perTurretRadiusJitter: 0.75
+  overlayClip: {fileID: 0}
+  overlaySpeed: 1
+  overlayFadeIn: 0.1
+  overlayFadeOut: 0.1
  enableDebug: 1
  showGizmos: 1
 --- !u!114 &-712571192746352845