diff --git a/client/Assets/Game/Driver.unity b/client/Assets/Game/Driver.unity
index e68b2e4..3139a17 100644
--- a/client/Assets/Game/Driver.unity
+++ b/client/Assets/Game/Driver.unity
@@ -1609,6 +1609,8 @@ PlayableDirector:
     value: {fileID: 5972941309607553105}
   - key: {fileID: -4750574827767443630, guid: 027ab2f5cd4c9d244bad141e093bf72d, type: 2}
     value: {fileID: 1645380337361164335}
+  - key: {fileID: 2359698281133013487, guid: cb6c8d06eac093640ad53452562b8da0, type: 2}
+    value: {fileID: 1645380337361164335}
   m_ExposedReferences:
     m_References: []
 --- !u!212 &89448210413526911
diff --git a/client/Assets/Game/Scripts/ECS/Component/PauseComponent.cs b/client/Assets/Game/Scripts/ECS/Component/PauseComponent.cs
index 1aa26e6..b0eee7c 100644
--- a/client/Assets/Game/Scripts/ECS/Component/PauseComponent.cs
+++ b/client/Assets/Game/Scripts/ECS/Component/PauseComponent.cs
@@ -36,7 +36,7 @@ namespace Game
         {
             entity.pause.PauseTime = pauseTime;
             entity.pause.PausePreFrame = 1;
-            Util.EntityStopMove(entity.ID());
+            EntityStopMove(entity.ID());
         }
     }
 }
\ No newline at end of file
diff --git a/client/Assets/Game/Scripts/ECS/Component/SkillComponent.cs b/client/Assets/Game/Scripts/ECS/Component/SkillComponent.cs
index c2085b4..a3a87b5 100644
--- a/client/Assets/Game/Scripts/ECS/Component/SkillComponent.cs
+++ b/client/Assets/Game/Scripts/ECS/Component/SkillComponent.cs
@@ -12,7 +12,7 @@ public class SkillComponent : IComponent
     public Vector3 CastDir; //技能释放方向
 
     public HashSet<Tuple<int, int>> HitSet = new HashSet<Tuple<int, int>>(); //技能命中信息 生命周期为一次技能释放
-    public List<SkillHitInfo> HitInfo = new List<SkillHitInfo>(); //受击命中信息 结算时清空
+    public Queue<SkillHitInfo> HitInfo = new Queue<SkillHitInfo>(); //技能命中结算队列
 }
 
 namespace Game
@@ -63,6 +63,7 @@ namespace Game
         {
             var skill = entity.skill;
             skill.HitSet.Clear();
+            skill.HitInfo.Clear();
             skill.IsRunning = false;
             skill.SkillId.Value = "";
         }
diff --git a/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs b/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs
index 13d7f88..769ebd9 100644
--- a/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs
+++ b/client/Assets/Game/Scripts/ECS/System/SettleSystem.cs
@@ -34,21 +34,22 @@ public class SettleSystem : IExecuteSystem, IInitializeSystem
 
     private static void SettleSkill(SkillComponent skill)
     {
-        foreach (var hitInfo in skill.HitInfo)
+        while (skill.HitInfo.Count > 0)
         {
-            SettleHit(hitInfo);
+            if (SettleHit(skill.HitInfo.Dequeue()))
+            {
+                break;
+            }
         }
-
-        skill.HitInfo.Clear();
     }
 
-    private static void SettleHit(SkillHitInfo hitInfo)
+    private static bool SettleHit(SkillHitInfo hitInfo)
     {
         var entity = Util.GetEntity(hitInfo.OwnerEntity);
         var target = Util.GetEntity(hitInfo.HitEntity);
         if (entity == null || target == null)
         {
-            return;
+            return false;
         }
 
         var damageResult = SettleDamage(hitInfo, entity, target); //伤害结算
@@ -67,6 +68,8 @@ public class SettleSystem : IExecuteSystem, IInitializeSystem
         SettleShake(hitLevel, entity, target); //抖动
         SettleScale(flowSpeed, entity, target); //抖动
         SettleGlobalEffect(target, pauseTime); //全局特效
+
+        return true;
     }
 
     public struct SettleDamageResult
