diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
index c55d301..10ccbeb 100644
--- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
@@ -31,6 +31,12 @@
             var texture3 = GD.Load<Texture2D>("res://addons/dungeonShooting_plugin/Mark.svg");
             AddCustomType("ActivityMark", "Node2D", script3, texture3);
             
+            var script4 = GD.Load<Script>("res://src/framework/map/mark/EnemyMark.cs");
+            AddCustomType("EnemyMark", "Node2D", script4, texture3);
+            
+            var script5 = GD.Load<Script>("res://src/framework/map/mark/WeaponMark.cs");
+            AddCustomType("WeaponMark", "Node2D", script5, texture3);
+            
             dock = GD.Load<PackedScene>("res://addons/dungeonShooting_plugin/Automation.tscn").Instantiate<Control>();
             AddControlToDock(DockSlot.LeftUr, dock);
         }
@@ -39,27 +45,16 @@
         {
             RemoveCustomType("ActivityObjectTemplate");
             RemoveCustomType("DungeonRoomTemplate");
+            RemoveCustomType("ActivityMark");
+            RemoveCustomType("EnemyMark");
+            RemoveCustomType("WeaponMark");
+
             if (dock != null)
             {
                 RemoveControlFromDocks(dock);
                 dock.Free();
             }
         }
-
-        /*public override bool Handles(Object @object)
-        {
-            if (@object is Node node)
-            {
-                node.
-                GD.Print("node: " + (node.GetScript() == activityObjectTemplateScript));
-                /*GD.Print("---------------------- 1: " + objectTemplate.Name);
-                var sp = new Sprite2D();
-                sp.Name = "Sprite2D";
-                objectTemplate.AddChild(sp);
-                sp.Owner = objectTemplate.Owner;#1#
-            }
-            return base.Handles(@object);
-        }*/
     }
 
 }
diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor.tscn
index cbe5556..a45d0e3 100644
--- a/DungeonShooting_Godot/prefab/map/RoomDoor.tscn
+++ b/DungeonShooting_Godot/prefab/map/RoomDoor.tscn
@@ -28,7 +28,7 @@
 }]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_xgcls"]
-size = Vector2(26, 26)
+size = Vector2(32, 16)
 
 [node name="RoomDoor" type="Node"]
 script = ExtResource("1_8es7a")
@@ -41,8 +41,10 @@
 
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
 material = SubResource("ShaderMaterial_f8vun")
-scale = Vector2(0.40625, 0.40625)
+position = Vector2(0, -16)
+scale = Vector2(0.5, 0.25)
 sprite_frames = SubResource("SpriteFrames_ugstb")
 
 [node name="Collision" type="CollisionShape2D" parent="."]
+position = Vector2(0, -16)
 shape = SubResource("RectangleShape2D_xgcls")
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon.tscn
index be0e85f..7ad9039 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon.tscn
@@ -58,6 +58,7 @@
 
 [node name="Weapon" type="Node"]
 script = ExtResource("1_dtam7")
+collision_layer = 4
 
 [node name="ShadowSprite" type="Sprite2D" parent="."]
 z_index = -1
@@ -68,25 +69,19 @@
 position = Vector2(0.4, -2.6)
 scale = Vector2(0.8, 0.8)
 
-[node name="WeaponBody" type="Area2D" parent="."]
-collision_layer = 4
-collision_mask = 0
-
-[node name="OriginPoint" type="Marker2D" parent="WeaponBody"]
+[node name="OriginPoint" type="Marker2D" parent="."]
 position = Vector2(-3.6, -1.1)
 
-[node name="ShellPoint" type="Marker2D" parent="WeaponBody"]
+[node name="ShellPoint" type="Marker2D" parent="."]
 position = Vector2(-2.6, -2.6)
 
-[node name="FirePoint" type="Marker2D" parent="WeaponBody"]
+[node name="FirePoint" type="Marker2D" parent="."]
 position = Vector2(7.4, -1.1)
 
-[node name="Collision" type="CollisionShape2D" parent="WeaponBody"]
+[node name="Collision" type="CollisionShape2D" parent="."]
 position = Vector2(0.6, 0.2)
 shape = SubResource("RectangleShape2D_3p5jk")
 