diff --git a/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs b/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs
index c310d2f..d319a48 100644
--- a/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs
+++ b/client/Assets/Game/Scripts/Timeline/TimelineClip/ClipAttack.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace Game
@@ -18,6 +19,7 @@ namespace Game
     public class ClipAttack : TimelineClipBase
     {
         private AttackClip _mRealAsset;
+        private List<GameEntity> _tempTargetList = new List<GameEntity>();
 
         public override void OnEnter()
         {
@@ -29,23 +31,33 @@ namespace Game
             var param = _mRealAsset.template;
             var skill = Owner.skill;
             var castShape = param.Shape;
-            var castDir = Owner.skill.CastDir;
+            var castDir = skill.CastDir;
             castDir = new Vector3(castDir.x, 0, castDir.z); //忽略y
             var rot = Quaternion.FromToRotation(Vector3.right, castDir);
             var castPos = rot * castShape.Offset + Owner.Pos();
 
             Util.DrawShape(castShape, castPos, castDir, Color.red);
+            _tempTargetList.Clear();
             Util.ForeachEnemies(Owner.Team(), target =>
             {
                 var isHit = UtilShape.IsOverlap(castShape, castPos, castDir, target.hp.HitBoxShape, target.Pos());
                 if (!isHit) return;
 
-                var targetID = target.ID();
-
-                var hitKey = new Tuple<int, int>(targetID, param.hitId);
-                if (Owner.skill.HitSet.Contains(hitKey)) return;
-                Owner.skill.HitSet.Add(hitKey);
+                var hitKey = new Tuple<int, int>(target.ID(), param.hitId);
+                if (skill.HitSet.Contains(hitKey)) return;
+                skill.HitSet.Add(hitKey);
 
+                _tempTargetList.Add(target);
+            });
+            _tempTargetList.Sort((l, r) =>
+            {
+                var lRank = GetRank(param.hitDirType, l, castPos, castDir);
+                var rRank = GetRank(param.hitDirType, r, castPos, castDir);
+                return lRank.CompareTo(rRank);
+            });
+            foreach (var target in _tempTargetList)
+            {
+                var targetID = target.ID();
                 var skillHitInfo = new SkillHitInfo
                 {
                     SkillParam = param,
@@ -68,12 +80,41 @@ namespace Game
                     }
                 }
 
-                target.skill.HitInfo.Add(skillHitInfo);
-            });
+                skill.HitInfo.Enqueue(skillHitInfo);
+            }
+        }
+
+        private float GetRank(EHitDirType hitDirType, GameEntity target, Vector3 castPos, Vector3 castDir)
+        {
+            //小在前
+            var targetPos = target.Pos();
+            var targetDir = targetPos - castPos;
+            switch (hitDirType)
+            {
+                case EHitDirType.Center:
+                    //按距离
+                    return Vector3.Distance(targetPos, castPos);
+                case EHitDirType.Backward:
+                    //从前往后
+                    return -Vector3.Dot(targetDir, castDir);
+                case EHitDirType.Forward:
+                    //从后往前
+                    return Vector3.Dot(targetDir, castDir);
+                case EHitDirType.Clockwise:
+                    //顺时针
+                    return -GetRankRot(castDir, targetDir);
+                case EHitDirType.CounterClockwise:
+                    //逆时针
+                    return GetRankRot(castDir, targetDir);
+            }
+
+            return 0;
         }
 
-        public override void OnLeave()
+        private float GetRankRot(Vector3 castDir, Vector3 targetDir)
         {
+            var rot = Quaternion.FromToRotation(-castDir, Vector3.right);
+            return Util.Vec3ToRot(rot * targetDir) * (Owner.move.IsRight ? 1 : -1);
         }
     }
 }
\ No newline at end of file
diff --git a/client/Assets/Game/Scripts/Util/ElementBuff/UtilBuffEffect.cs b/client/Assets/Game/Scripts/Util/ElementBuff/UtilBuffEffect.cs
index 0282599..24e51cb 100644
--- a/client/Assets/Game/Scripts/Util/ElementBuff/UtilBuffEffect.cs
+++ b/client/Assets/Game/Scripts/Util/ElementBuff/UtilBuffEffect.cs
@@ -34,7 +34,7 @@ namespace Game
 
             var owner = buffData.Entity;
             var target = buffData.Target;
-            target.skill.HitInfo.Add(new SkillHitInfo()
+            owner.skill.HitInfo.Enqueue(new SkillHitInfo()
             {
                 SkillParam = new AttackBehaviour()
                 {
diff --git a/client/Assets/Game/Scripts/_Define/GameSetting.cs b/client/Assets/Game/Scripts/_Define/GameSetting.cs
index e4b3691..1a35f6e 100644
--- a/client/Assets/Game/Scripts/_Define/GameSetting.cs
+++ b/client/Assets/Game/Scripts/_Define/GameSetting.cs
@@ -6,7 +6,7 @@ namespace Game
     public static class GameSetting
     {
         public static Dictionary<EFunctionKey, KeyCode> KeyMap;
-        public static bool IsDebugDraw = false;
+        public static bool IsDebugDraw = true;
         public static bool IsMasterControllable = true;
         public static bool IsShowExtraHeadBar = true;
         public static void Load()
diff --git a/client/Assets/Resources/Prefab/Level/level0001.prefab b/client/Assets/Resources/Prefab/Level/level0001.prefab
index 0187f62..96d0b3d 100644
--- a/client/Assets/Resources/Prefab/Level/level0001.prefab
+++ b/client/Assets/Resources/Prefab/Level/level0001.prefab
@@ -323,6 +323,94 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mDoorType: 1
+--- !u!1 &820446197743577381
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7051568489210796646}
+  - component: {fileID: 124780855250359509}
+  m_Layer: 0
+  m_Name: monster (6)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7051568489210796646
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 820446197743577381}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &124780855250359509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 820446197743577381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
+--- !u!1 &833112619111499895
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2639339667194678871}
+  - component: {fileID: 9059759296859999780}
+  m_Layer: 0
+  m_Name: monster (15)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2639339667194678871
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 833112619111499895}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 15
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9059759296859999780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 833112619111499895}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &903921038123887939
 GameObject:
   m_ObjectHideFlags: 0
@@ -548,6 +636,50 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   monsterIndex: 1
+--- !u!1 &1645937796368443934
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6383246433336685382}
+  - component: {fileID: 499696428120679257}
+  m_Layer: 0
+  m_Name: monster (14)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6383246433336685382
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1645937796368443934}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &499696428120679257
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1645937796368443934}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &1674865804504301320
 GameObject:
   m_ObjectHideFlags: 0
@@ -645,6 +777,50 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &2001209240675388842
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1831680379991147377}
+  - component: {fileID: 7014062360574818259}
+  m_Layer: 0
+  m_Name: monster (17)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1831680379991147377
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2001209240675388842}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 17
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7014062360574818259
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2001209240675388842}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &2263708530650525913
 GameObject:
   m_ObjectHideFlags: 0
@@ -912,6 +1088,50 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &2835420801249242399
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 392922265967267527}
+  - component: {fileID: 8891852785782382745}
+  m_Layer: 0
+  m_Name: monster (10)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &392922265967267527
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2835420801249242399}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8891852785782382745
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2835420801249242399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &2930189880318040089
 GameObject:
   m_ObjectHideFlags: 0
@@ -943,6 +1163,50 @@ Transform:
   m_Father: {fileID: 7911837490568511560}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3097421859174804938
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3653704524651073579}
+  - component: {fileID: 8800601865972378871}
+  m_Layer: 0
+  m_Name: monster (12)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3653704524651073579
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3097421859174804938}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 12
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8800601865972378871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3097421859174804938}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &3322088359762901533
 GameObject:
   m_ObjectHideFlags: 0
@@ -1036,7 +1300,7 @@ Light:
   m_UseViewFrustumForShadowCasterCull: 1
   m_ShadowRadius: 0
   m_ShadowAngle: 0
---- !u!1 &4179569557032210602
+--- !u!1 &3454582798489044688
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1044,43 +1308,43 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 7245657965012165154}
-  - component: {fileID: 1167191193877471693}
+  - component: {fileID: 904084196461139688}
+  - component: {fileID: 5146955971337870548}
   m_Layer: 0
-  m_Name: DL
+  m_Name: monster (21)
   m_TagString: Untagged
-  m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0}
+  m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &7245657965012165154
+  m_IsActive: 1
+--- !u!4 &904084196461139688
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4179569557032210602}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -5.5, y: 0.1, z: -6.3}
+  m_GameObject: {fileID: 3454582798489044688}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 8407921548730574457}
-  m_RootOrder: 9
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1167191193877471693
+--- !u!114 &5146955971337870548
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4179569557032210602}
+  m_GameObject: {fileID: 3454582798489044688}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b1e7ac5f9ec463e41a8abb1028405fad, type: 3}
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mDoorType: 9
---- !u!1 &4335303288400887109
+  monsterIndex: 1
+--- !u!1 &3603809104442839247
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1088,43 +1352,43 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2397929541402937586}
-  - component: {fileID: 7151899505870402061}
+  - component: {fileID: 6961841349743758285}
+  - component: {fileID: 5970410547458948734}
   m_Layer: 0