-[node name="Collision" type="CollisionShape2D" parent="."]
-
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 libraries = {
 "": SubResource("AnimationLibrary_trkjd")
diff --git a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet.tscn b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet.tscn
index d506a80..7f1d347 100644
--- a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet.tscn
@@ -35,6 +35,7 @@
 
 [node name="Bullet" type="Node"]
 script = ExtResource("1_nwypj")
+collision_layer = 2
 collision_mask = 1
 
 [node name="ShadowSprite" type="Sprite2D" parent="."]
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
index fe05f58..38f57cb 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_luio1"]
 [ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="1_wwejn"]
-[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_mgxag"]
+[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_2xk8s"]
 
 [node name="Room1" type="TileMap"]
 tile_set = ExtResource("1_luio1")
@@ -10,30 +10,45 @@
 layer_0/tile_data = PackedInt32Array(-65539, 131072, 2, 196605, 131072, 7, 262141, 0, 8, 327677, 0, 8, 393213, 0, 8, 458749, 131072, 2, -65538, 131072, 2, 196606, 131072, 7, 262142, 0, 8, 327678, 0, 8, 393214, 0, 8, 458750, 131072, 2, -65537, 131072, 2, 196607, 131072, 7, 262143, 0, 8, 327679, 0, 8, 393215, 0, 8, 458751, 131072, 2, -131072, 131072, 2, 131072, 131072, 7, 196608, 0, 8, 262144, 0, 8, 327680, 0, 8, 393216, 131072, 2, -131071, 131072, 2, 131073, 131072, 7, 196609, 0, 8, 262145, 0, 8, 327681, 0, 8, 393217, 131072, 2, -131070, 131072, 2, 131074, 131072, 7, 393218, 131072, 2, -131069, 131072, 2, 131075, 131072, 7, 393219, 131072, 2, -131068, 131072, 2, 131076, 131072, 7, 393220, 131072, 2, -131067, 196608, 2, -65531, 196608, 3, 5, 196608, 3, 65541, 196608, 3, 131077, 196608, 7, 393221, 131072, 2, -131066, 0, 8, -65530, 0, 8, 6, 0, 8, 65542, 0, 8, 131078, 0, 8, 393222, 131072, 2, -131065, 0, 8, -65529, 0, 8, 7, 0, 8, 65543, 0, 8, 131079, 0, 8, 393223, 131072, 2, -131064, 0, 8, -65528, 0, 8, 8, 0, 8, 65544, 0, 8, 131080, 0, 8, 393224, 131072, 2, -131063, 65536, 3, -65527, 65536, 3, 9, 65536, 3, 65545, 65536, 3, 131081, 65536, 3, 393225, 851968, 2, -327690, 196608, 4, -262154, 196608, 3, -196618, 196608, 3, -131082, 196608, 3, -65546, 196608, 3, -10, 196608, 3, 65526, 196608, 3, 131062, 196608, 3, 196598, 196608, 3, 262134, 196608, 3, 327670, 196608, 3, 393206, 196608, 3, 458742, 720896, 2, -327689, 131072, 7, -262153, 0, 8, -196617, 0, 8, -131081, 0, 8, -65545, 0, 8, -9, 0, 8, 65527, 0, 8, 131063, 0, 8, 196599, 0, 8, 262135, 0, 8, 327671, 0, 8, 393207, 0, 8, 458743, 131072, 2, -327688, 131072, 7, -262152, 0, 8, -196616, 0, 8, -131080, 0, 8, -65544, 0, 8, -8, 0, 8, 65528, 0, 8, 131064, 0, 8, 196600, 0, 8, 262136, 0, 8, 327672, 0, 8, 393208, 0, 8, 458744, 131072, 2, -327687, 131072, 7, -262151, 0, 8, -196615, 0, 8, -131079, 0, 8, -65543, 0, 8, -7, 0, 8, 65529, 0, 8, 131065, 0, 8, 196601, 0, 8, 262137, 0, 8, 327673, 0, 8, 393209, 0, 8, 458745, 131072, 2, -327686, 131072, 7, -262150, 0, 8, -196614, 0, 8, -131078, 0, 8, -65542, 65536, 2, -6, 65536, 3, 65530, 65536, 3, 131066, 65536, 3, 196602, 65536, 7, 262138, 0, 8, 327674, 0, 8, 393210, 0, 8, 458746, 131072, 2, -327685, 131072, 7, -262149, 0, 8, -196613, 0, 8, -131077, 0, 8, -65541, 131072, 2, 196603, 131072, 7, 262139, 0, 8, 327675, 0, 8, 393211, 0, 8, 458747, 131072, 2, -327684, 131072, 7, -262148, 0, 8, -196612, 0, 8, -131076, 0, 8, -65540, 131072, 2, 196604, 131072, 7, 262140, 0, 8, 327676, 0, 8, 393212, 0, 8, 458748, 131072, 2, -327683, 131072, 7, -262147, 0, 8, -196611, 0, 8, -131075, 0, 8, -327682, 131072, 7, -262146, 0, 8, -196610, 0, 8, -131074, 0, 8, -327681, 131072, 7, -262145, 0, 8, -196609, 0, 8, -131073, 0, 8, -393216, 131072, 7, -327680, 0, 8, -262144, 0, 8, -196608, 0, 8, -393215, 131072, 7, -327679, 0, 8, -262143, 0, 8, -196607, 0, 8, -393214, 131072, 7, -327678, 0, 8, -262142, 0, 8, -196606, 0, 8, 196610, 0, 8, 262146, 0, 8, 327682, 0, 8, -393213, 131072, 7, -327677, 0, 8, -262141, 0, 8, -196605, 0, 8, 196611, 0, 8, 262147, 0, 8, 327683, 0, 8, -393212, 131072, 7, -327676, 0, 8, -262140, 0, 8, -196604, 0, 8, 196612, 0, 8, 262148, 0, 8, 327684, 0, 8, -393211, 131072, 7, -327675, 0, 8, -262139, 0, 8, -196603, 0, 8, 196613, 0, 8, 262149, 0, 8, 327685, 0, 8, -393210, 131072, 7, -327674, 0, 8, -262138, 0, 8, -196602, 0, 8, 196614, 0, 8, 262150, 0, 8, 327686, 0, 8, -393209, 131072, 7, -327673, 0, 8, -262137, 0, 8, -196601, 0, 8, 196615, 0, 8, 262151, 0, 8, 327687, 0, 8, -393208, 131072, 7, -327672, 0, 8, -262136, 0, 8, -196600, 0, 8, 196616, 0, 8, 262152, 0, 8, 327688, 0, 8, -393207, 65536, 4, -327671, 65536, 3, -262135, 65536, 3, -196599, 65536, 3, 196617, 65536, 3, 262153, 65536, 3, 327689, 65536, 3)
 script = ExtResource("1_wwejn")
 
-[node name="ActivityMark" type="Node2D" parent="."]
-position = Vector2(-121, -57)
-script = ExtResource("3_mgxag")
+[node name="EnemyMark" type="Node2D" parent="."]
+position = Vector2(0, -56)
+script = ExtResource("3_2xk8s")
+Weapon1Id = "0002"
+Weapon1Ammo = 15
+Weapon2Id = "0003"
+Weapon2Ammo = 15
 Type = 3
 ItemId = "0001"
 Layer = 1
 
-[node name="ActivityMark2" type="Node2D" parent="."]
-position = Vector2(103, -57)
-script = ExtResource("3_mgxag")
+[node name="EnemyMark2" type="Node2D" parent="."]
+position = Vector2(0, 70)
+script = ExtResource("3_2xk8s")
+Weapon1Id = "0002"
+Weapon1Ammo = 15
+Weapon2Id = "0003"
+Weapon2Ammo = 15
 Type = 3
 ItemId = "0001"
 Layer = 1
+DelayTime = 2.0
 
-[node name="ActivityMark3" type="Node2D" parent="."]
-position = Vector2(-122, 72)
-script = ExtResource("3_mgxag")
+[node name="EnemyMark3" type="Node2D" parent="."]
+position = Vector2(114, -54)
+script = ExtResource("3_2xk8s")
+Weapon1Id = "0004"
 Type = 3
 ItemId = "0001"
 Layer = 1
+WaveNumber = 2
 
-[node name="ActivityMark4" type="Node2D" parent="."]
-position = Vector2(102, 71)
-script = ExtResource("3_mgxag")
+[node name="EnemyMark4" type="Node2D" parent="."]
+position = Vector2(114, 72)
+script = ExtResource("3_2xk8s")
+Weapon1Id = "0001"
+Weapon1Ammo = 45
 Type = 3
 ItemId = "0001"
 Layer = 1
+WaveNumber = 2
+DelayTime = 2.0
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
index 726c877..2d8bf86 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://hbgdhf84okk6"]
+[gd_scene load_steps=5 format=3 uid="uid://hbgdhf84okk6"]
 
 [ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="1_hg3w8"]
 [ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_u22xh"]
-[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_teday"]
+[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_tgvyr"]
+[ext_resource type="Script" path="res://src/framework/map/mark/WeaponMark.cs" id="4_x0odx"]
 
 [node name="Room2" type="TileMap"]
 tile_set = ExtResource("1_u22xh")
@@ -10,9 +11,29 @@
 layer_0/tile_data = PackedInt32Array(589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, 589839, 0, 8, 524303, 0, 8, 458767, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, 65549, 0, 8, 13, 0, 8, 65548, 0, 8, 12, 0, 8, 65547, 0, 8, 11, 0, 8, 65546, 0, 8, 10, 0, 8, 589833, 0, 8, 524297, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, 589832, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, 589831, 0, 8, 524295, 0, 8, 458759, 0, 8, 393223, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, 589830, 0, 8, 524294, 0, 8, 458758, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 589826, 0, 8, 524290, 0, 8, 458754, 0, 8, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, 589825, 0, 8, 524289, 0, 8, 458753, 0, 8, 393217, 0, 8, 327681, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, 589824, 0, 8, 524288, 0, 8, 458752, 0, 8, 393216, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, 131071, 196608, 3, 65535, 196608, 3, -1, 196608, 4, -65536, 131072, 7, -65535, 131072, 7, 196607, 196608, 3, 262143, 196608, 3, 327679, 196608, 3, 393215, 196608, 3, 458751, 196608, 3, 524287, 196608, 3, 589823, 196608, 3, 655359, 196608, 3, 655361, 131072, 2, 655360, 131072, 2, 720895, 720896, 2, -65534, 131072, 7, 655362, 131072, 2, 655363, 131072, 2, 655364, 131072, 2, 655365, 131072, 2, 655366, 131072, 2, -65529, 131072, 7, 655367, 131072, 2, -65528, 131072, 7, 655368, 131072, 2, -65527, 131072, 7, 655369, 131072, 2, -65526, 131072, 7, -65525, 131072, 7, -65524, 131072, 7, -65523, 131072, 7, -65522, 131072, 7, 655374, 131072, 2, -65521, 131072, 7, 655375, 131072, 2, -65520, 131072, 7, 655376, 131072, 2, 3, 65536, 3, 65539, 65536, 3, -65533, 65536, 4, 131075, 65536, 3, 196611, 65536, 3, 262147, 65536, 3, 327683, 65536, 3, 393219, 65536, 7, 393220, 131072, 7, 393221, 131072, 7, 393222, 196608, 7, 327686, 196608, 3, 262150, 196608, 3, 196614, 196608, 3, 131078, 196608, 3, 65542, 196608, 3, 6, 196608, 3, -65530, 196608, 4, 17, 65536, 3, 65553, 65536, 3, -65519, 65536, 4, 131089, 65536, 3, 196625, 65536, 3, 262161, 65536, 3, 327697, 65536, 3, 393233, 65536, 3, 458769, 65536, 3, 655377, 851968, 2, 655373, 720896, 2, 589837, 196608, 3, 524301, 196608, 3, 458765, 196608, 3, 393229, 196608, 3, 327693, 196608, 3, 262157, 196608, 3, 196621, 196608, 3, 131085, 196608, 2, 131084, 131072, 2, 131083, 131072, 2, 131082, 65536, 2, 196618, 65536, 3, 262154, 65536, 3, 327690, 65536, 3, 393226, 65536, 3, 458762, 65536, 3, 524298, 65536, 3, 589834, 65536, 3, 655370, 851968, 2, 524305, 65536, 3, 589841, 65536, 3)
 script = ExtResource("1_hg3w8")
 
-[node name="ActivityMark" type="Node2D" parent="."]
-position = Vector2(137, 72)
-script = ExtResource("3_teday")
+[node name="EnemyMark" type="Node2D" parent="."]
+position = Vector2(77, 138)
+script = ExtResource("3_tgvyr")
+Weapon1Id = "0002"
+Weapon1Ammo = 25
 Type = 3
 ItemId = "0001"
 Layer = 1
+
+[node name="EnemyMark2" type="Node2D" parent="."]
+position = Vector2(190, 15)
+script = ExtResource("3_tgvyr")
+Weapon1Id = "0003"
+Weapon1Ammo = 15
+Type = 3
+ItemId = "0001"
+Layer = 1
+
+[node name="WeaponMark" type="Node2D" parent="."]
+position = Vector2(136, 71)
+script = ExtResource("4_x0odx")
+CurrAmmon = 30
+ResidueAmmo = 30
+Type = 4
+ItemId = "0001"
+WaveNumber = 2
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn
index 8826069..6b12ae3 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://c83qc7utiy3pd"]
+[gd_scene load_steps=5 format=3 uid="uid://c83qc7utiy3pd"]
 
 [ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="1_n5qca"]
 [ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_ngr66"]
-[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_ifjg3"]
+[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_jwvnp"]
+[ext_resource type="Script" path="res://src/framework/map/mark/WeaponMark.cs" id="4_6je2e"]
 
 [node name="Room3" type="TileMap"]
 tile_set = ExtResource("1_ngr66")
@@ -10,9 +11,40 @@
 layer_0/tile_data = PackedInt32Array(196613, 196608, 4, 262149, 196608, 3, 524293, 196608, 3, 589829, 196608, 3, 655365, 196608, 3, 720901, 196608, 3, 786437, 196608, 3, 1048581, 196608, 3, 1114117, 196608, 3, 1179653, 196608, 3, 1245189, 196608, 3, 1310725, 196608, 3, 196614, 131072, 7, 262150, 0, 8, 524294, 0, 8, 589830, 0, 8, 655366, 0, 8, 720902, 0, 8, 786438, 0, 8, 1048582, 0, 8, 1114118, 0, 8, 1179654, 0, 8, 1245190, 0, 8, 1310726, 0, 8, 196615, 131072, 7, 262151, 0, 8, 524295, 0, 8, 589831, 0, 8, 655367, 0, 8, 720903, 0, 8, 786439, 0, 8, 1048583, 0, 8, 1114119, 0, 8, 1179655, 0, 8, 1245191, 0, 8, 1310727, 0, 8, 196616, 131072, 7, 262152, 0, 8, 327688, 0, 8, 393224, 0, 8, 458760, 0, 8, 524296, 0, 8, 589832, 0, 8, 655368, 0, 8, 720904, 0, 8, 786440, 0, 8, 851976, 0, 8, 917512, 0, 8, 983048, 0, 8, 1048584, 0, 8, 1114120, 0, 8, 1179656, 0, 8, 1245192, 0, 8, 1310728, 0, 8, 196617, 131072, 7, 262153, 0, 8, 327689, 0, 8, 393225, 0, 8, 458761, 65536, 2, 524297, 65536, 3, 589833, 65536, 3, 655369, 65536, 3, 720905, 65536, 7, 786441, 0, 8, 851977, 0, 8, 917513, 0, 8, 983049, 65536, 2, 1048585, 65536, 3, 1114121, 65536, 3, 1179657, 65536, 3, 1245193, 65536, 7, 1310729, 0, 8, 196618, 131072, 7, 262154, 0, 8, 327690, 0, 8, 393226, 0, 8, 458762, 131072, 2, 720906, 131072, 7, 786442, 0, 8, 851978, 0, 8, 917514, 0, 8, 983050, 131072, 2, 1245194, 131072, 7, 1310730, 0, 8, 196619, 131072, 7, 262155, 0, 8, 327691, 0, 8, 393227, 0, 8, 458763, 131072, 2, 720907, 131072, 7, 786443, 0, 8, 851979, 0, 8, 917515, 0, 8, 983051, 131072, 2, 1245195, 131072, 7, 1310731, 0, 8, 196620, 131072, 7, 262156, 0, 8, 327692, 0, 8, 393228, 0, 8, 458764, 131072, 2, 720908, 131072, 7, 786444, 0, 8, 851980, 0, 8, 917516, 0, 8, 983052, 131072, 2, 1245196, 131072, 7, 1310732, 0, 8, 196621, 131072, 7, 262157, 0, 8, 524301, 196608, 3, 589837, 196608, 3, 655373, 196608, 3, 720909, 196608, 7, 786445, 0, 8, 1048589, 196608, 3, 1114125, 196608, 3, 1179661, 196608, 3, 1245197, 196608, 7, 1310733, 0, 8, 196622, 131072, 7, 262158, 0, 8, 524302, 0, 8, 589838, 0, 8, 655374, 0, 8, 720910, 0, 8, 786446, 0, 8, 1048590, 0, 8, 1114126, 0, 8, 1179662, 0, 8, 1245198, 0, 8, 1310734, 0, 8, 196623, 131072, 7, 262159, 0, 8, 524303, 0, 8, 589839, 0, 8, 655375, 0, 8, 720911, 0, 8, 786447, 0, 8, 1048591, 0, 8, 1114127, 0, 8, 1179663, 0, 8, 1245199, 0, 8, 1310735, 0, 8, 196624, 131072, 7, 262160, 0, 8, 327696, 0, 8, 393232, 0, 8, 458768, 0, 8, 524304, 0, 8, 589840, 0, 8, 655376, 0, 8, 720912, 0, 8, 786448, 0, 8, 851984, 0, 8, 917520, 0, 8, 983056, 0, 8, 1048592, 0, 8, 1114128, 0, 8, 1179664, 0, 8, 1245200, 0, 8, 1310736, 0, 8, 196625, 131072, 7, 262161, 0, 8, 327697, 0, 8, 393233, 0, 8, 458769, 65536, 2, 524305, 65536, 3, 589841, 65536, 3, 655377, 65536, 3, 720913, 65536, 7, 786449, 0, 8, 851985, 0, 8, 917521, 0, 8, 983057, 65536, 2, 1048593, 65536, 3, 1114129, 65536, 3, 1179665, 65536, 3, 1245201, 65536, 7, 1310737, 0, 8, 196626, 131072, 7, 262162, 0, 8, 327698, 0, 8, 393234, 0, 8, 458770, 131072, 2, 720914, 131072, 7, 786450, 0, 8, 851986, 0, 8, 917522, 0, 8, 983058, 131072, 2, 1245202, 131072, 7, 1310738, 0, 8, 196627, 131072, 7, 262163, 0, 8, 327699, 0, 8, 393235, 0, 8, 458771, 131072, 2, 720915, 131072, 7, 786451, 0, 8, 851987, 0, 8, 917523, 0, 8, 983059, 131072, 2, 1245203, 131072, 7, 1310739, 0, 8, 196628, 131072, 7, 262164, 0, 8, 327700, 0, 8, 393236, 0, 8, 458772, 131072, 2, 720916, 131072, 7, 786452, 0, 8, 851988, 0, 8, 917524, 0, 8, 983060, 131072, 2, 1245204, 131072, 7, 1310740, 0, 8, 327685, 196608, 3, 393221, 196608, 3, 458757, 196608, 3, 851973, 196608, 3, 917509, 196608, 3, 983045, 196608, 3, 1376261, 196608, 3, 1441797, 196608, 3, 1507333, 720896, 2, 327686, 0, 8, 393222, 0, 8, 458758, 0, 8, 851974, 0, 8, 917510, 0, 8, 983046, 0, 8, 1376262, 0, 8, 1441798, 0, 8, 1507334, 131072, 2, 327687, 0, 8, 393223, 0, 8, 458759, 0, 8, 851975, 0, 8, 917511, 0, 8, 983047, 0, 8, 1376263, 0, 8, 1441799, 0, 8, 1507335, 131072, 2, 1376264, 0, 8, 1441800, 0, 8, 1507336, 131072, 2, 1376265, 0, 8, 1441801, 0, 8, 1507337, 131072, 2, 1376266, 0, 8, 1441802, 0, 8, 1507338, 131072, 2, 1376267, 0, 8, 1441803, 0, 8, 1507339, 131072, 2, 1376268, 0, 8, 1441804, 0, 8, 1507340, 131072, 2, 327693, 0, 8, 393229, 0, 8, 458765, 196608, 2, 851981, 0, 8, 917517, 0, 8, 983053, 196608, 2, 1376269, 0, 8, 1441805, 0, 8, 1507341, 131072, 2, 327694, 0, 8, 393230, 0, 8, 458766, 0, 8, 851982, 0, 8, 917518, 0, 8, 983054, 0, 8, 1376270, 0, 8, 1441806, 0, 8, 1507342, 131072, 2, 327695, 0, 8, 393231, 0, 8, 458767, 0, 8, 851983, 0, 8, 917519, 0, 8, 983055, 0, 8, 1376271, 0, 8, 1441807, 0, 8, 1507343, 131072, 2, 1376272, 0, 8, 1441808, 0, 8, 1507344, 131072, 2, 1376273, 0, 8, 1441809, 0, 8, 1507345, 131072, 2, 1376274, 0, 8, 1441810, 0, 8, 1507346, 131072, 2, 1376275, 0, 8, 1441811, 0, 8, 1507347, 131072, 2, 1376276, 0, 8, 1441812, 0, 8, 1507348, 131072, 2, 196629, 131072, 7, 262165, 0, 8, 327701, 0, 8, 393237, 0, 8, 458773, 196608, 2, 524309, 196608, 3, 589845, 196608, 3, 655381, 196608, 3, 720917, 196608, 7, 786453, 0, 8, 851989, 0, 8, 917525, 0, 8, 983061, 196608, 2, 1048597, 196608, 3, 1114133, 196608, 3, 1179669, 196608, 3, 1245205, 196608, 7, 1310741, 0, 8, 1376277, 0, 8, 1441813, 0, 8, 1507349, 131072, 2, 196630, 131072, 7, 262166, 0, 8, 327702, 0, 8, 393238, 0, 8, 458774, 0, 8, 524310, 0, 8, 589846, 0, 8, 655382, 0, 8, 720918, 0, 8, 786454, 0, 8, 851990, 0, 8, 917526, 0, 8, 983062, 0, 8, 1048598, 0, 8, 1114134, 0, 8, 1179670, 0, 8, 1245206, 0, 8, 1310742, 0, 8, 1376278, 0, 8, 1441814, 0, 8, 1507350, 131072, 2, 196631, 131072, 7, 262167, 0, 8, 327703, 0, 8, 393239, 0, 8, 458775, 0, 8, 524311, 0, 8, 589847, 0, 8, 655383, 0, 8, 720919, 0, 8, 786455, 0, 8, 851991, 0, 8, 917527, 0, 8, 983063, 0, 8, 1048599, 0, 8, 1114135, 0, 8, 1179671, 0, 8, 1245207, 0, 8, 1310743, 0, 8, 1376279, 0, 8, 1441815, 0, 8, 1507351, 131072, 2, 196632, 131072, 7, 262168, 0, 8, 327704, 0, 8, 393240, 0, 8, 458776, 0, 8, 524312, 0, 8, 589848, 0, 8, 655384, 0, 8, 720920, 0, 8, 786456, 0, 8, 851992, 0, 8, 917528, 0, 8, 983064, 0, 8, 1048600, 0, 8, 1114136, 0, 8, 1179672, 0, 8, 1245208, 0, 8, 1310744, 0, 8, 1376280, 0, 8, 1441816, 0, 8, 1507352, 131072, 2, 196633, 65536, 4, 262169, 65536, 3, 327705, 65536, 3, 393241, 65536, 3, 458777, 65536, 3, 524313, 65536, 3, 589849, 65536, 3, 655385, 65536, 3, 720921, 65536, 3, 786457, 65536, 3, 851993, 65536, 3, 917529, 65536, 3, 983065, 65536, 3, 1048601, 65536, 3, 1114137, 65536, 3, 1179673, 65536, 3, 1245209, 65536, 3, 1310745, 65536, 3, 1376281, 65536, 3, 1441817, 65536, 3, 1507353, 851968, 2)
 script = ExtResource("1_n5qca")
 
-[node name="ActivityMark" type="Node2D" parent="."]
-position = Vector2(249, 216)
-script = ExtResource("3_ifjg3")
+[node name="EnemyMark" type="Node2D" parent="."]
+position = Vector2(230, 215)
+script = ExtResource("3_jwvnp")
 Type = 3
 ItemId = "0001"
 Layer = 1
+
+[node name="EnemyMark2" type="Node2D" parent="."]
+position = Vector2(261, 217)
+script = ExtResource("3_jwvnp")
+Type = 3
+ItemId = "0001"
+Layer = 1
+
+[node name="WeaponMark" type="Node2D" parent="."]
+position = Vector2(248, 160)
+script = ExtResource("4_6je2e")
+ResidueAmmo = 12
+Type = 4
+ItemId = "0002"
+
+[node name="WeaponMark2" type="Node2D" parent="."]
+position = Vector2(249, 268)
+script = ExtResource("4_6je2e")
+ResidueAmmo = 7
+Type = 4
+ItemId = "0003"
+
+[node name="EnemyMark3" type="Node2D" parent="."]
+position = Vector2(246, 215)
+script = ExtResource("3_jwvnp")
+Weapon1Id = "0001"
+Weapon1Ammo = 30
+Type = 3
+ItemId = "0001"
+Layer = 1
+WaveNumber = 2
diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index 6204fb4..a5f82e0 100644
--- a/DungeonShooting_Godot/resource/theme/mainTheme.tres
+++ b/DungeonShooting_Godot/resource/theme/mainTheme.tres
@@ -352,7 +352,7 @@
 
 [sub_resource type="ImageTexture" id="58"]
 
-[sub_resource type="Image" id="Image_umtdn"]
+[sub_resource type="Image" id="Image_jkfhj"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -362,7 +362,7 @@
 }
 
 [sub_resource type="ImageTexture" id="60"]
-image = SubResource("Image_umtdn")
+image = SubResource("Image_jkfhj")
 
 [sub_resource type="StyleBoxTexture" id="61"]
 content_margin_left = 2.0
@@ -372,7 +372,7 @@
 texture = SubResource("60")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_ih7y6"]
+[sub_resource type="Image" id="Image_5b7nt"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -382,7 +382,7 @@
 }
 
 [sub_resource type="ImageTexture" id="63"]
-image = SubResource("Image_ih7y6")
+image = SubResource("Image_5b7nt")
 
 [sub_resource type="StyleBoxTexture" id="64"]
 content_margin_left = 2.0
@@ -392,7 +392,7 @@
 texture = SubResource("63")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_qial4"]
+[sub_resource type="Image" id="Image_4krwq"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -402,7 +402,7 @@
 }
 
 [sub_resource type="ImageTexture" id="66"]
-image = SubResource("Image_qial4")
+image = SubResource("Image_4krwq")
 
 [sub_resource type="StyleBoxTexture" id="67"]
 content_margin_left = 2.0
@@ -412,7 +412,7 @@
 texture = SubResource("66")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_2020s"]
+[sub_resource type="Image" id="Image_hxb67"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -422,7 +422,7 @@
 }
 
 [sub_resource type="ImageTexture" id="69"]
-image = SubResource("Image_2020s")
+image = SubResource("Image_hxb67")
 
 [sub_resource type="StyleBoxTexture" id="70"]
 content_margin_left = 0.0
@@ -446,7 +446,7 @@
 content_margin_right = 4.0
 content_margin_bottom = 4.0
 
-[sub_resource type="Image" id="Image_m1635"]
+[sub_resource type="Image" id="Image_wwkfg"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 228, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 228, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 18, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 17, 255, 255, 255, 186, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 191, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 186, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 189, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 77, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 77, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -456,7 +456,7 @@
 }
 
 [sub_resource type="ImageTexture" id="56"]
-image = SubResource("Image_m1635")
+image = SubResource("Image_wwkfg")
 
 [sub_resource type="StyleBoxFlat" id="57"]
 content_margin_left = 6.0
diff --git a/DungeonShooting_Godot/scene/Main.tscn b/DungeonShooting_Godot/scene/Main.tscn
index 454b56d..0aaea00 100644
--- a/DungeonShooting_Godot/scene/Main.tscn
+++ b/DungeonShooting_Godot/scene/Main.tscn
@@ -24,7 +24,6 @@
 
 [node name="Main" type="Node2D"]
 script = ExtResource("3")
-Debug = true
 CursorPack = ExtResource("4")
 RoomPath = NodePath("ViewCanvas/SubViewportContainer/SubViewport/Room")
 ViewportPath = NodePath("ViewCanvas/SubViewportContainer/SubViewport")
diff --git a/DungeonShooting_Godot/src/framework/SerializeVector2.cs b/DungeonShooting_Godot/src/framework/SerializeVector2.cs
index f4e53c7..4e0a888 100644
--- a/DungeonShooting_Godot/src/framework/SerializeVector2.cs
+++ b/DungeonShooting_Godot/src/framework/SerializeVector2.cs
@@ -24,6 +24,12 @@
         X = v.X;
         Y = v.Y;
     }
+    
+    public SerializeVector2(SerializeVector2 v)
+    {
+        X = v.X;
+        Y = v.Y;
+    }
 
     public SerializeVector2()
     {
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
index 6cfe99e..6f1bc50 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
@@ -67,10 +67,21 @@
     }
 
     /// <summary>
-    /// 当前物体归属的区域
+    /// 当前物体归属的区域, 如果为 null 代表不属于任何一个区域
     /// </summary>
-    public AffiliationArea Affiliation { get; }
-    
+    public AffiliationArea Affiliation
+    {
+        get => _affiliationArea;
+        set
+        {
+            if (value != _affiliationArea)
+            {
+                _affiliationArea = value;
+                OnAffiliationChange();
+            }
+        }
+    }
+
     //组件集合
     private List<KeyValuePair<Type, Component>> _components = new List<KeyValuePair<Type, Component>>();
     //是否初始化阴影
@@ -96,32 +107,29 @@
     //标记字典
     private Dictionary<string, object> _signMap;
     
+    //开启的协程
     private List<CoroutineData> _coroutineList;
+    //模板实例
     private ActivityObjectTemplate _templateInstance;
     
+    private AffiliationArea _affiliationArea;
+    
     private static long _instanceIndex = 0;
 
     //初始化节点
     private void _InitNode(string itemId, string scenePath)
     {
-        ItemId = itemId;
-        Name = GetType().Name + (_instanceIndex++);
         //加载预制体
         var tempPrefab = ResourceManager.Load<PackedScene>(scenePath);
         if (tempPrefab == null)
         {
             throw new Exception("创建 ActivityObject 没有找到指定挂载的预制体: " + scenePath);
         }
-
-        _templateInstance = tempPrefab.Instantiate<ActivityObjectTemplate>();
-        ZIndex = _templateInstance.z_index;
-        CollisionLayer = _templateInstance.collision_layer;
-        CollisionMask = _templateInstance.collision_mask;
-        Scale = _templateInstance.scale;
-        Visible = _templateInstance.visible;
-
-        MotionMode = MotionModeEnum.Floating;
         
+        ItemId = itemId;
+        Name = GetType().Name + (_instanceIndex++);
+        
+        _templateInstance = tempPrefab.Instantiate<ActivityObjectTemplate>();
         //移动子节点
         var count = _templateInstance.GetChildCount();
         for (int i = 0; i < count; i++)
@@ -145,8 +153,18 @@
             }
         }
         
+        ZIndex = _templateInstance.z_index;
+        CollisionLayer = _templateInstance.collision_layer;
+        CollisionMask = _templateInstance.collision_mask;
+        Scale = _templateInstance.scale;
+        Visible = _templateInstance.visible;
+
+        MotionMode = MotionModeEnum.Floating;
+
         MoveController = AddComponent<MoveController>();
-        //tempNode.CallDeferred(Node.MethodName.QueueFree);
+        
+        //临时处理, 4.0 有bug, 不能销毁模板实例, 不然关闭游戏会报错!!!
+        //_templateInstance.CallDeferred(Node.MethodName.QueueFree);
     }
 
     /// <summary>
@@ -317,6 +335,21 @@
     protected virtual void DebugDraw()
     {
     }
+
+    /// <summary>
+    /// 归属区域发生改变
+    /// </summary>
+    protected virtual void OnAffiliationChange()
+    {
+    }
+
+    /// <summary>
+    /// 返回当物体 CollisionLayer 是否能与 mask 层碰撞
+    /// </summary>
+    public bool CollisionWithMask(uint mask)
+    {
+        return (CollisionLayer & mask) != 0;
+    }
     
     /// <summary>
     /// 拾起一个 node 节点, 也就是将其从场景树中移除
@@ -818,16 +851,22 @@
         }
 
         IsDestroyed = true;
-
-        OnDestroy();
         QueueFree();
+        OnDestroy();
+
         var arr = _components.ToArray();
         for (int i = 0; i < arr.Length; i++)
         {
             arr[i].Value?.Destroy();
         }
+        
+        if (Affiliation != null)
+        {
+            Affiliation.RemoveItem(this);
+        }
+        
         //临时处理, 4.0 有bug, 不能销毁模板实例, 不然关闭游戏会报错!!!
-        _templateInstance.QueueFree();
+        //_templateInstance.QueueFree();
     }
 
     /// <summary>
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs
index 84b1505..2ff215f 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Godot;
 
 public partial class ActivityObject
 {
@@ -102,7 +103,7 @@
         {
             return (T)instance;
         }
-
+        GD.PrintErr("创建实例失败, 未找到id为'" + itemId + "'的物体!");
         return null;
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/common/Utils.cs b/DungeonShooting_Godot/src/framework/common/Utils.cs
index 0e8b005..8f95edf 100644
--- a/DungeonShooting_Godot/src/framework/common/Utils.cs
+++ b/DungeonShooting_Godot/src/framework/common/Utils.cs
@@ -13,7 +13,7 @@
     
     static Utils()
     {
-        _random = new Random();
+        _random = new Random(123);
     }
     
     /// <summary>
@@ -98,6 +98,14 @@
             Mathf.Abs(start1 - start2), Mathf.Abs(end1 - end2)
         );
     }
+    
+    /// <summary>
+    /// 返回碰撞层 mask 是否会检测 layer 
+    /// </summary>
+    public static bool CollisionMaskWithLayer(uint mask, uint layer)
+    {
+        return (mask & layer) != 0;
+    }
 
     /// <summary>
     /// 使用定的 canvasItem 绘制导航区域, 注意, 该函数只能在 draw 函数中调用
diff --git a/DungeonShooting_Godot/src/framework/map/AffiliationArea.cs b/DungeonShooting_Godot/src/framework/map/AffiliationArea.cs
index 816fd60..c67ac6a 100644
--- a/DungeonShooting_Godot/src/framework/map/AffiliationArea.cs
+++ b/DungeonShooting_Godot/src/framework/map/AffiliationArea.cs
@@ -1,4 +1,6 @@
 
+using System;
+using System.Collections.Generic;
 using Godot;
 
 /// <summary>
@@ -6,9 +8,27 @@
 /// </summary>
 public partial class AffiliationArea : Area2D
 {
+    /// <summary>
+    /// 当前实例所属房间
+    /// </summary>
+    public RoomInfo RoomInfo;
+    
+    /// <summary>
+    /// 当前归属区域包含的所有物体对象
+    /// </summary>
+    private readonly HashSet<ActivityObject> _includeItems = new HashSet<ActivityObject>();
+    
+    /// <summary>
+    /// 玩家是否是第一次进入
+    /// </summary>
+    public bool IsFirstEnterFlag { get; private set; } = true;
+    
     private bool _init = false;
     
-    public void Init(Rect2 rect2)
+    /// <summary>
+    /// 根据矩形区域初始化归属区域
+    /// </summary>
+    public void Init(RoomInfo roomInfo, Rect2 rect2)
     {
         if (_init)
         {
@@ -16,6 +36,8 @@
         }
 
         _init = true;
+
+        RoomInfo = roomInfo;
         var collisionShape = new CollisionShape2D();
         collisionShape.GlobalPosition = rect2.Position + rect2.Size / 2;
         var shape = new RectangleShape2D();
@@ -25,20 +47,6 @@
         _Init();
     }
 
-    public void Init(Vector2[] polygon)
-    {
-        if (_init)
-        {
-            return;
-        }
-
-        _init = true;
-        var collisionPolygon = new CollisionPolygon2D();
-        collisionPolygon.Polygon = polygon;
-        AddChild(collisionPolygon);
-        _Init();
-    }
-
     private void _Init()
     {
         Monitoring = true;
@@ -46,9 +54,88 @@
         CollisionLayer = PhysicsLayer.None;
         CollisionMask = PhysicsLayer.Props | PhysicsLayer.Player | PhysicsLayer.Enemy;
 
-        BodyEntered += body =>
+        BodyEntered += OnBodyEntered;
+    }
+
+    /// <summary>
+    /// 将物体添加到当前所属区域中
+    /// </summary>
+    public void InsertItem(ActivityObject activityObject)
+    {
+        if (activityObject.Affiliation == this)
         {
-            GD.Print("有物体进入: " + body.Name);
-        };
+            return;
+        }
+
+        if (activityObject.Affiliation != null)
+        {
+            _includeItems.Remove(activityObject);
+        }
+        activityObject.Affiliation = this;
+        _includeItems.Add(activityObject);
+
+        //如果是玩家
+        if (activityObject == Player.Current)
+        {
+            OnPlayerEnterRoom();
+        }
+    }
+
+    /// <summary>
+    /// 将物体从当前所属区域移除
+    /// </summary>
+    public void RemoveItem(ActivityObject activityObject)
+    {
+        if (activityObject.Affiliation == null)
+        {
+            return;
+        }
+        activityObject.Affiliation = null;
+        _includeItems.Remove(activityObject);
+    }
+
+    /// <summary>
+    /// 获取该区域中物体的总数
+    /// </summary>
+    public int GetIncludeItemsCount()
+    {
+        return _includeItems.Count;
+    }
+
+    /// <summary>
+    /// 统计符合条件的数量
+    /// </summary>
+    /// <param name="handler">操作函数, 返回是否满足要求</param>
+    public int FindIncludeItemsCount(Func<ActivityObject, bool> handler)
+    {
+        var count = 0;
+        foreach (var activityObject in _includeItems)
+        {
+            if (handler(activityObject))
+            {
+                count++;
+            }
+        }
+        return count;
+    }
+    
+    private void OnBodyEntered(Node2D body)
+    {
+        if (body is ActivityObject activityObject)
+        {
+            //注意需要延时调用
+            CallDeferred(nameof(InsertItem), activityObject);
+        }
+    }
+
+    //玩家进入房间
+    private void OnPlayerEnterRoom()
+    {
+        if (IsFirstEnterFlag)
+        {
+            EventManager.EmitEvent(EventEnum.OnPlayerFirstEnterRoom, RoomInfo);
+            IsFirstEnterFlag = false;
+        }
+        EventManager.EmitEvent(EventEnum.OnPlayerEnterRoom, RoomInfo);
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/DoorNavigationInfo.cs b/DungeonShooting_Godot/src/framework/map/DoorNavigationInfo.cs
index ddb58e8..21651c2 100644
--- a/DungeonShooting_Godot/src/framework/map/DoorNavigationInfo.cs
+++ b/DungeonShooting_Godot/src/framework/map/DoorNavigationInfo.cs
@@ -6,19 +6,35 @@
 /// </summary>
 public class DoorNavigationInfo
 {
-    public DoorNavigationInfo(NavigationRegion2D navigationNode, NavigationPolygonData navigationData)
+    public DoorNavigationInfo(RoomDoorInfo doorInfo, NavigationPolygonData openNavigationData, NavigationPolygonData closeNavigationData)
     {
-        NavigationNode = navigationNode;
-        NavigationData = navigationData;
+        DoorInfo = doorInfo;
+        OpenNavigationData = openNavigationData;
+        CloseNavigationData = closeNavigationData;
     }
 
     /// <summary>
-    /// 导航区域节点
+    /// 绑定的门对象
     /// </summary>
-    public NavigationRegion2D NavigationNode;
+    public RoomDoorInfo DoorInfo;
+    
+    /// <summary>
+    /// 门开启时导航区域节点
+    /// </summary>
+    public NavigationRegion2D OpenNavigationNode;
+    
+    /// <summary>
+    /// 门关闭时导航区域节点
+    /// </summary>
+    public NavigationRegion2D CloseNavigationNode;
 
     /// <summary>
-    /// 导航形状数据
+    /// 门开启时导航形状数据
     /// </summary>
-    public NavigationPolygonData NavigationData;
+    public NavigationPolygonData OpenNavigationData;
+    
+    /// <summary>
+    /// 门关闭时导航形状数据
+    /// </summary>
+    public NavigationPolygonData CloseNavigationData;
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
index 9c26209..649704a 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
@@ -27,7 +27,7 @@
     /// <summary>
     /// 是否启用编辑模式
     /// </summary>
-    [Export(PropertyHint.None, "是否启用编辑模式")]
+    [Export]
     public bool EnableEdit = false;
     
 #if TOOLS
@@ -541,7 +541,7 @@
                     }
                     else
                     {
-                        DrawCircle(result.Exception.Point * GenerateDungeon.TileCellSize, 10, Colors.Red);
+                        DrawCircle(result.Exception.Point * GameConfig.TileCellSize, 10, Colors.Red);
                     }
                 }
             }
@@ -735,6 +735,7 @@
     //触发保存操作
     private void TriggerSave()
     {
+        //如果没有找到对应的场景文件，则不保存
         if (!File.Exists(RoomTileDir + Name + ".tscn"))
         {
             return;
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
index b0d7553..aafafa9 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
@@ -1,7 +1,5 @@
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using Godot;
 
 /// <summary>
@@ -40,19 +38,7 @@
     private readonly List<NavigationPolygonData> _polygonDataList = new List<NavigationPolygonData>();
 
     //连接门的导航区域
-    private readonly List<DoorNavigationItem> _connectNavigationItemList = new List<DoorNavigationItem>();
-
-    private class DoorNavigationItem
-    {
-        public NavigationPolygonData NavigationPolygonData;
-        public RoomDoorInfo DoorInfo;
-
-        public DoorNavigationItem(NavigationPolygonData navigationPolygonData, RoomDoorInfo doorInfo)
-        {
-            NavigationPolygonData = navigationPolygonData;
-            DoorInfo = doorInfo;
-        }
-    }
+    private readonly List<DoorNavigationInfo> _connectNavigationItemList = new List<DoorNavigationInfo>();
     
     //----------------------------------------------------
     
@@ -120,7 +106,10 @@
                 activityMark.GetParent().RemoveChild(activityMark);
                 var pos = activityMark.GlobalPosition - offset;
                 _tileRoot.AddChild(activityMark);
+                activityMark.Visible = false;
                 activityMark.GlobalPosition = roomInfo.GetWorldPosition() + pos;
+                activityMark.Visible = false;
+                activityMark.SetActive(false);
             }
             roomInfo.ActivityMarks.AddRange(activityMarks);
             
@@ -166,26 +155,26 @@
                     switch (doorDir1)
                     {
                         case DoorDirection.E:
-                            rect.Size = new Vector2(rect.Size.X, GenerateDungeon.CorridorWidth);
+                            rect.Size = new Vector2(rect.Size.X, GameConfig.CorridorWidth);
                             FullHorizontalAisle(config, rect);
                             FullHorizontalAisleLeft(config, rect, doorInfo);
                             FullHorizontalAisleRight(config, rect, doorInfo.ConnectDoor);
                             break;
                         case DoorDirection.W:
-                            rect.Size = new Vector2(rect.Size.X, GenerateDungeon.CorridorWidth);
+                            rect.Size = new Vector2(rect.Size.X, GameConfig.CorridorWidth);
                             FullHorizontalAisle(config, rect);
                             FullHorizontalAisleLeft(config, rect, doorInfo.ConnectDoor);
                             FullHorizontalAisleRight(config, rect, doorInfo);
                             break;
                         
                         case DoorDirection.S:
-                            rect.Size = new Vector2(GenerateDungeon.CorridorWidth, rect.Size.Y);
+                            rect.Size = new Vector2(GameConfig.CorridorWidth, rect.Size.Y);
                             FullVerticalAisle(config, rect);
                             FullVerticalAisleUp(config, rect, doorInfo);
                             FullVerticalAisleDown(config, rect, doorInfo.ConnectDoor);
                             break;
                         case DoorDirection.N:
-                            rect.Size = new Vector2(GenerateDungeon.CorridorWidth, rect.Size.Y);
+                            rect.Size = new Vector2(GameConfig.CorridorWidth, rect.Size.Y);
                             FullVerticalAisle(config, rect);
                             FullVerticalAisleUp(config, rect, doorInfo.ConnectDoor);
                             FullVerticalAisleDown(config, rect, doorInfo);
@@ -209,15 +198,15 @@
                                 doorInfo.OriginPosition.X,
                                 doorInfo.OriginPosition.Y,
                                 doorInfo.Cross.X - doorInfo.OriginPosition.X,
-                                GenerateDungeon.CorridorWidth
+                                GameConfig.CorridorWidth
                             );
                             break;
                         case DoorDirection.W: //←
                             rect = new Rect2(
-                                doorInfo.Cross.X + GenerateDungeon.CorridorWidth,
+                                doorInfo.Cross.X + GameConfig.CorridorWidth,
                                 doorInfo.Cross.Y,
-                                doorInfo.OriginPosition.X - (doorInfo.Cross.X + GenerateDungeon.CorridorWidth),
-                                GenerateDungeon.CorridorWidth
+                                doorInfo.OriginPosition.X - (doorInfo.Cross.X + GameConfig.CorridorWidth),
+                                GameConfig.CorridorWidth
                             );
                             break;
                         case DoorDirection.S: //↓
@@ -225,7 +214,7 @@
                             rect = new Rect2(
                                 doorInfo.OriginPosition.X,
                                 doorInfo.OriginPosition.Y,
-                                GenerateDungeon.CorridorWidth,
+                                GameConfig.CorridorWidth,
                                 doorInfo.Cross.Y - doorInfo.OriginPosition.Y
                             );
                             break;
@@ -233,9 +222,9 @@
                             dir1 = 1;
                             rect = new Rect2(
                                 doorInfo.Cross.X,
-                                doorInfo.Cross.Y + GenerateDungeon.CorridorWidth,
-                                GenerateDungeon.CorridorWidth,
-                                doorInfo.OriginPosition.Y - (doorInfo.Cross.Y + GenerateDungeon.CorridorWidth)
+                                doorInfo.Cross.Y + GameConfig.CorridorWidth,
+                                GameConfig.CorridorWidth,
+                                doorInfo.OriginPosition.Y - (doorInfo.Cross.Y + GameConfig.CorridorWidth)
                             );
                             break;
                         default:
@@ -250,16 +239,16 @@
                                 doorInfo.ConnectDoor.OriginPosition.X,
                                 doorInfo.ConnectDoor.OriginPosition.Y,
                                 doorInfo.Cross.X - doorInfo.ConnectDoor.OriginPosition.X,
-                                GenerateDungeon.CorridorWidth
+                                GameConfig.CorridorWidth
                             );
                             break;
                         case DoorDirection.W: //←
                             rect2 = new Rect2(
-                                doorInfo.Cross.X + GenerateDungeon.CorridorWidth,
+                                doorInfo.Cross.X + GameConfig.CorridorWidth,
                                 doorInfo.Cross.Y,
                                 doorInfo.ConnectDoor.OriginPosition.X -
-                                (doorInfo.Cross.X + GenerateDungeon.CorridorWidth),
-                                GenerateDungeon.CorridorWidth
+                                (doorInfo.Cross.X + GameConfig.CorridorWidth),
+                                GameConfig.CorridorWidth
                             );
                             break;
                         case DoorDirection.S: //↓
@@ -267,7 +256,7 @@
                             rect2 = new Rect2(
                                 doorInfo.ConnectDoor.OriginPosition.X,
                                 doorInfo.ConnectDoor.OriginPosition.Y,
-                                GenerateDungeon.CorridorWidth,
+                                GameConfig.CorridorWidth,
                                 doorInfo.Cross.Y - doorInfo.ConnectDoor.OriginPosition.Y
                             );
                             break;
@@ -275,10 +264,10 @@
                             dir2 = 1;
                             rect2 = new Rect2(
                                 doorInfo.Cross.X,
-                                doorInfo.Cross.Y + GenerateDungeon.CorridorWidth,
-                                GenerateDungeon.CorridorWidth,
+                                doorInfo.Cross.Y + GameConfig.CorridorWidth,
+                                GameConfig.CorridorWidth,
                                 doorInfo.ConnectDoor.OriginPosition.Y -
-                                (doorInfo.Cross.Y + GenerateDungeon.CorridorWidth)
+                                (doorInfo.Cross.Y + GameConfig.CorridorWidth)
                             );
                             break;
                         default:
@@ -287,7 +276,7 @@
                     }
 
                     FillRect(AisleFloorMapLayer, config.Floor, doorInfo.Cross + Vector2.One,
-                        new Vector2(GenerateDungeon.CorridorWidth - 2, GenerateDungeon.CorridorWidth - 2));
+                        new Vector2(GameConfig.CorridorWidth - 2, GameConfig.CorridorWidth - 2));
 
                     //墙壁, 0横向, 1纵向
                     if (dir1 == 0)