-  m_Name: monster (3)
+  m_Name: monster (20)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2397929541402937586
+--- !u!4 &6961841349743758285
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4335303288400887109}
+  m_GameObject: {fileID: 3603809104442839247}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 422411188377810511}
-  m_RootOrder: 3
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7151899505870402061
+--- !u!114 &5970410547458948734
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4335303288400887109}
+  m_GameObject: {fileID: 3603809104442839247}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   monsterIndex: 1
---- !u!1 &5052526491818760455
+--- !u!1 &3882468393574330613
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1132,30 +1396,206 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1784459812190924856}
+  - component: {fileID: 127597943276612794}
+  - component: {fileID: 8984420135911583675}
   m_Layer: 0
-  m_Name: Root
+  m_Name: monster (19)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1784459812190924856
+--- !u!4 &127597943276612794
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5052526491818760455}
+  m_GameObject: {fileID: 3882468393574330613}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 6.4, y: 1, z: 6.4}
-  m_Children:
-  - {fileID: 7883283899298408081}
-  - {fileID: 2348771779804280774}
-  - {fileID: 6973800445906493150}
-  - {fileID: 2931358948847706986}
-  - {fileID: 2732470458225957396}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 19
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8984420135911583675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3882468393574330613}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
+--- !u!1 &4179569557032210602
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7245657965012165154}
+  - component: {fileID: 1167191193877471693}
+  m_Layer: 0
+  m_Name: DL
+  m_TagString: Untagged
+  m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &7245657965012165154
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4179569557032210602}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -5.5, y: 0.1, z: -6.3}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8407921548730574457}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1167191193877471693
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4179569557032210602}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b1e7ac5f9ec463e41a8abb1028405fad, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mDoorType: 9
+--- !u!1 &4335303288400887109
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2397929541402937586}
+  - component: {fileID: 7151899505870402061}
+  m_Layer: 0
+  m_Name: monster (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2397929541402937586
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4335303288400887109}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7151899505870402061
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4335303288400887109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
+--- !u!1 &4413633426578109005
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3105924592235677034}
+  - component: {fileID: 5558571063741278493}
+  m_Layer: 0
+  m_Name: monster (8)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3105924592235677034
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4413633426578109005}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5558571063741278493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4413633426578109005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
+--- !u!1 &5052526491818760455
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1784459812190924856}
+  m_Layer: 0
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1784459812190924856
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5052526491818760455}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 6.4, y: 1, z: 6.4}
+  m_Children:
+  - {fileID: 7883283899298408081}
+  - {fileID: 2348771779804280774}
+  - {fileID: 6973800445906493150}
+  - {fileID: 2931358948847706986}
+  - {fileID: 2732470458225957396}
   - {fileID: 883334253768352109}
   m_Father: {fileID: 5066421462634478987}
   m_RootOrder: 0
@@ -1269,6 +1709,50 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   monsterIndex: 1
+--- !u!1 &5236075180407415693
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3443031236245500399}
+  - component: {fileID: 4681882432856854749}
+  m_Layer: 0
+  m_Name: monster (18)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3443031236245500399
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236075180407415693}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 18
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4681882432856854749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236075180407415693}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &5330121818569687434
 GameObject:
   m_ObjectHideFlags: 0
@@ -1385,6 +1869,50 @@ Transform:
   m_Father: {fileID: 5140293461109843289}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5614706636612010028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 685669791816438064}
+  - component: {fileID: 6925932580201590323}
+  m_Layer: 0
+  m_Name: monster (16)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &685669791816438064
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5614706636612010028}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 16
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6925932580201590323
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5614706636612010028}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &5689269145705488046
 GameObject:
   m_ObjectHideFlags: 0
@@ -1460,6 +1988,50 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mDoorType: 11
+--- !u!1 &6308055718708685756
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7646009793070917071}
+  - component: {fileID: 258106047707606160}
+  m_Layer: 0
+  m_Name: monster (7)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7646009793070917071
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6308055718708685756}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &258106047707606160
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6308055718708685756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &6657864524495967524
 GameObject:
   m_ObjectHideFlags: 0
@@ -1676,6 +2248,138 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mDoorType: 10
+--- !u!1 &7550724658839868648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3747276180954723958}
+  - component: {fileID: 1007674122980439685}
+  m_Layer: 0
+  m_Name: monster (13)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3747276180954723958
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7550724658839868648}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 13
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1007674122980439685
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7550724658839868648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
+--- !u!1 &7592245537496284035
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3160668081212505656}
+  - component: {fileID: 4094413860044225932}
+  m_Layer: 0
+  m_Name: monster (9)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3160668081212505656
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7592245537496284035}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4094413860044225932
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7592245537496284035}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
+--- !u!1 &7761011532425807027
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6669551691886736968}
+  - component: {fileID: 22354172606968166}
+  m_Layer: 0
+  m_Name: monster (23)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6669551691886736968
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7761011532425807027}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 23
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &22354172606968166
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7761011532425807027}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &8314003230930499602
 GameObject:
   m_ObjectHideFlags: 0
@@ -1787,6 +2491,24 @@ Transform:
   - {fileID: 2397929541402937586}
   - {fileID: 7799729231951818604}
   - {fileID: 2920886121554341743}
+  - {fileID: 7051568489210796646}
+  - {fileID: 7646009793070917071}
+  - {fileID: 3105924592235677034}
+  - {fileID: 3160668081212505656}
+  - {fileID: 392922265967267527}
+  - {fileID: 3811352961974579198}
+  - {fileID: 3653704524651073579}
+  - {fileID: 3747276180954723958}
+  - {fileID: 6383246433336685382}
+  - {fileID: 2639339667194678871}
+  - {fileID: 685669791816438064}
+  - {fileID: 1831680379991147377}
+  - {fileID: 3443031236245500399}
+  - {fileID: 127597943276612794}
+  - {fileID: 6961841349743758285}
+  - {fileID: 904084196461139688}
+  - {fileID: 5785928731226178727}
+  - {fileID: 6669551691886736968}
   m_Father: {fileID: 8635726989057596408}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1807,6 +2529,94 @@ MonoBehaviour:
   attackTimes: 10
   attackerMelee: 3
   attackerLongRange: 3
+--- !u!1 &8740548331864831933
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3811352961974579198}
+  - component: {fileID: 5198060645298355323}
+  m_Layer: 0
+  m_Name: monster (11)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3811352961974579198
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8740548331864831933}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5198060645298355323
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8740548331864831933}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
+--- !u!1 &8785933414420534560
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5785928731226178727}
+  - component: {fileID: 3941421210701566486}
+  m_Layer: 0
+  m_Name: monster (22)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5785928731226178727
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8785933414420534560}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 422411188377810511}
+  m_RootOrder: 22
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3941421210701566486
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8785933414420534560}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b459a9d7bd65b13498cc164d79e23ae6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  monsterIndex: 1
 --- !u!1 &9158364837453729364
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable b/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable
index 874cf53..46c70ae 100644
--- a/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable
+++ b/client/Assets/Resources/Timeline/skill_hero01_long_attack01.playable
@@ -721,12 +721,13 @@ MonoBehaviour:
     pauseTime: 20
     hitId: 0
     hitType: 0
-    Type: 2
+    hitDirType: 3
+    Type: 1
     Offset: {x: 0, y: 0, z: 0}
     Height: 2
-    SizeX: 10
+    SizeX: 2
     SizeY: 2
-    Radius: 4
+    Radius: 50
     Angle: 180
 --- !u!114 &5178577764301111608
 MonoBehaviour:
diff --git a/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs b/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs
index e37452e..160405a 100644
--- a/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs
+++ b/client/Assets/TimelineCustom/Attack/AttackBehaviour.cs
@@ -15,6 +15,7 @@ public class AttackBehaviour : PlayableBehaviour
     [Rename("卡帧时间(帧)")] public int pauseTime;
     [Rename("命中id")] public int hitId; //同一hitId视为一段伤害
     [Rename("伤害类型")] public EHitType hitType;
+    [Rename("攻击方向")] public EHitDirType hitDirType;
     [Rename("命中形状")] public EShapeType Type;
     [Rename("偏移(格)")] public Vector3 Offset;
     [Rename("高度(格)")] public float Height;