@@ -320,50 +309,50 @@
                         (doorDir2 == DoorDirection.N && doorDir1 == DoorDirection.E))
                     {
                         FillRect(TopMapLayer, config.OUT_RT,
-                            doorInfo.Cross + new Vector2(0, GenerateDungeon.CorridorWidth - 1),
+                            doorInfo.Cross + new Vector2(0, GameConfig.CorridorWidth - 1),
                             Vector2.One);
-                        FillRect(TopMapLayer, config.IN_RT, doorInfo.Cross + new Vector2(GenerateDungeon.CorridorWidth - 1, 0),
+                        FillRect(TopMapLayer, config.IN_RT, doorInfo.Cross + new Vector2(GameConfig.CorridorWidth - 1, 0),
                             Vector2.One);
-                        FillRect(MiddleMapLayer, config.T, doorInfo.Cross, new Vector2(GenerateDungeon.CorridorWidth - 1, 1));
-                        FillRect(TopMapLayer, config.R, doorInfo.Cross + new Vector2(GenerateDungeon.CorridorWidth - 1, 1),
-                            new Vector2(1, GenerateDungeon.CorridorWidth - 1));
+                        FillRect(MiddleMapLayer, config.T, doorInfo.Cross, new Vector2(GameConfig.CorridorWidth - 1, 1));
+                        FillRect(TopMapLayer, config.R, doorInfo.Cross + new Vector2(GameConfig.CorridorWidth - 1, 1),
+                            new Vector2(1, GameConfig.CorridorWidth - 1));
                     }
                     else if ((doorDir1 == DoorDirection.E && doorDir2 == DoorDirection.S) || //→↓
                              (doorDir2 == DoorDirection.E && doorDir1 == DoorDirection.S))
                     {
                         FillRect(MiddleMapLayer, config.OUT_RB, doorInfo.Cross, Vector2.One);
                         FillRect(TopMapLayer, config.IN_RB,
-                            doorInfo.Cross + new Vector2(GenerateDungeon.CorridorWidth - 1,
-                                GenerateDungeon.CorridorWidth - 1),
+                            doorInfo.Cross + new Vector2(GameConfig.CorridorWidth - 1,
+                                GameConfig.CorridorWidth - 1),
                             Vector2.One);
-                        FillRect(TopMapLayer, config.R, doorInfo.Cross + new Vector2(GenerateDungeon.CorridorWidth - 1, 0),
-                            new Vector2(1, GenerateDungeon.CorridorWidth - 1));
-                        FillRect(TopMapLayer, config.B, doorInfo.Cross + new Vector2(0, GenerateDungeon.CorridorWidth - 1),
-                            new Vector2(GenerateDungeon.CorridorWidth - 1, 1));
+                        FillRect(TopMapLayer, config.R, doorInfo.Cross + new Vector2(GameConfig.CorridorWidth - 1, 0),
+                            new Vector2(1, GameConfig.CorridorWidth - 1));
+                        FillRect(TopMapLayer, config.B, doorInfo.Cross + new Vector2(0, GameConfig.CorridorWidth - 1),
+                            new Vector2(GameConfig.CorridorWidth - 1, 1));
                     }
                     else if ((doorDir1 == DoorDirection.S && doorDir2 == DoorDirection.W) || //↓←
                              (doorDir2 == DoorDirection.S && doorDir1 == DoorDirection.W))
                     {
                         FillRect(MiddleMapLayer, config.OUT_LB,
-                            doorInfo.Cross + new Vector2(GenerateDungeon.CorridorWidth - 1, 0), Vector2.One);
-                        FillRect(TopMapLayer, config.IN_LB, doorInfo.Cross + new Vector2(0, GenerateDungeon.CorridorWidth - 1),
+                            doorInfo.Cross + new Vector2(GameConfig.CorridorWidth - 1, 0), Vector2.One);
+                        FillRect(TopMapLayer, config.IN_LB, doorInfo.Cross + new Vector2(0, GameConfig.CorridorWidth - 1),
                             Vector2.One);
-                        FillRect(TopMapLayer, config.L, doorInfo.Cross, new Vector2(1, GenerateDungeon.CorridorWidth - 1));
-                        FillRect(TopMapLayer, config.B, doorInfo.Cross + new Vector2(1, GenerateDungeon.CorridorWidth - 1),
-                            new Vector2(GenerateDungeon.CorridorWidth - 1, 1));
+                        FillRect(TopMapLayer, config.L, doorInfo.Cross, new Vector2(1, GameConfig.CorridorWidth - 1));
+                        FillRect(TopMapLayer, config.B, doorInfo.Cross + new Vector2(1, GameConfig.CorridorWidth - 1),
+                            new Vector2(GameConfig.CorridorWidth - 1, 1));
                     }
                     else if ((doorDir1 == DoorDirection.W && doorDir2 == DoorDirection.N) || //←↑
                              (doorDir2 == DoorDirection.W && doorDir1 == DoorDirection.N))
                     {
                         FillRect(TopMapLayer, config.OUT_LT,
-                            doorInfo.Cross + new Vector2(GenerateDungeon.CorridorWidth - 1,
-                                GenerateDungeon.CorridorWidth - 1),
+                            doorInfo.Cross + new Vector2(GameConfig.CorridorWidth - 1,
+                                GameConfig.CorridorWidth - 1),
                             Vector2.One);
                         FillRect(TopMapLayer, config.IN_LT, doorInfo.Cross, Vector2.One);
                         FillRect(MiddleMapLayer, config.T, doorInfo.Cross + new Vector2(1, 0),
-                            new Vector2(GenerateDungeon.CorridorWidth - 1, 1));
+                            new Vector2(GameConfig.CorridorWidth - 1, 1));
                         FillRect(TopMapLayer, config.L, doorInfo.Cross + new Vector2(0, 1),
-                            new Vector2(1, GenerateDungeon.CorridorWidth - 1));
+                            new Vector2(1, GameConfig.CorridorWidth - 1));
                     }
 
                     //在房间墙上开洞
@@ -435,6 +424,7 @@
         }
     }
 
+    //横向过道
     private void FullHorizontalAisle(AutoTileConfig config, Rect2 rect)
     {
         FillRect(AisleFloorMapLayer, config.Floor, rect.Position + new Vector2(0, 1), rect.Size - new Vector2(0, 2));
@@ -442,6 +432,7 @@
         FillRect(TopMapLayer, config.B, rect.Position + new Vector2(0, rect.Size.Y - 1), new Vector2(rect.Size.X, 1));
     }
 
+    //纵向过道
     private void FullVerticalAisle(AutoTileConfig config, Rect2 rect)
     {
         FillRect(AisleFloorMapLayer, config.Floor, rect.Position + new Vector2(1, 0), rect.Size - new Vector2(2, 0));
@@ -461,19 +452,25 @@
         }
         else
         {
-            FillRect(TopMapLayer, config.OUT_LB, rect.Position + new Vector2(-1, 0), Vector2.One);
+            ClearRect(TopMapLayer, rect.Position + new Vector2(-1, 0), Vector2.One);
+            FillRect(MiddleMapLayer, config.OUT_LB, rect.Position + new Vector2(-1, 0), Vector2.One);
             FillRect(TopMapLayer, config.OUT_LT, rect.Position + new Vector2(-1, 3), Vector2.One);
             
             FillRect(FloorMapLayer, config.Floor, rect.Position + new Vector2(-1, 1), new Vector2(1, rect.Size.Y - 2));
             //生成门的导航区域
-            var x = rect.Position.X * GenerateDungeon.TileCellSize;
-            var y = rect.Position.Y * GenerateDungeon.TileCellSize;
+            var x = rect.Position.X * GameConfig.TileCellSize;
+            var y = rect.Position.Y * GameConfig.TileCellSize;
+            
+            var op1 = new SerializeVector2(x - GameConfig.TileCellSize * 1.5f, y + GameConfig.TileCellSize * 1.5f);
+            var op2 = new SerializeVector2(x + GameConfig.TileCellSize * 0.5f, y + GameConfig.TileCellSize * 1.5f);
+            var op3 = new SerializeVector2(x + GameConfig.TileCellSize * 0.5f, y + GameConfig.TileCellSize * 2.5f);
+            var op4 = new SerializeVector2(x - GameConfig.TileCellSize * 1.5f, y + GameConfig.TileCellSize * 2.5f);
             AddDoorNavigation(
-                doorInfo,
-                new SerializeVector2(x - GenerateDungeon.TileCellSize * 1.5f, y + GenerateDungeon.TileCellSize * 1.5f),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 0.5f, y + GenerateDungeon.TileCellSize * 1.5f),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 0.5f, y + GenerateDungeon.TileCellSize * 2.5f),
-                new SerializeVector2(x - GenerateDungeon.TileCellSize * 1.5f, y + GenerateDungeon.TileCellSize * 2.5f)
+                doorInfo, op1, op2, op3, op4,
+                new SerializeVector2(op1),
+                new SerializeVector2(op1.X + GameConfig.TileCellSize, op2.Y),
+                new SerializeVector2(op1.X + GameConfig.TileCellSize, op3.Y),
+                new SerializeVector2(op4)
             );
         }
     }
@@ -489,19 +486,25 @@
         }
         else
         {
-            FillRect(TopMapLayer, config.OUT_RB, rect.Position + new Vector2(rect.Size.X, 0), Vector2.One);
+            ClearRect(TopMapLayer, rect.Position + new Vector2(rect.Size.X, 0), Vector2.One);
+            FillRect(MiddleMapLayer, config.OUT_RB, rect.Position + new Vector2(rect.Size.X, 0), Vector2.One);
             FillRect(TopMapLayer, config.OUT_RT, rect.Position + new Vector2(rect.Size.X, 3), Vector2.One);
             
             FillRect(FloorMapLayer, config.Floor, rect.Position + new Vector2(rect.Size.X, 1), new Vector2(1, rect.Size.Y - 2));
             //生成门的导航区域
-            var x = rect.Position.X * GenerateDungeon.TileCellSize;
-            var y = rect.Position.Y * GenerateDungeon.TileCellSize;
+            var x = rect.Position.X * GameConfig.TileCellSize;
+            var y = rect.Position.Y * GameConfig.TileCellSize;
+            
+            var op1 = new SerializeVector2(x - GameConfig.TileCellSize * 1.5f + (rect.Size.X + 1) * GameConfig.TileCellSize, y + GameConfig.TileCellSize * 1.5f);
+            var op2 = new SerializeVector2(x + GameConfig.TileCellSize * 0.5f + (rect.Size.X + 1) * GameConfig.TileCellSize, y + GameConfig.TileCellSize * 1.5f);
+            var op3 = new SerializeVector2(x + GameConfig.TileCellSize * 0.5f + (rect.Size.X + 1) * GameConfig.TileCellSize, y + GameConfig.TileCellSize * 2.5f);
+            var op4 = new SerializeVector2(x - GameConfig.TileCellSize * 1.5f + (rect.Size.X + 1) * GameConfig.TileCellSize, y + GameConfig.TileCellSize * 2.5f);
             AddDoorNavigation(
-                doorInfo,
-                new SerializeVector2(x - GenerateDungeon.TileCellSize * 1.5f + (rect.Size.X + 1) * GenerateDungeon.TileCellSize, y + GenerateDungeon.TileCellSize * 1.5f),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 0.5f + (rect.Size.X + 1) * GenerateDungeon.TileCellSize, y + GenerateDungeon.TileCellSize * 1.5f),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 0.5f + (rect.Size.X + 1) * GenerateDungeon.TileCellSize, y + GenerateDungeon.TileCellSize * 2.5f),
-                new SerializeVector2(x - GenerateDungeon.TileCellSize * 1.5f + (rect.Size.X + 1) * GenerateDungeon.TileCellSize, y + GenerateDungeon.TileCellSize * 2.5f)
+                doorInfo, op1, op2, op3, op4,
+                new SerializeVector2(op2.X - GameConfig.TileCellSize, op1.Y),
+                new SerializeVector2(op2),
+                new SerializeVector2(op3),
+                new SerializeVector2(op2.X - GameConfig.TileCellSize, op4.Y)
             );
         }
     }
@@ -523,14 +526,19 @@
             
             FillRect(FloorMapLayer, config.Floor, rect.Position + new Vector2(1, -1), new Vector2(rect.Size.X - 2, 1));
             //生成门的导航区域
-            var x = rect.Position.X * GenerateDungeon.TileCellSize;
-            var y = rect.Position.Y * GenerateDungeon.TileCellSize;
+            var x = rect.Position.X * GameConfig.TileCellSize;
+            var y = rect.Position.Y * GameConfig.TileCellSize;
+            
+            var op1 = new SerializeVector2(x + GameConfig.TileCellSize * 1.5f, y - GameConfig.TileCellSize * 1.5f);
+            var op2 = new SerializeVector2(x + GameConfig.TileCellSize * 2.5f, y - GameConfig.TileCellSize * 1.5f);
+            var op3 = new SerializeVector2(x + GameConfig.TileCellSize * 2.5f, y + GameConfig.TileCellSize * 0.5f);
+            var op4 = new SerializeVector2(x + GameConfig.TileCellSize * 1.5f, y + GameConfig.TileCellSize * 0.5f);
             AddDoorNavigation(
-                doorInfo,
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 1.5f, y - GenerateDungeon.TileCellSize * 1.5f),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 2.5f, y - GenerateDungeon.TileCellSize * 1.5f),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 2.5f, y + GenerateDungeon.TileCellSize * 0.5f),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 1.5f, y + GenerateDungeon.TileCellSize * 0.5f)
+                doorInfo, op1, op2, op3, op4,
+                new SerializeVector2(op1),
+                new SerializeVector2(op2),
+                new SerializeVector2(op3.X, op1.Y + GameConfig.TileCellSize),
+                new SerializeVector2(op4.X, op1.Y + GameConfig.TileCellSize)
             );
         }
     }
@@ -551,27 +559,46 @@
             
             FillRect(FloorMapLayer, config.Floor, rect.Position + new Vector2(1, rect.Size.Y), new Vector2(rect.Size.X - 2, 1));
             //生成门的导航区域
-            var x = rect.Position.X * GenerateDungeon.TileCellSize;
-            var y = rect.Position.Y * GenerateDungeon.TileCellSize;
+            var x = rect.Position.X * GameConfig.TileCellSize;
+            var y = rect.Position.Y * GameConfig.TileCellSize;
+            
+            var op1 = new SerializeVector2(x + GameConfig.TileCellSize * 1.5f, y - GameConfig.TileCellSize * 1.5f + (rect.Size.Y + 1) * GameConfig.TileCellSize);
+            var op2 = new SerializeVector2(x + GameConfig.TileCellSize * 2.5f, y - GameConfig.TileCellSize * 1.5f + (rect.Size.Y + 1) * GameConfig.TileCellSize);
+            var op3 = new SerializeVector2(x + GameConfig.TileCellSize * 2.5f, y + GameConfig.TileCellSize * 0.5f + (rect.Size.Y + 1) * GameConfig.TileCellSize);
+            var op4 = new SerializeVector2(x + GameConfig.TileCellSize * 1.5f, y + GameConfig.TileCellSize * 0.5f + (rect.Size.Y + 1) * GameConfig.TileCellSize);
             AddDoorNavigation(
-                doorInfo,
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 1.5f, y - GenerateDungeon.TileCellSize * 1.5f + (rect.Size.Y + 1) * GenerateDungeon.TileCellSize),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 2.5f, y - GenerateDungeon.TileCellSize * 1.5f + (rect.Size.Y + 1) * GenerateDungeon.TileCellSize),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 2.5f, y + GenerateDungeon.TileCellSize * 0.5f + (rect.Size.Y + 1) * GenerateDungeon.TileCellSize),
-                new SerializeVector2(x + GenerateDungeon.TileCellSize * 1.5f, y + GenerateDungeon.TileCellSize * 0.5f + (rect.Size.Y + 1) * GenerateDungeon.TileCellSize)
+                doorInfo, op1, op2, op3, op4,
+                new SerializeVector2(op1.X, op3.Y - GameConfig.TileCellSize),
+                new SerializeVector2(op2.X, op3.Y - GameConfig.TileCellSize),
+                new SerializeVector2(op3),
+                new SerializeVector2(op4)
             );
         }
     }
 
-    private void AddDoorNavigation(RoomDoorInfo doorInfo, SerializeVector2 p1, SerializeVector2 p2, SerializeVector2 p3, SerializeVector2 p4)
+    /// <summary>
+    /// 添加房间
+    /// </summary>
+    private void AddDoorNavigation(RoomDoorInfo doorInfo,
+        SerializeVector2 op1, SerializeVector2 op2, SerializeVector2 op3, SerializeVector2 op4,
+        SerializeVector2 cp1, SerializeVector2 cp2, SerializeVector2 cp3, SerializeVector2 cp4)
     {
-        var polygonData = new NavigationPolygonData();
-        polygonData.Type = NavigationPolygonType.Out;
-        polygonData.Points.Add(p1);
-        polygonData.Points.Add(p2);
-        polygonData.Points.Add(p3);
-        polygonData.Points.Add(p4);
-        _connectNavigationItemList.Add(new DoorNavigationItem(polygonData, doorInfo));
+        var openPolygonData = new NavigationPolygonData();
+        openPolygonData.Type = NavigationPolygonType.Out;
+        openPolygonData.Points.Add(op1);
+        openPolygonData.Points.Add(op2);
+        openPolygonData.Points.Add(op3);
+        openPolygonData.Points.Add(op4);
+        
+        var closePolygonData = new NavigationPolygonData();
+        closePolygonData.Type = NavigationPolygonType.Out;
+        closePolygonData.Points.Add(cp1);
+        closePolygonData.Points.Add(cp2);
+        closePolygonData.Points.Add(cp3);
+        closePolygonData.Points.Add(cp4);
+        
+        //这里 NavigationPolygonData 需要计算, 后续补上
+        _connectNavigationItemList.Add(new DoorNavigationInfo(doorInfo, openPolygonData, closePolygonData));
     }
     
     //报错数据
@@ -659,17 +686,23 @@
     {
         //TestData();
         // 在 Godot4.0_rc6 中 如果将所有点都放在 NavigationPolygon 里面, 即使点是对的, 但调用 MakePolygonsFromOutlines 还是可能会报错, 这应该是个bug
+        
+        //通过 GenerateNavigationPolygon() 计算出来的导航区域
         for (var i = 0; i < _polygonDataList.Count; i++)
         {
             var polygonData = _polygonDataList[i];
-            var node = CreateNavigationRegion(navigationRoot, polygonData);
+            CreateNavigationRegion(navigationRoot, polygonData);
         }
 
+        //门占用区域的导航区域
         for (var i = 0; i < _connectNavigationItemList.Count; i++)
         {
             var item = _connectNavigationItemList[i];
-            var node = CreateNavigationRegion(navigationRoot, item.NavigationPolygonData);
-            item.DoorInfo.Navigation = new DoorNavigationInfo(node, item.NavigationPolygonData);
+            item.CloseNavigationNode = CreateNavigationRegion(navigationRoot, item.CloseNavigationData);
+            item.OpenNavigationNode = CreateNavigationRegion(navigationRoot, item.OpenNavigationData);
+            item.CloseNavigationNode.Enabled = false;
+            item.OpenNavigationNode.Enabled = false;
+            item.DoorInfo.Navigation = item;
         }
     }
 
@@ -701,7 +734,7 @@
         var array = new NavigationPolygonData[_connectNavigationItemList.Count];
         for (var i = 0; i < _connectNavigationItemList.Count; i++)
         {
-            array[i] = _connectNavigationItemList[i].NavigationPolygonData;
+            array[i] = _connectNavigationItemList[i].OpenNavigationData;
         }
         return array;
     }
diff --git a/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs b/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs
index 84511b5..6e2720b 100644
--- a/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs
+++ b/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs
@@ -9,16 +9,6 @@
 public class GenerateDungeon
 {
     /// <summary>
-    /// 过道宽度
-    /// </summary>
-    public const int CorridorWidth = 4;
-
-    /// <summary>
-    /// tilemap 网格大小
-    /// </summary>
-    public const int TileCellSize = 16;
-    
-    /// <summary>
     /// 所有生成的房间, 调用过 Generate() 函数才能获取到值
     /// </summary>
     public List<RoomInfo> RoomInfos { get; } = new List<RoomInfo>();
@@ -50,12 +40,13 @@
     private int _roomMaxInterval = 10;
 
     //房间横轴分散程度
-    private float _roomHorizontalMinDispersion = 0.7f;
-    private float _roomHorizontalMaxDispersion = 1.1f;
+    
+    private float _roomHorizontalMinDispersion = 0.3f;
+    private float _roomHorizontalMaxDispersion = 1.2f;
 
     //房间纵轴分散程度
-    private float _roomVerticalMinDispersion = 0.7f;
-    private float _roomVerticalMaxDispersion = 1.1f;
+    private float _roomVerticalMinDispersion = 0.3f;
+    private float _roomVerticalMaxDispersion = 1.2f;
 
     //区域限制
     private bool _enableLimitRange = true;
@@ -157,6 +148,7 @@
 
         //随机选择一个房间
         var roomSplit = Utils.RandomChoose(GameApplication.Instance.RoomConfig);
+        //var roomSplit = GameApplication.Instance.RoomConfig[0];
         var room = new RoomInfo(_count, roomSplit);
         
         //房间大小
@@ -218,7 +210,7 @@
                 }
 
                 //是否碰到其他房间或者过道
-                if (_roomGrid.RectCollision(room.Position - new Vector2(3, 3), room.Size + new Vector2(6, 6)))
+                if (_roomGrid.RectCollision(room.Position - new Vector2(GameConfig.RoomSpace, GameConfig.RoomSpace), room.Size + new Vector2(GameConfig.RoomSpace * 2, GameConfig.RoomSpace * 2)))
                 {
                     //碰到其他墙壁, 再一次尝试
                     continue;
@@ -574,21 +566,23 @@
         if (areaInfo.Direction == DoorDirection.N || areaInfo.Direction == DoorDirection.S) //纵向门
         {
             var num = room1.GetHorizontalStart();
-            var p1 = num + areaInfo.Start / TileCellSize;
-            var p2 = num + areaInfo.End / TileCellSize;
+            var p1 = num + areaInfo.Start / GameConfig.TileCellSize;
+            var p2 = num + areaInfo.End / GameConfig.TileCellSize;
 
             if (room1.Position.X > room2.Position.X)
             {
                 var range = CalcOverlapRange(room2.GetHorizontalEnd(),
                     room1.GetHorizontalEnd(), p1, p2);
                 //交集范围够生成门
-                if (range.Y - range.X >= CorridorWidth)
+                if (range.Y - range.X >= GameConfig.CorridorWidth)
                 {
-                    var tempRange = new Vector2I(Mathf.Abs(room1.Position.X - (int)range.X),
-                        Mathf.Abs(room1.Position.X - (int)range.Y) - CorridorWidth);
-                    if (areaRange == null || tempRange.X < areaRange.Value.X)
+                    // var tempRange = new Vector2I(Mathf.Abs(room1.Position.X - (int)range.X),
+                    //     Mathf.Abs(room1.Position.X - (int)range.Y) - GameConfig.CorridorWidth);
+                    
+                    var rangeValue = Mathf.Abs(room1.Position.X - (int)range.Y) - GameConfig.CorridorWidth;
+                    if (areaRange == null || rangeValue < areaRange.Value.X)
                     {
-                        areaRange = tempRange;
+                        areaRange = new Vector2I(rangeValue, rangeValue);
                     }
                 }
             }
@@ -597,13 +591,15 @@
                 var range = CalcOverlapRange(room1.GetHorizontalStart(),
                     room2.GetHorizontalStart(), p1, p2);
                 //交集范围够生成门
-                if (range.Y - range.X >= CorridorWidth)
+                if (range.Y - range.X >= GameConfig.CorridorWidth)
                 {
-                    var tempRange = new Vector2I(Mathf.Abs(room1.Position.X - (int)range.X),
-                        Mathf.Abs(room1.Position.X - (int)range.Y) - CorridorWidth);
-                    if (areaRange == null || tempRange.Y > areaRange.Value.Y)
+                    // var tempRange = new Vector2I(Mathf.Abs(room1.Position.X - (int)range.X),
+                    //     Mathf.Abs(room1.Position.X - (int)range.Y) - GameConfig.CorridorWidth);
+
+                    var rangeValue = Mathf.Abs(room1.Position.X - (int)range.Y) - GameConfig.CorridorWidth;
+                    if (areaRange == null || rangeValue > areaRange.Value.Y)
                     {
-                        areaRange = tempRange;
+                        areaRange = new Vector2I(rangeValue, rangeValue);
                     }
                 }
             }
@@ -611,21 +607,23 @@
         else //横向门
         {
             var num = room1.GetVerticalStart();
-            var p1 = num + areaInfo.Start / TileCellSize;
-            var p2 = num + areaInfo.End / TileCellSize;
+            var p1 = num + areaInfo.Start / GameConfig.TileCellSize;
+            var p2 = num + areaInfo.End / GameConfig.TileCellSize;
 
             if (room1.Position.Y > room2.Position.Y)
             {
                 var range = CalcOverlapRange(room2.GetVerticalEnd(),
                     room1.GetVerticalEnd(), p1, p2);
                 //交集范围够生成门
-                if (range.Y - range.X >= CorridorWidth)
+                if (range.Y - range.X >= GameConfig.CorridorWidth)
                 {
-                    var tempRange = new Vector2I(Mathf.Abs(room1.Position.Y - (int)range.X),
-                        Mathf.Abs(room1.Position.Y - (int)range.Y) - CorridorWidth);
-                    if (areaRange == null || tempRange.X < areaRange.Value.X)
+                    // var tempRange = new Vector2I(Mathf.Abs(room1.Position.Y - (int)range.X),
+                    //     Mathf.Abs(room1.Position.Y - (int)range.Y) - GameConfig.CorridorWidth);
+
+                    var rangeValue = Mathf.Abs(room1.Position.Y - (int)range.X);
+                    if (areaRange == null || rangeValue < areaRange.Value.X)
                     {
-                        areaRange = tempRange;
+                        areaRange = new Vector2I(rangeValue, rangeValue);
                     }
                 }
             }
@@ -634,13 +632,15 @@
                 var range = CalcOverlapRange(room1.GetVerticalStart(),
                     room2.GetVerticalStart(), p1, p2);
                 //交集范围够生成门
-                if (range.Y - range.X >= CorridorWidth)
+                if (range.Y - range.X >= GameConfig.CorridorWidth)
                 {
-                    var tempRange = new Vector2I(Mathf.Abs(room1.Position.Y - (int)range.X),
-                        Mathf.Abs(room1.Position.Y - (int)range.Y) - CorridorWidth);
-                    if (areaRange == null || tempRange.Y > areaRange.Value.Y)
+                    // var tempRange = new Vector2I(Mathf.Abs(room1.Position.Y - (int)range.X),
+                    //     Mathf.Abs(room1.Position.Y - (int)range.Y) - GameConfig.CorridorWidth);
+
+                    var rangeValue = Mathf.Abs(room1.Position.Y - (int)range.Y) - GameConfig.CorridorWidth;
+                    if (areaRange == null || rangeValue > areaRange.Value.Y)
                     {
-                        areaRange = tempRange;
+                        areaRange = new Vector2I(rangeValue, rangeValue);
                     }
                 }
             }
@@ -829,21 +829,21 @@
                         if (direction == DoorDirection.E || direction == DoorDirection.W) //第二个门向← 或者 第二个门向→
                         {
                             range = CalcOverlapRange(
-                                room.GetVerticalStart() * TileCellSize + doorAreaInfo1.Start, room.GetVerticalStart() * TileCellSize + doorAreaInfo1.End,
-                                nextRoom.GetVerticalStart() * TileCellSize + doorAreaInfo2.Start, nextRoom.GetVerticalStart() * TileCellSize + doorAreaInfo2.End
+                                room.GetVerticalStart() * GameConfig.TileCellSize + doorAreaInfo1.Start, room.GetVerticalStart() * GameConfig.TileCellSize + doorAreaInfo1.End,
+                                nextRoom.GetVerticalStart() * GameConfig.TileCellSize + doorAreaInfo2.Start, nextRoom.GetVerticalStart() * GameConfig.TileCellSize + doorAreaInfo2.End
                             );
                         }
                         else //第二个门向↑ 或者 第二个门向↓
                         {
                             range = CalcOverlapRange(
-                                room.GetHorizontalStart() * TileCellSize + doorAreaInfo1.Start, room.GetHorizontalStart() * TileCellSize + doorAreaInfo1.End,
-                                nextRoom.GetHorizontalStart() * TileCellSize + doorAreaInfo2.Start, nextRoom.GetHorizontalStart() * TileCellSize + doorAreaInfo2.End
+                                room.GetHorizontalStart() * GameConfig.TileCellSize + doorAreaInfo1.Start, room.GetHorizontalStart() * GameConfig.TileCellSize + doorAreaInfo1.End,
+                                nextRoom.GetHorizontalStart() * GameConfig.TileCellSize + doorAreaInfo2.Start, nextRoom.GetHorizontalStart() * GameConfig.TileCellSize + doorAreaInfo2.End
                             );
                         }
                         //交集范围够生成门
-                        if (range.Y - range.X >= CorridorWidth * TileCellSize)
+                        if (range.Y - range.X >= GameConfig.CorridorWidth * GameConfig.TileCellSize)
                         {
-                            rangeList.Add(new Vector2I((int)(range.X / 16), (int)(range.Y / 16) - CorridorWidth));
+                            rangeList.Add(new Vector2I((int)(range.X / 16), (int)(range.Y / 16) - GameConfig.CorridorWidth));
                         }
                     }
                 }
@@ -909,21 +909,21 @@
         var point2 = door2.OriginPosition;
         var pos = new Vector2(Mathf.Min(point1.X, point2.X), Mathf.Min(point1.Y, point2.Y));
         var size = new Vector2(
-            point1.X == point2.X ? CorridorWidth : Mathf.Abs(point1.X - point2.X),
-            point1.Y == point2.Y ? CorridorWidth : Mathf.Abs(point1.Y - point2.Y)
+            point1.X == point2.X ? GameConfig.CorridorWidth : Mathf.Abs(point1.X - point2.X),
+            point1.Y == point2.Y ? GameConfig.CorridorWidth : Mathf.Abs(point1.Y - point2.Y)
         );
 
         Vector2 collPos;
         Vector2 collSize;
         if (point1.X == point2.X) //纵向加宽, 防止贴到其它墙
         {
-            collPos = new Vector2(pos.X - 3, pos.Y);
-            collSize = new Vector2(size.X + 6, size.Y);
+            collPos = new Vector2(pos.X - GameConfig.RoomSpace, pos.Y);
+            collSize = new Vector2(size.X + GameConfig.RoomSpace * 2, size.Y);
         }
         else //横向加宽, 防止贴到其它墙
         {
-            collPos = new Vector2(pos.X, pos.Y - 3);
-            collSize = new Vector2(size.X, size.Y + 6);
+            collPos = new Vector2(pos.X, pos.Y - GameConfig.RoomSpace);
+            collSize = new Vector2(size.X, size.Y + GameConfig.RoomSpace * 2);
         }
 
         if (_roomGrid.RectCollision(collPos, collSize))
@@ -942,26 +942,26 @@
         var point2 = door2.OriginPosition;
         var pos1 = new Vector2(Mathf.Min(point1.X, cross.X), Mathf.Min(point1.Y, cross.Y));
         var size1 = new Vector2(
-            point1.X == cross.X ? CorridorWidth : Mathf.Abs(point1.X - cross.X),
-            point1.Y == cross.Y ? CorridorWidth : Mathf.Abs(point1.Y - cross.Y)
+            point1.X == cross.X ? GameConfig.CorridorWidth : Mathf.Abs(point1.X - cross.X),
+            point1.Y == cross.Y ? GameConfig.CorridorWidth : Mathf.Abs(point1.Y - cross.Y)
         );
         var pos2 = new Vector2(Mathf.Min(point2.X, cross.X), Mathf.Min(point2.Y, cross.Y));
         var size2 = new Vector2(
-            point2.X == cross.X ? CorridorWidth : Mathf.Abs(point2.X - cross.X),
-            point2.Y == cross.Y ? CorridorWidth : Mathf.Abs(point2.Y - cross.Y)
+            point2.X == cross.X ? GameConfig.CorridorWidth : Mathf.Abs(point2.X - cross.X),
+            point2.Y == cross.Y ? GameConfig.CorridorWidth : Mathf.Abs(point2.Y - cross.Y)
         );
 
         Vector2 collPos1;
         Vector2 collSize1;
         if (point1.X == cross.X) //纵向加宽, 防止贴到其它墙
         {
-            collPos1 = new Vector2(pos1.X - 3, pos1.Y);
-            collSize1 = new Vector2(size1.X + 6, size1.Y);
+            collPos1 = new Vector2(pos1.X - GameConfig.RoomSpace, pos1.Y);
+            collSize1 = new Vector2(size1.X + GameConfig.RoomSpace * 2, size1.Y);
         }
         else //横向加宽, 防止贴到其它墙
         {
-            collPos1 = new Vector2(pos1.X, pos1.Y - 3);
-            collSize1 = new Vector2(size1.X, size1.Y + 6);
+            collPos1 = new Vector2(pos1.X, pos1.Y - GameConfig.RoomSpace);
+            collSize1 = new Vector2(size1.X, size1.Y + GameConfig.RoomSpace * 2);
         }
 
         if (_roomGrid.RectCollision(collPos1, collSize1))
@@ -973,13 +973,13 @@
         Vector2 collSize2;
         if (point2.X == cross.X) //纵向加宽, 防止贴到其它墙
         {
-            collPos2 = new Vector2(pos2.X - 3, pos2.Y);
-            collSize2 = new Vector2(size2.X + 6, size2.Y);
+            collPos2 = new Vector2(pos2.X - GameConfig.RoomSpace, pos2.Y);
+            collSize2 = new Vector2(size2.X + GameConfig.RoomSpace * 2, size2.Y);
         }
         else //横向加宽, 防止贴到其它墙
         {
-            collPos2 = new Vector2(pos2.X, pos2.Y - 3);
-            collSize2 = new Vector2(size2.X, size2.Y + 6);
+            collPos2 = new Vector2(pos2.X, pos2.Y - GameConfig.RoomSpace);
+            collSize2 = new Vector2(size2.X, size2.Y + GameConfig.RoomSpace * 2);
         }
 
         if (_roomGrid.RectCollision(collPos2, collSize2))
diff --git a/DungeonShooting_Godot/src/framework/map/RoomInfo.cs b/DungeonShooting_Godot/src/framework/map/RoomInfo.cs
index 1d45115..6207edd 100644
--- a/DungeonShooting_Godot/src/framework/map/RoomInfo.cs
+++ b/DungeonShooting_Godot/src/framework/map/RoomInfo.cs
@@ -57,15 +57,26 @@
     /// 当前房间归属区域
     /// </summary>
     public AffiliationArea Affiliation;
-    
+
+    /// <summary>
+    /// 是否处于闭关状态, 也就是房间门没有主动打开
+    /// </summary>
+    public bool IsSeclusion { get; private set; } = false;
+
+    private bool _beReady = false;
+    private bool _waveStart = false;
+    private int _currWaveIndex = 0;
+    private int _currWaveNumber = 0;
+    private List<ActivityMark> _currActivityMarks = new List<ActivityMark>();
+
     /// <summary>
     /// 获取房间的全局坐标, 单位: 像素
     /// </summary>
     public Vector2 GetWorldPosition()
     {
         return new Vector2(
-            Position.X * GenerateDungeon.TileCellSize,
-            Position.Y * GenerateDungeon.TileCellSize
+            Position.X * GameConfig.TileCellSize,
+            Position.Y * GameConfig.TileCellSize
         );
     }
 
@@ -75,7 +86,7 @@
     /// <returns></returns>
     public Vector2 GetOffsetPosition()
     {
-        return RoomSplit.RoomInfo.Position.AsVector2() * GenerateDungeon.TileCellSize;
+        return RoomSplit.RoomInfo.Position.AsVector2() * GameConfig.TileCellSize;
     }
     
     /// <summary>
@@ -109,4 +120,108 @@
     {
         return Position.Y;
     }
+
+    /// <summary>
+    /// 房间准备好了, 准备刷敌人, 并且关闭所有门，
+    /// 当清完每一波刷新的敌人后即可开门
+    /// </summary>
+    public void BeReady()
+    {
+        //没有标记, 啥都不要做
+        if (ActivityMarks.Count == 0)
+        {
+            _beReady = true;
+            IsSeclusion = false;
+            return;
+        }
+        IsSeclusion = true;
+        _waveStart = false;
+
+        if (!_beReady)
+        {
+            _beReady = true;
+            //按照 WaveNumber 排序
+            ActivityMarks.Sort((x, y) =>
+            {
+                return x.WaveNumber - y.WaveNumber;
+            });
+        }
+
+        //关门
+        foreach (var doorInfo in Doors)
+        {
+            doorInfo.Door.CloseDoor();
+        }
+        
+        //执行第一波生成
+        NextWave();
+    }
+
+    /// <summary>
+    /// 当前房间所有敌人都被清除了
+    /// </summary>
+    public void OnClearRoom()
+    {
+        if (_currWaveIndex >= ActivityMarks.Count) //所有 mark 全部走完了
+        {
+            IsSeclusion = false;
+            _currActivityMarks.Clear();
+            //开门
+            foreach (var doorInfo in Doors)
+            {
+                doorInfo.Door.OpenDoor();
+            }
+        }
+        else //执行下一波
+        {
+            NextWave();
+        }
+    }
+
+    /// <summary>
+    /// 返回当前这一波所有的标记的 Doing 函数是否执行完成
+    /// </summary>
+    public bool IsCurrWaveOver()
+    {
+        for (var i = 0; i < _currActivityMarks.Count; i++)
+        {
+            if (!_currActivityMarks[i].IsOver())
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// 执行下一轮标记
+    /// </summary>
+    private void NextWave()
+    {
+        if (!_waveStart)
+        {
+            _waveStart = true;
+            _currWaveIndex = 0;
+            _currWaveNumber = ActivityMarks[0].WaveNumber;
+        }
+        GD.Print("执行下一波, 当前: " + _currWaveNumber);
+        
+        _currActivityMarks.Clear();
+        //根据标记生成对象
+        for (; _currWaveIndex < ActivityMarks.Count; _currWaveIndex++)
+        {
+            var mark = ActivityMarks[_currWaveIndex];
+            if (mark.WaveNumber != _currWaveNumber) //当前这波已经执行完成了
+            {
+                _currWaveNumber = mark.WaveNumber;
+                break;
+            }
+            else //生成操作
+            {
+                mark.BeReady(this);
+                _currActivityMarks.Add(mark);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs b/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs
index f0aab24..431a890 100644
--- a/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs
+++ b/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs
@@ -26,32 +26,116 @@
     public RoomLayerEnum Layer = RoomLayerEnum.NormalLayer;
 
     /// <summary>
+    /// 该标记在第几波调用 BeReady，
+    /// 一个房间内所以敌人清完即可进入下一波
+    /// </summary>
+    [Export]
+    public int WaveNumber = 1;
+
+    /// <summary>
+    /// 延时执行时间，单位：秒
+    /// </summary>
+    [Export]
+    public float DelayTime = 0;
+    
+    /// <summary>
+    /// 绘制的颜色
+    /// </summary>
+    protected Color DrawColor = new Color(0.4F, 0.56078434F, 0.8784314F);
+
+    //是否已经结束
+    private bool _isOver = true;
+    private float _overTimer = 0;
+    private float _timer = 0;
+    private RoomInfo _tempRoom;
+
+    /// <summary>
     /// 获取物体Id
     /// </summary>
-    /// <returns></returns>
     public string GetItemId()
     {
         return ActivityIdPrefix.GetNameByPrefixType(Type) + ItemId;
     }
 
-    /// <summary>
-    /// 调用该函数表示房间已经准备好了
-    /// </summary>
-    public virtual void BeReady(RoomInfo roomInfo)
+    public override void _Process(double delta)
     {
-        var id = GetItemId();
-        var instance = ActivityObject.Create(id);
+        if (_isOver)
+        {
+            _overTimer += (float)delta;
+            if (_overTimer >= 1)
+            {
+                SetActive(false);
+            }
+        }
+        else
+        {
+            if (DelayTime > 0)
+            {
+                _timer += (float)delta;
+                if (_timer >= DelayTime)
+                {
+                    Doing(_tempRoom);
+                    _tempRoom = null;
+                    _isOver = true;
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// 标记准备好了
+    /// </summary>
+    public void BeReady(RoomInfo roomInfo)
+    {
+        _isOver = false;
+        _overTimer = 0;
+        SetActive(true);
+        if (DelayTime <= 0)
+        {
+            Doing(roomInfo);
+            _isOver = true;
+        }
+        else
+        {
+            _timer = 0;
+            _tempRoom = roomInfo;
+        }
+    }
+
+    /// <summary>
+    /// 是否已经结束
+    /// </summary>
+    public bool IsOver()
+    {
+        return _isOver && _overTimer >= 1;
+    }
+
+    /// <summary>
+    /// 调用该函数表示该标记可以生成物体了
+    /// </summary>
+    public virtual void Doing(RoomInfo roomInfo)
+    {
+        var instance = ActivityObject.Create(GetItemId());
         instance.PutDown(GlobalPosition, Layer);
-        QueueFree();
     }
 
     public override void _Draw()
     {
         if (Engine.IsEditorHint() || GameApplication.Instance.Debug)
         {
-            DrawLine(new Vector2(-5, -5), new Vector2(5, 5), new Color(0.4F,0.56078434F,0.8784314F), 2f);
-            DrawLine(new Vector2(-5, 5), new Vector2(5, -5), new Color(0.4F,0.56078434F,0.8784314F), 2f);
+            DrawLine(new Vector2(-5, -5), new Vector2(5, 5), DrawColor, 2f);
+            DrawLine(new Vector2(-5, 5), new Vector2(5, -5), DrawColor, 2f);
         }
     }
 
+    /// <summary>
+    /// 设置当前节点是否是活动状态
+    /// </summary>
+    public void SetActive(bool flag)
+    {
+        SetProcess(flag);
+        SetProcessInternal(flag);
+        SetPhysicsProcess(flag);
+        SetPhysicsProcessInternal(flag);
+    }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs b/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs
new file mode 100644
index 0000000..cc5a0fd
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs
@@ -0,0 +1,91 @@
+
+using Godot;
+
+/// <summary>
+/// 针对敌人生成位置的标记
+/// </summary>
+[Tool]
+public partial class EnemyMark : ActivityMark
+{
+    /// <summary>
+    /// 武器1 id, id会自动加上武器前缀
+    /// </summary>
+    [Export]
+    public string Weapon1Id;
+    /// <summary>
+    /// 武器1弹药量, 如果值小于0, 则使用默认弹药量
+    /// </summary>
+    [Export]
+    public int Weapon1Ammo = -1;
+    /// <summary>
+    /// 武器2 id, id会自动加上武器前缀
+    /// </summary>
+    [Export]
+    public string Weapon2Id;
+    /// <summary>
+    /// 武器2弹药量, 如果值小于0, 则使用默认弹药量
+    /// </summary>
+    [Export]
+    public int Weapon2Ammo = -1;
+    /// <summary>
+    /// 武器3 id, id会自动加上武器前缀
+    /// </summary>
+    [Export]
+    public string Weapon3Id;
+    /// <summary>
+    /// 武器3弹药量, 如果值小于0, 则使用默认弹药量
+    /// </summary>
+    [Export]
+    public int Weapon3Ammo = -1;
+    /// <summary>
+    /// 武器4 id, id会自动加上武器前缀
+    /// </summary>
+    [Export]
+    public string Weapon4Id;
+    /// <summary>
+    /// 武器4弹药量, 如果值小于0, 则使用默认弹药量
+    /// </summary>
+    [Export]
+    public int Weapon4Ammo = -1;
+
+    public override void _Ready()
+    {
+        DrawColor = Colors.Red;
+        Type = ActivityIdPrefix.ActivityPrefixType.Enemy;
+        Layer = RoomLayerEnum.YSortLayer;
+    }
+
+    public override void Doing(RoomInfo roomInfo)
+    {
+        var pos = GlobalPosition;
+        //创建敌人
+        var instance = ActivityObject.Create<Enemy>(GetItemId());
+        instance.PutDown(pos, Layer);
+
+        if (!string.IsNullOrWhiteSpace(Weapon1Id))
+            CreateWeapon(instance, pos, Weapon1Id, Weapon1Ammo);
+        if (!string.IsNullOrWhiteSpace(Weapon2Id))
+            CreateWeapon(instance, pos, Weapon2Id, Weapon2Ammo);
+        if (!string.IsNullOrWhiteSpace(Weapon3Id))
+            CreateWeapon(instance, pos, Weapon3Id, Weapon3Ammo);
+        if (!string.IsNullOrWhiteSpace(Weapon4Id))
+            CreateWeapon(instance, pos, Weapon4Id, Weapon4Ammo);
+    }
+
+    //生成武器
+    private void CreateWeapon(Enemy instance, Vector2 pos, string id, int ammon)
+    {
+        var weaponId = ActivityIdPrefix.GetNameByPrefixType(ActivityIdPrefix.ActivityPrefixType.Weapon) + id;
+        var weapon = ActivityObject.Create<Weapon>(weaponId);
+        //设置弹药量
+        if (ammon >= 0)
+        {
+            weapon.SetTotalAmmo(ammon);
+        }
+        //如果不能放下， 则直接扔地上
+        if (!instance.PickUpWeapon(weapon))
+        {
+            weapon.PutDown(pos, RoomLayerEnum.NormalLayer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/mark/WeaponMark.cs b/DungeonShooting_Godot/src/framework/map/mark/WeaponMark.cs
new file mode 100644
index 0000000..190ac94
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/map/mark/WeaponMark.cs
@@ -0,0 +1,44 @@
+
+using Godot;
+
+/// <summary>
+/// 针对武器生成位置的标记
+/// </summary>
+[Tool]
+public partial class WeaponMark : ActivityMark
+{
+    /// <summary>
+    /// 当前弹夹弹药量, 如果值小于0, 则使用默认弹药量
+    /// </summary>
+    [Export]
+    public int CurrAmmon = -1;
+
+    /// <summary>
+    /// 备用弹药容量, 如果值小于0, 则使用默认弹药量
+    /// </summary>
+    [Export]
+    public int ResidueAmmo = -1;
+    
+    public override void _Ready()
+    {
+        DrawColor = Colors.Green;
+        Type = ActivityIdPrefix.ActivityPrefixType.Weapon;
+        Layer = RoomLayerEnum.NormalLayer;
+    }
+
+    public override void Doing(RoomInfo roomInfo)
+    {
+        //创建武器
+        var instance = ActivityObject.Create<Weapon>(GetItemId());
+        if (CurrAmmon >= 0)
+        {
+            instance.SetCurrAmmo(CurrAmmon);   
+        }
+
+        if (ResidueAmmo >= 0)
+        {
+            instance.SetResidueAmmo(ResidueAmmo);   
+        }
+        instance.PutDown(GlobalPosition, Layer);
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/GameApplication.cs b/DungeonShooting_Godot/src/game/GameApplication.cs
index c7efa2e..d364932 100644
--- a/DungeonShooting_Godot/src/game/GameApplication.cs
+++ b/DungeonShooting_Godot/src/game/GameApplication.cs
@@ -136,10 +136,10 @@
 			var areaInfos = roomSplit.RoomInfo.DoorAreaInfos;
 			if (areaInfos.Count == 0)
 			{
-				areaInfos.Add(new DoorAreaInfo(DoorDirection.N, GenerateDungeon.TileCellSize, (roomSplit.RoomInfo.Size.X - 2) * GenerateDungeon.TileCellSize));
-				areaInfos.Add(new DoorAreaInfo(DoorDirection.S, GenerateDungeon.TileCellSize, (roomSplit.RoomInfo.Size.X - 2) * GenerateDungeon.TileCellSize));
-				areaInfos.Add(new DoorAreaInfo(DoorDirection.W, GenerateDungeon.TileCellSize, (roomSplit.RoomInfo.Size.Y - 2) * GenerateDungeon.TileCellSize));
-				areaInfos.Add(new DoorAreaInfo(DoorDirection.E, GenerateDungeon.TileCellSize, (roomSplit.RoomInfo.Size.Y - 2) * GenerateDungeon.TileCellSize));
+				areaInfos.Add(new DoorAreaInfo(DoorDirection.N, GameConfig.TileCellSize, (roomSplit.RoomInfo.Size.X - 1) * GameConfig.TileCellSize));
+				areaInfos.Add(new DoorAreaInfo(DoorDirection.S, GameConfig.TileCellSize, (roomSplit.RoomInfo.Size.X - 1) * GameConfig.TileCellSize));
+				areaInfos.Add(new DoorAreaInfo(DoorDirection.W, GameConfig.TileCellSize, (roomSplit.RoomInfo.Size.Y - 1) * GameConfig.TileCellSize));
+				areaInfos.Add(new DoorAreaInfo(DoorDirection.E, GameConfig.TileCellSize, (roomSplit.RoomInfo.Size.Y - 1) * GameConfig.TileCellSize));
 			}
 		}
 	}
diff --git a/DungeonShooting_Godot/src/game/GameConfig.cs b/DungeonShooting_Godot/src/game/GameConfig.cs
index a303d3a..e91c52c 100644
--- a/DungeonShooting_Godot/src/game/GameConfig.cs
+++ b/DungeonShooting_Godot/src/game/GameConfig.cs
@@ -3,25 +3,39 @@
 
 public static class GameConfig
 {
+    // --------------------- 可配置项 ---------------------
+    
     /// <summary>
     /// 散射计算的默认距离
     /// </summary>
-    public static readonly float ScatteringDistance = 300;
+    public static float ScatteringDistance = 300;
     /// <summary>
     /// 重力加速度
     /// </summary>
-    public static readonly float G = 250f;
+    public static float G = 250f;
+
+    
+    // ----------------------- 常量 -----------------------
+    
     /// <summary>
     /// 像素缩放
     /// </summary>
-    public static readonly int WindowScale = 4;
+    public const int WindowScale = 4;
     /// <summary>
     /// 游戏视图大小
     /// </summary>
     public static readonly Vector2 ViewportSize = new Vector2(480, 270);
     //public static Vector2 ViewportSize => OS.WindowSize / WindowScale;
     /// <summary>
+    /// 连接房间的过道宽度
+    /// </summary>
+    public const int CorridorWidth = 4;
+    /// <summary>
     /// 游戏地图网格大小
     /// </summary>
-    public static readonly Vector2 MapCellSize = new Vector2(16, 16);
+    public const int TileCellSize = 16;
+    /// <summary>
+    /// 房间最小间距
+    /// </summary>
+    public const int RoomSpace = 4;
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/event/EventEnum.cs b/DungeonShooting_Godot/src/game/event/EventEnum.cs
index 45d1986..02591f3 100644
--- a/DungeonShooting_Godot/src/game/event/EventEnum.cs
+++ b/DungeonShooting_Godot/src/game/event/EventEnum.cs
@@ -4,5 +4,16 @@
 /// </summary>
 public enum EventEnum
 {
-    Test,
+    /// <summary>
+    /// 敌人死亡, 参数为死亡的敌人的实例
+    /// </summary>
+    OnEnemyDie,
+    /// <summary>
+    /// 玩家进入一个房间，参数为房间对象
+    /// </summary>
+    OnPlayerEnterRoom,
+    /// <summary>
+    /// 玩家第一次进入某个房间，参数为房间对象
+    /// </summary>
+    OnPlayerFirstEnterRoom,
 }
diff --git a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
index 098bcb9..c15e166 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
@@ -41,7 +41,7 @@
     public int CurrAmmo { get; private set; }
 
     /// <summary>
-    /// 剩余弹药量
+    /// 剩余弹药量(备用弹药)
     /// </summary>
     public int ResidueAmmo { get; private set; }
 
@@ -61,12 +61,6 @@
     public Marker2D ShellPoint { get; private set; }
 
     /// <summary>
-    /// 碰撞器节点
-    /// </summary>
-    /// <value></value>
-    public CollisionShape2D CollisionShape2D { get; private set; }
-
-    /// <summary>
     /// 武器的当前散射半径
     /// </summary>
     public float CurrScatteringRange { get; private set; } = 0;
@@ -177,10 +171,9 @@
         _weaponAttribute = attribute;
 
         AnimationPlayer = GetNode<AnimationPlayer>("AnimationPlayer");
-        FirePoint = GetNode<Marker2D>("WeaponBody/FirePoint");
-        OriginPoint = GetNode<Marker2D>("WeaponBody/OriginPoint");
-        ShellPoint = GetNode<Marker2D>("WeaponBody/ShellPoint");
-        CollisionShape2D = GetNode<CollisionShape2D>("WeaponBody/Collision");
+        FirePoint = GetNode<Marker2D>("FirePoint");
+        OriginPoint = GetNode<Marker2D>("OriginPoint");
+        ShellPoint = GetNode<Marker2D>("ShellPoint");
 
         //图标
         SetDefaultTexture(ResourceLoader.Load<Texture2D>(Attribute.Sprite2D));
@@ -703,6 +696,55 @@
     }
 
     /// <summary>
+    /// 强制修改当前弹夹弹药量
+    /// </summary>
+    public void SetCurrAmmo(int count)
+    {
+        CurrAmmo = Mathf.Clamp(count, 0, Attribute.AmmoCapacity);
+    }
+
+    /// <summary>
+    /// 强制修改备用弹药量
+    /// </summary>
+    public void SetResidueAmmo(int count)
+    {
+        ResidueAmmo = Mathf.Clamp(count, 0, Attribute.MaxAmmoCapacity - CurrAmmo);
+    }
+    
+    /// <summary>
+    /// 强制修改弹药量, 优先改动备用弹药
+    /// </summary>
+    public void SetTotalAmmo(int total)
+    {
+        if (total < 0)
+        {
+            return;
+        }
+        var totalAmmo = CurrAmmo + ResidueAmmo;
+        if (totalAmmo == total)
+        {
+            return;
+        }
+        
+        if (total > totalAmmo) //弹药增加
+        {
+            ResidueAmmo = Mathf.Min(total - CurrAmmo, Attribute.MaxAmmoCapacity - CurrAmmo);
+        }
+        else //弹药减少
+        {
+            if (CurrAmmo < total)
+            {
+                ResidueAmmo = total - CurrAmmo;
+            }
+            else
+            {
+                CurrAmmo = total;
+                ResidueAmmo = 0;
+            }
+        }
+    }
+
+    /// <summary>
     /// 拾起的弹药数量, 如果到达容量上限, 则返回拾取完毕后剩余的弹药数量
     /// </summary>
     /// <param name="count">弹药数量</param>
@@ -776,14 +818,14 @@
         }
         else //换弹结束
         {
-            if (ResidueAmmo >= Attribute.AmmoCapacity)
+            if (CurrAmmo + ResidueAmmo >= Attribute.AmmoCapacity)
             {
                 ResidueAmmo -= Attribute.AmmoCapacity - CurrAmmo;
                 CurrAmmo = Attribute.AmmoCapacity;
             }
             else
             {
-                CurrAmmo = ResidueAmmo;
+                CurrAmmo += ResidueAmmo;
                 ResidueAmmo = 0;
             }
 
@@ -953,7 +995,7 @@
     protected override void OnThrowOver()
     {
         //启用碰撞
-        CollisionShape2D.Disabled = false;
+        Collision.Disabled = false;
         AnimationPlayer.Play("floodlight");
     }
 
@@ -986,7 +1028,7 @@
         sm.SetShaderParameter("schedule", 0);
         ZIndex = 0;
         //禁用碰撞
-        CollisionShape2D.Disabled = true;
+        Collision.Disabled = true;
         //清除 Ai 拾起标记
         RemoveSign(SignNames.AiFindWeaponSign);
         OnPickUp(master);
diff --git a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
index a0abde7..0d9b41c 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
@@ -35,7 +35,7 @@
     /// </summary>
     public int MaxAmmoCapacity = 120;
     /// <summary>
-    /// 备用弹药数量
+    /// 起始备用弹药数量
     /// </summary>
     public int StandbyAmmoCapacity = 90;
     /// <summary>
diff --git a/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs b/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs
index d8c9cc7..bd44f44 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs
@@ -39,6 +39,7 @@
     {
         //移动
         var lastSlideCollision = GetLastSlideCollision();
+        //撞到墙
         if (lastSlideCollision != null)
         {
             //创建粒子特效
diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
index 2d5576d..7fb1847 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
@@ -12,7 +12,7 @@
             Sprite2D = ResourcePath.resource_sprite_gun_gun2_png;
             Weight = 40;
             CenterPosition = new Vector2(0.4f, -2.6f);
-            StartFiringSpeed = 300;
+            StartFiringSpeed = 400;
             StartScatteringRange = 30;
             FinalScatteringRange = 90;
             ScatteringRangeAddValue = 50f;
diff --git a/DungeonShooting_Godot/src/game/role/Player.cs b/DungeonShooting_Godot/src/game/role/Player.cs
index e4d9b24..9863765 100644
--- a/DungeonShooting_Godot/src/game/role/Player.cs
+++ b/DungeonShooting_Godot/src/game/role/Player.cs
@@ -45,7 +45,7 @@
         MaxShield = 30;
         Shield = 30;
 
-        // debug用
+        // // debug用
         // Acceleration = 3000;
         // Friction = 3000;
         // MoveSpeed = 500;
diff --git a/DungeonShooting_Godot/src/game/role/Role.cs b/DungeonShooting_Godot/src/game/role/Role.cs
index 70f1df6..aead7a9 100644
--- a/DungeonShooting_Godot/src/game/role/Role.cs
+++ b/DungeonShooting_Godot/src/game/role/Role.cs
@@ -226,8 +226,8 @@
 
         //连接互动物体信号
         InteractiveArea = GetNode<Area2D>("InteractiveArea");
-        InteractiveArea.AreaEntered += _OnPropsEnter;
-        InteractiveArea.AreaExited += _OnPropsExit;
+        InteractiveArea.BodyEntered += _OnPropsEnter;
+        InteractiveArea.BodyExited += _OnPropsExit;
     }
 
     protected override void Process(float delta)
@@ -255,7 +255,7 @@
         for (int i = 0; i < _interactiveItemList.Count; i++)
         {
             var item = _interactiveItemList[i];
-            if (item == null)
+            if (item == null || item.IsDestroyed)
             {
                 _interactiveItemList.RemoveAt(i--);
             }
@@ -290,6 +290,22 @@
         }
     }
 
+    protected override void OnAffiliationChange()
+    {
+        //身上的武器的所属区域也得跟着变
+        Holster.ForEach((weapon, i) =>
+        {
+            if (Affiliation != null)
+            {
+                Affiliation.InsertItem(weapon);
+            }
+            else if (weapon.Affiliation != null)
+            {
+                weapon.Affiliation.RemoveItem(weapon);
+            }
+        });
+    }
+
     /// <summary>
     /// 获取当前角色的中心点坐标
     /// </summary>
@@ -511,13 +527,12 @@
     }
     
     /// <summary>
-    /// 连接信号: InteractiveArea.area_entered
+    /// 连接信号: InteractiveArea.BodyEntered
     /// 与物体碰撞
     /// </summary>
-    private void _OnPropsEnter(Area2D other)
+    private void _OnPropsEnter(Node2D other)
     {
-        ActivityObject propObject = other.AsActivityObject();
-        if (propObject != null)
+        if (other is ActivityObject propObject)
         {
             if (!_interactiveItemList.Contains(propObject))
             {
@@ -527,13 +542,12 @@
     }
 
     /// <summary>
-    /// 连接信号: InteractiveArea.area_exited
+    /// 连接信号: InteractiveArea.BodyExited
     /// 物体离开碰撞区域
     /// </summary>
-    private void _OnPropsExit(Area2D other)
+    private void _OnPropsExit(Node2D other)
     {
-        ActivityObject propObject = other.AsActivityObject();
-        if (propObject != null)
+        if (other is ActivityObject propObject)
         {
             if (_interactiveItemList.Contains(propObject))
             {
diff --git a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
index ccbf67d..00e79f9 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
@@ -28,7 +28,7 @@
     /// <summary>
     /// 公共属性, 在哪个区域找到的目标, 所有该区域下的敌人都会知道目标的位置
     /// </summary>
-    public static AffiliationArea FindTargetAffiliation { get; private set; }
+    public static HashSet<AffiliationArea> FindTargetAffiliationSet { get; } = new HashSet<AffiliationArea>();
     
     /// <summary>
     /// 公共属性, 找到的目标的位置, 如果目标在视野内, 则一直更新
@@ -89,7 +89,7 @@
         AttackLayer = PhysicsLayer.Wall | PhysicsLayer.Props | PhysicsLayer.Player;
         Camp = CampEnum.Camp2;
 
-        MoveSpeed = 30;
+        MoveSpeed = 20;
 
         Holster.SlotList[2].Enable = true;
         Holster.SlotList[3].Enable = true;
@@ -115,8 +115,6 @@
         
         //默认状态
         StateController.ChangeState(AiStateEnum.AiNormal);
-
-        NavigationAgent2D.TargetPosition = GameApplication.Instance.RoomManager.Player.GlobalPosition;
     }
 
     public override void _EnterTree()
@@ -141,6 +139,8 @@
         {
             weapons[i].ThrowWeapon(this);
         }
+        //派发敌人死亡信号
+        EventManager.EmitEvent(EventEnum.OnEnemyDie, this);
         Destroy();
     }
 
@@ -178,17 +178,91 @@
     /// </summary>
     public bool CheckUsableWeaponInUnclaimed()
     {
-        //如果存在有子弹的武器
         foreach (var unclaimedWeapon in Weapon.UnclaimedWeapons)
         {
-            if (!unclaimedWeapon.IsTotalAmmoEmpty() && !unclaimedWeapon.HasSign(SignNames.AiFindWeaponSign))
+            //判断是否能拾起武器, 条件: 相同的房间
+            if (unclaimedWeapon.Affiliation == Affiliation)
             {
-                return true;
+                if (!unclaimedWeapon.IsTotalAmmoEmpty())
+                {
+                    if (!unclaimedWeapon.HasSign(SignNames.AiFindWeaponSign))
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        //判断是否可以移除该标记
+                        var enemy = unclaimedWeapon.GetSign<Enemy>(SignNames.AiFindWeaponSign);
+                        if (enemy == null || enemy.IsDestroyed) //标记当前武器的敌人已经被销毁
+                        {
+                            unclaimedWeapon.RemoveSign(SignNames.AiFindWeaponSign);
+                            return true;
+                        }
+                        else if (!enemy.IsAllWeaponTotalAmmoEmpty()) //标记当前武器的敌人已经有新的武器了
+                        {
+                            unclaimedWeapon.RemoveSign(SignNames.AiFindWeaponSign);
+                            return true;
+                        }
+                    }
+                }
             }
         }
 
         return false;
     }
+    
+    /// <summary>
+    /// 寻找可用的武器
+    /// </summary>
+    public Weapon FindTargetWeapon()
+    {
+        Weapon target = null;
+        var position = Position;
+        foreach (var weapon in Weapon.UnclaimedWeapons)
+        {
+            //判断是否能拾起武器, 条件: 相同的房间, 或者当前房间目前没有战斗, 或者不在战斗房间
+            if (weapon.Affiliation == Affiliation)
+            {
+                //还有弹药
+                if (!weapon.IsTotalAmmoEmpty())
+                {
+                    //查询是否有其他敌人标记要拾起该武器
+                    if (weapon.HasSign(SignNames.AiFindWeaponSign))
+                    {
+                        var enemy = weapon.GetSign<Enemy>(SignNames.AiFindWeaponSign);
+                        if (enemy == this) //就是自己标记的
+                        {
+
+                        }
+                        else if (enemy == null || enemy.IsDestroyed) //标记当前武器的敌人已经被销毁
+                        {
+                            weapon.RemoveSign(SignNames.AiFindWeaponSign);
+                        }
+                        else if (!enemy.IsAllWeaponTotalAmmoEmpty()) //标记当前武器的敌人已经有新的武器了
+                        {
+                            weapon.RemoveSign(SignNames.AiFindWeaponSign);
+                        }
+                        else //放弃这把武器
+                        {
+                            continue;
+                        }
+                    }
+
+                    if (target == null) //第一把武器
+                    {
+                        target = weapon;
+                    }
+                    else if (target.Position.DistanceSquaredTo(position) >
+                             weapon.Position.DistanceSquaredTo(position)) //距离更近
+                    {
+                        target = weapon;
+                    }
+                }
+            }
+        }
+
+        return target;
+    }
 
     /// <summary>
     /// 检查是否能切换到 AiStateEnum.AiLeaveFor 状态
@@ -205,7 +279,7 @@
         if (currState == AiStateEnum.AiNormal || currState == AiStateEnum.AiProbe)
         {
             //判断是否在同一个房间内
-            return Affiliation == FindTargetAffiliation;
+            return FindTargetAffiliationSet.Contains(Affiliation);
         }
         
         return false;
@@ -217,16 +291,20 @@
     public static void UpdateEnemiesView()
     {
         IsFindTarget = false;
+        FindTargetAffiliationSet.Clear();
         for (var i = 0; i < _enemieList.Count; i++)
         {
             var enemy = _enemieList[i];
             var state = enemy.StateController.CurrState;
             if (state == AiStateEnum.AiFollowUp || state == AiStateEnum.AiSurround) //目标在视野内
             {
-                IsFindTarget = true;
-                FindTargetPosition = Player.Current.GetCenterPosition();
-                FindTargetAffiliation = enemy.Affiliation;
-                break;
+                if (!IsFindTarget)
+                {
+                    IsFindTarget = true;
+                    FindTargetPosition = Player.Current.GetCenterPosition();
+                    FindTargetAffiliationSet.Add(Player.Current.Affiliation);
+                }
+                FindTargetAffiliationSet.Add(enemy.Affiliation);
             }
         }
     }
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiFindAmmoState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiFindAmmoState.cs
index f36931b..bc00378 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiFindAmmoState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiFindAmmoState.cs
@@ -2,7 +2,7 @@
 using Godot;
 
 /// <summary>
-/// Ai 寻找弹药
+/// Ai 寻找弹药, 进入该状态需要在参数中传入目标武器对象
 /// </summary>
 public class AiFindAmmoState : StateBase<Enemy, AiStateEnum>
 {
@@ -22,17 +22,18 @@
 
     public override void Enter(AiStateEnum prev, params object[] args)
     {
-        _navigationUpdateTimer = 0;
-        _isInTailAfterRange = false;
-        _tailAfterTimer = 0;
-        //找到能用的武器
-        FindTargetWeapon();
-        if (_target == null)
+        if (args.Length == 0)
         {
+            GD.PrintErr("进入 AiStateEnum.AiFindAmmo 状态必须要把目标武器当成参数传过来");
             ChangeStateLate(prev);
             return;
         }
 
+        SetTargetWeapon((Weapon)args[0]);
+        _navigationUpdateTimer = 0;
+        _isInTailAfterRange = false;
+        _tailAfterTimer = 0;
+
         //标记武器
         _target.SetSign(SignNames.AiFindWeaponSign, Master);
     }
@@ -62,10 +63,10 @@
         //枪口指向玩家
         Master.LookTargetPosition(playerPos);
 
-        if (_target.IsQueuedForDeletion() || _target.IsTotalAmmoEmpty()) //已经被销毁, 或者弹药已经被其他角色捡走
+        if (_target.IsDestroyed || _target.IsTotalAmmoEmpty()) //已经被销毁, 或者弹药已经被其他角色捡走
         {
             //再去寻找其他武器
-            FindTargetWeapon();
+            SetTargetWeapon(Master.FindTargetWeapon());
 
             if (_target == null) //也没有其他可用的武器了
             {
@@ -79,7 +80,7 @@
         else if (_target.Master != null) //武器已经被其他角色拾起!
         {
             //再去寻找其他武器
-            FindTargetWeapon();
+            SetTargetWeapon(Master.FindTargetWeapon());
 
             if (_target == null) //也没有其他可用的武器了
             {
@@ -120,6 +121,16 @@
     {
         return _tailAfterTimer > 10 ? AiStateEnum.AiNormal : AiStateEnum.AiTailAfter;
     }
+
+    private void SetTargetWeapon(Weapon weapon)
+    {
+        _target = weapon;
+        //设置目标点
+        if (_target != null)
+        {
+            Master.NavigationAgent2D.TargetPosition = _target.GlobalPosition;
+        }
+    }
     
     public override void DebugDraw()
     {
@@ -138,53 +149,4 @@
             
         }
     }
-
-    private void FindTargetWeapon()
-    {
-        _target = null;
-        var position = Master.Position;
-        foreach (var weapon in Weapon.UnclaimedWeapons)
-        {
-            if (!weapon.IsTotalAmmoEmpty())
-            {
-                //查询是否有其他敌人标记要拾起该武器
-                if (weapon.HasSign(SignNames.AiFindWeaponSign))
-                {
-                    var enemy = weapon.GetSign<Enemy>(SignNames.AiFindWeaponSign);
-                    if (enemy == Master) //就是自己标记的
-                    {
-
-                    }
-                    else if (enemy == null || enemy.IsQueuedForDeletion()) //标记当前武器的敌人已经被销毁
-                    {
-                        weapon.RemoveSign(SignNames.AiFindWeaponSign);
-                    }
-                    else if (!enemy.IsAllWeaponTotalAmmoEmpty()) //标记当前武器的敌人已经有新的武器了
-                    {
-                        weapon.RemoveSign(SignNames.AiFindWeaponSign);
-                    }
-                    else //放弃这把武器
-                    {
-                        continue;
-                    }
-                }
-
-                if (_target == null) //第一把武器
-                {
-                    _target = weapon;
-                }
-                else if (_target.Position.DistanceSquaredTo(position) >
-                         weapon.Position.DistanceSquaredTo(position)) //距离更近
-                {
-                    _target = weapon;
-                }
-            }
-        }
-
-        //设置目标点
-        if (_target != null)
-        {
-            Master.NavigationAgent2D.TargetPosition = _target.GlobalPosition;
-        }
-    }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiFollowUpState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiFollowUpState.cs
index c3082d3..fd6850a 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiFollowUpState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiFollowUpState.cs
@@ -32,10 +32,10 @@
         if (Master.IsAllWeaponTotalAmmoEmpty())
         {
             //再寻找是否有可用的武器
-            if (Master.CheckUsableWeaponInUnclaimed())
+            var targetWeapon = Master.FindTargetWeapon();
+            if (targetWeapon != null)
             {
-                //切换到寻找武器状态
-                ChangeStateLate(AiStateEnum.AiFindAmmo);
+                ChangeStateLate(AiStateEnum.AiFindAmmo, targetWeapon);
                 return;
             }
             else
@@ -44,7 +44,7 @@
                 ChangeStateLate(AiStateEnum.AiSurround);
             }
         }
-        
+
         var playerPos = Player.Current.GetCenterPosition();
 
         //更新玩家位置
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiLeaveForState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiLeaveForState.cs
index 80766a7..7823d03 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiLeaveForState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiLeaveForState.cs
@@ -25,15 +25,15 @@
             ChangeStateLate(prev);
             return;
         }
-        
+
         //先检查弹药是否打光
         if (Master.IsAllWeaponTotalAmmoEmpty())
         {
             //再寻找是否有可用的武器
-            if (Master.CheckUsableWeaponInUnclaimed())
+            var targetWeapon = Master.FindTargetWeapon();
+            if (targetWeapon != null)
             {
-                //切换到寻找武器状态
-                ChangeStateLate(AiStateEnum.AiFindAmmo);
+                ChangeStateLate(AiStateEnum.AiFindAmmo, targetWeapon);
             }
         }
     }
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs
index dc6faa8..d0f9b01 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs
@@ -25,6 +25,11 @@
     private float _pauseTimer;
     private bool _moveFlag;
 
+    //上一帧位置
+    private Vector2 _prevPos;
+    //卡在一个位置的时间
+    private float _lockTimer;
+
     public AiNormalState() : base(AiStateEnum.AiNormal)
     {
     }
@@ -77,7 +82,13 @@
             }
             else //移动中
             {
-                if (Master.NavigationAgent2D.IsNavigationFinished()) //到达终点
+                if (_lockTimer >= 1) //卡在一个点超过一秒
+                {
+                    RunOver();
+                    _isMoveOver = false;
+                    _lockTimer = 0;
+                }
+                else if (Master.NavigationAgent2D.IsNavigationFinished()) //到达终点
                 {
                     _pauseTimer = Utils.RandomRangeFloat(0.3f, 2f);
                     _isMoveOver = true;
@@ -87,14 +98,17 @@
                 else if (!_moveFlag)
                 {
                     _moveFlag = true;
+                    var pos = Master.GlobalPosition;
                     //计算移动
                     var nextPos = Master.NavigationAgent2D.GetNextPathPosition();
                     Master.AnimatedSprite.Play(AnimatorNames.Run);
-                    Master.BasisVelocity = (nextPos - Master.GlobalPosition - Master.NavigationPoint.Position).Normalized() *
+                    Master.BasisVelocity = (nextPos - pos - Master.NavigationPoint.Position).Normalized() *
                                            Master.MoveSpeed;
+                    _prevPos = pos;
                 }
                 else
                 {
+                    var pos = Master.GlobalPosition;
                     var lastSlideCollision = Master.GetLastSlideCollision();
                     if (lastSlideCollision != null && lastSlideCollision.GetCollider() is Role) //碰到其他角色
                     {
@@ -108,9 +122,18 @@
                         //计算移动
                         var nextPos = Master.NavigationAgent2D.GetNextPathPosition();
                         Master.AnimatedSprite.Play(AnimatorNames.Run);
-                        Master.BasisVelocity = (nextPos - Master.GlobalPosition - Master.NavigationPoint.Position).Normalized() *
+                        Master.BasisVelocity = (nextPos - pos - Master.NavigationPoint.Position).Normalized() *
                                                Master.MoveSpeed;
                     }
+
+                    if (_prevPos.DistanceSquaredTo(pos) <= 0.01f)
+                    {
+                        _lockTimer += delta;
+                    }
+                    else
+                    {
+                        _prevPos = pos;
+                    }
                 }
             }
 
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiSurroundState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiSurroundState.cs
index 1c5e18f..64a42f6 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiSurroundState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiSurroundState.cs
@@ -20,6 +20,11 @@
     
     //下一个移动点
     private Vector2 _nextPosition;
+    
+    //上一帧位置
+    private Vector2 _prevPos;
+    //卡在一个位置的时间
+    private float _lockTimer;
 
     public AiSurroundState() : base(AiStateEnum.AiSurround)
     {
@@ -39,14 +44,14 @@
         if (Master.IsAllWeaponTotalAmmoEmpty())
         {
             //再寻找是否有可用的武器
-            if (Master.CheckUsableWeaponInUnclaimed())
+            var targetWeapon = Master.FindTargetWeapon();
+            if (targetWeapon != null)
             {
-                //切换到寻找武器状态
-                ChangeStateLate(AiStateEnum.AiFindAmmo);
+                ChangeStateLate(AiStateEnum.AiFindAmmo, targetWeapon);
                 return;
             }
         }
-        
+
         var playerPos = Player.Current.GetCenterPosition();
         var weapon = Master.Holster.ActiveWeapon;
 
@@ -79,7 +84,13 @@
             }
             else
             {
-                if (Master.NavigationAgent2D.IsNavigationFinished()) //到达终点
+                if (_lockTimer >= 1) //卡在一个点超过一秒
+                {
+                    RunOver(playerPos);
+                    _isMoveOver = false;
+                    _lockTimer = 0;
+                }
+                else if (Master.NavigationAgent2D.IsNavigationFinished()) //到达终点
                 {
                     _pauseTimer = Utils.RandomRangeFloat(0f, 0.5f);
                     _isMoveOver = true;
@@ -90,6 +101,7 @@
                 {
                     _moveFlag = true;
                     //计算移动
+                    var pos = Master.GlobalPosition;
                     var nextPos = Master.NavigationAgent2D.GetNextPathPosition();
                     Master.AnimatedSprite.Play(AnimatorNames.Run);
                     Master.BasisVelocity = (nextPos - Master.GlobalPosition - Master.NavigationPoint.Position).Normalized() *
@@ -97,6 +109,7 @@
                 }
                 else
                 {
+                    var pos = Master.GlobalPosition;
                     var lastSlideCollision = Master.GetLastSlideCollision();
                     if (lastSlideCollision != null && lastSlideCollision.GetCollider() is Role) //碰到其他角色
                     {
@@ -110,9 +123,18 @@
                         //计算移动
                         var nextPos = Master.NavigationAgent2D.GetNextPathPosition();
                         Master.AnimatedSprite.Play(AnimatorNames.Run);
-                        Master.BasisVelocity = (nextPos - Master.GlobalPosition - Master.NavigationPoint.Position).Normalized() *
+                        Master.BasisVelocity = (nextPos - pos - Master.NavigationPoint.Position).Normalized() *
                                                Master.MoveSpeed;
                     }
+                    
+                    if (_prevPos.DistanceSquaredTo(pos) <= 0.01f)
+                    {
+                        _lockTimer += delta;
+                    }
+                    else
+                    {
+                        _prevPos = pos;
+                    }
                 }
 
                 if (weapon != null)
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiTailAfterState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiTailAfterState.cs
index 8d3d507..f965f41 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiTailAfterState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiTailAfterState.cs
@@ -32,10 +32,10 @@
         if (Master.IsAllWeaponTotalAmmoEmpty())
         {
             //再寻找是否有可用的武器
-            if (Master.CheckUsableWeaponInUnclaimed())
+            var targetWeapon = Master.FindTargetWeapon();
+            if (targetWeapon != null)
             {
-                //切换到寻找武器状态
-                ChangeStateLate(AiStateEnum.AiFindAmmo);
+                ChangeStateLate(AiStateEnum.AiFindAmmo, targetWeapon);
             }
         }
     }
diff --git a/DungeonShooting_Godot/src/game/room/RoomDoor.cs b/DungeonShooting_Godot/src/game/room/RoomDoor.cs
index 597f1be..3f78acf 100644
--- a/DungeonShooting_Godot/src/game/room/RoomDoor.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomDoor.cs
@@ -1,26 +1,72 @@
 
+/// <summary>
+/// 房间的门, 门有两种状态, 打开和关闭
+/// </summary>
 [RegisterActivity(ActivityIdPrefix.Other + "0001", ResourcePath.prefab_map_RoomDoor_tscn)]
 public partial class RoomDoor : ActivityObject
 {
-    private RoomDoorInfo _door;
+    /// <summary>
+    /// 门的方向
+    /// </summary>
+    public DoorDirection Direction => _door.Direction;
     
+    /// <summary>
+    /// 门是否关闭
+    /// </summary>
+    public bool IsClose { get; private set; }
+    
+    private RoomDoorInfo _door;
+
+    /// <summary>
+    /// 初始化调用
+    /// </summary>
     public void Init(RoomDoorInfo doorInfo)
     {
         _door = doorInfo;
-        CloseDoor();
+        OpenDoor();
+
+        switch (doorInfo.Direction)
+        {
+            case DoorDirection.E:
+                RotationDegrees = 90;
+                break;
+            case DoorDirection.W:
+                RotationDegrees = 270;
+                break;
+            case DoorDirection.S:
+                RotationDegrees = 180;
+                break;
+            case DoorDirection.N:
+                RotationDegrees = 0;
+                break;
+        }
     }
 
+    /// <summary>
+    /// 打开当前的门
+    /// </summary>
     public void OpenDoor()
     {
+        IsClose = false;
         Visible = false;
         Collision.Disabled = true;
-        _door.Navigation.NavigationNode.Enabled = true;
+        _door.Navigation.OpenNavigationNode.Enabled = true;
+        _door.Navigation.OpenNavigationNode.Visible = true;
+        _door.Navigation.CloseNavigationNode.Enabled = false;
+        _door.Navigation.CloseNavigationNode.Visible = false;
     }
 
+    /// <summary>
+    /// 关闭当前的门
+    /// </summary>
     public void CloseDoor()
     {
+        IsClose = true;
         Visible = true;
         Collision.Disabled = false;
-        _door.Navigation.NavigationNode.Enabled = false;
+        _door.Navigation.OpenNavigationNode.Enabled = false;
+        _door.Navigation.OpenNavigationNode.Visible = false;
+        _door.Navigation.CloseNavigationNode.Enabled = true;
+        _door.Navigation.CloseNavigationNode.Visible = true;
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs
index 47f35be..02a61d5 100644
--- a/DungeonShooting_Godot/src/game/room/RoomManager.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs
@@ -26,6 +26,16 @@
     /// 玩家对象
     /// </summary>
     public Player Player { get; private set; }
+
+    /// <summary>
+    /// 当前玩家所在的房间
+    /// </summary>
+    public RoomInfo ActiveRoom => Player?.Affiliation?.RoomInfo;
+    
+    /// <summary>
+    /// 当前玩家所在的区域
+    /// </summary>
+    public AffiliationArea ActiveAffiliation => Player?.Affiliation;
     
     private DungeonTile _dungeonTile;
     private AutoTileConfig _autoTileConfig;
@@ -35,16 +45,22 @@
 
     private int _affiliationIndex = 0;
 
+    private float _checkEnemyTimer = 0;
+
     //房间内所有静态导航网格数据
     private static List<NavigationPolygonData> _roomStaticNavigationList = new List<NavigationPolygonData>();
     
     public override void _Ready()
     {
         TileRoot.YSortEnabled = false;
-        //FloorTileMap.NavigationVisibilityMode = TileMap.VisibilityMode.ForceShow;
         
         _font = ResourceManager.Load<Font>(ResourcePath.resource_font_cn_font_36_tres);
 
+        //绑定事件
+        //EventManager.AddEventListener(EventEnum.OnEnemyDie, OnEnemyDie);
+        EventManager.AddEventListener(EventEnum.OnPlayerFirstEnterRoom, OnPlayerFirstEnterRoom);
+        EventManager.AddEventListener(EventEnum.OnPlayerEnterRoom, OnPlayerEnterRoom);
+        
         var nowTicks = DateTime.Now.Ticks;
         //生成地牢房间
         _generateDungeon = new GenerateDungeon();
@@ -60,19 +76,16 @@
         //挂载过道导航区域
         _dungeonTile.MountNavigationPolygon(this);
         //过道导航区域数据
-        var aisleData = _dungeonTile.GetPolygonData();
-        _roomStaticNavigationList.AddRange(aisleData);
+        _roomStaticNavigationList.AddRange(_dungeonTile.GetPolygonData());
         //门导航区域数据
         _roomStaticNavigationList.AddRange(_dungeonTile.GetConnectDoorPolygonData());
-        //创建过道的归属区域
-        CreateAisleAffiliation(aisleData);
         //初始化所有房间
         _generateDungeon.EachRoom(InitRoom);
 
         GD.Print("生成地牢用时: " + (DateTime.Now.Ticks - nowTicks) / 10000 + "毫秒");
 
         //播放bgm
-        SoundManager.PlayMusic(ResourcePath.resource_sound_bgm_Intro_ogg, -17f);
+        //SoundManager.PlayMusic(ResourcePath.resource_sound_bgm_Intro_ogg, -17f);
 
         //创建玩家
         Player = ActivityObject.Create<Player>(ActivityIdPrefix.Role + "0001");
@@ -81,9 +94,9 @@
         Player.PutDown(RoomLayerEnum.YSortLayer);
         
         Player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityIdPrefix.Weapon + "0001"));
-        Player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityIdPrefix.Weapon + "0002"));
+        // Player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityIdPrefix.Weapon + "0002"));
         // Player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityIdPrefix.Weapon + "0004"));
-        Player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityIdPrefix.Weapon + "0003"));
+        // Player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityIdPrefix.Weapon + "0003"));
 
         //相机跟随玩家
         GameCamera.Main.SetFollowTarget(Player);
@@ -94,11 +107,20 @@
         cursor.SetMountRole(Player);
     }
 
+    public override void _PhysicsProcess(double delta)
+    {
+        _checkEnemyTimer += (float)delta;
+        if (_checkEnemyTimer >= 1)
+        {
+            _checkEnemyTimer %= 1;
+            //检查房间内的敌人存活状况
+            OnCheckEnemy();
+        }
+    }
+
     /// <summary>
     /// 获取指定层级根节点
     /// </summary>
-    /// <param name="layerEnum"></param>
-    /// <returns></returns>
     public Node2D GetRoomLayer(RoomLayerEnum layerEnum)
     {
         switch (layerEnum)
@@ -127,9 +149,6 @@
         {
             if (_dungeonTile != null)
             {
-                // DrawLine(new Vector2(0, -5000), new Vector2(0, 5000), Colors.Green);
-                // DrawLine(new Vector2(-5000, 0), new Vector2(5000, 0), Colors.Green);
-                
                 //绘制ai寻路区域
                 Utils.DrawNavigationPolygon(this, _roomStaticNavigationList.ToArray());
             }
@@ -148,12 +167,6 @@
         
         //创建房间归属区域
         CreateRoomAisleAffiliation(roomInfo);
-        
-        //创建敌人
-        foreach (var roomInfoActivityMark in roomInfo.ActivityMarks)
-        {
-            //roomInfoActivityMark.BeReady(roomInfo);
-        }
     }
     
     //挂载房间导航区域
@@ -214,9 +227,8 @@
                 default: offset = new Vector2();
                     break;
             }
-            door.Position = (doorInfo.OriginPosition + offset) * GenerateDungeon.TileCellSize;
+            door.Position = (doorInfo.OriginPosition + offset) * GameConfig.TileCellSize;
             door.Init(doorInfo);
-            door.OpenDoor();
             door.PutDown(RoomLayerEnum.NormalLayer, false);
         }
     }
@@ -226,25 +238,53 @@
     {
         var affiliation = new AffiliationArea();
         affiliation.Name = "AffiliationArea" + (_affiliationIndex++);
-        affiliation.Init(new Rect2(roomInfo.GetWorldPosition(), roomInfo.Size * GenerateDungeon.TileCellSize));
+        affiliation.Init(roomInfo, new Rect2(
+            roomInfo.GetWorldPosition() + new Vector2(GameConfig.TileCellSize, GameConfig.TileCellSize),
+            (roomInfo.Size - new Vector2I(2, 2)) * GameConfig.TileCellSize));
         
         roomInfo.Affiliation = affiliation;
         TileRoot.AddChild(affiliation);
     }
-    
-    //创建过道归属区域
-    private void CreateAisleAffiliation(NavigationPolygonData[] aisleData)
+
+    /// <summary>
+    /// 玩家第一次进入某个房间回调
+    /// </summary>
+    private void OnPlayerFirstEnterRoom(object o)
     {
-        foreach (var aisle in aisleData)
-        {
-            var affiliation = new AffiliationArea();
-            affiliation.Name = "AffiliationArea" + (_affiliationIndex++);
-            affiliation.Init(aisle.ConvertPointsToVector2Array());
-            
-            TileRoot.AddChild(affiliation);
-        }
+        var room = (RoomInfo)o;
+        room.BeReady();
+    }
+
+    /// <summary>
+    /// 玩家进入某个房间回调
+    /// </summary>
+    private void OnPlayerEnterRoom(object o)
+    {
     }
     
+    /// <summary>
+    /// 检测当前房间敌人是否已经消灭干净, 应当每秒执行一次
+    /// </summary>
+    private void OnCheckEnemy()
+    {
+        var activeRoom = ActiveRoom;
+        if (activeRoom != null && activeRoom.IsSeclusion)
+        {
+            if (activeRoom.IsCurrWaveOver()) //所有标记执行完成
+            {
+                //存活敌人数量
+                var count = ActiveAffiliation.FindIncludeItemsCount(
+                    activityObject => activityObject.CollisionWithMask(PhysicsLayer.Enemy)
+                );
+                GD.Print("当前房间存活数量: " + count);
+                if (count == 0)
+                {
+                    activeRoom.OnClearRoom();
+                }
+            }
+        }
+    }
+
     //绘制房间区域, debug 用
     private void DrawRoomInfo(RoomInfo room)
     {