diff --git a/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn b/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn
index da3e9b7..0cbeb8b 100644
--- a/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn
+++ b/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn
@@ -4,7 +4,63 @@
 
 [node name="MapEditorCreateMark" type="Control"]
 layout_mode = 3
-anchors_preset = 0
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource("1_cjivg")
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 50
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="WaveNameLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 20.0
+text = "所属波数："
+horizontal_alignment = 2
+vertical_alignment = 1
+
+[node name="WaveOption" type="OptionButton" parent="MarginContainer/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 80.0
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="DelayNameLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 20.0
+text = "延时时间："
+horizontal_alignment = 2
+vertical_alignment = 1
+
+[node name="DelayInput" type="SpinBox" parent="MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 80.0
+max_value = 30.0
+step = 0.01
+custom_arrow_step = 0.1
+
+[node name="AddMark" type="Button" parent="MarginContainer/VBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 4
+text = "添加物体"
diff --git a/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn b/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn
index 9ce32d5..e56477f 100644
--- a/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn
+++ b/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://ie52mo5t6l2h"]
+[gd_scene load_steps=5 format=3 uid="uid://ie52mo5t6l2h"]
 
 [ext_resource type="Script" path="res://src/game/ui/mapEditorSelectObject/MapEditorSelectObjectPanel.cs" id="1_hdfkd"]
 [ext_resource type="Material" uid="uid://cces3bhds7jyi" path="res://resource/material/Blend.tres" id="2_j6gjm"]
 [ext_resource type="Texture2D" uid="uid://bn47bmilcw4x0" path="res://resource/sprite/ui/commonIcon/Select2.png" id="3_4nhjm"]
+[ext_resource type="Texture2D" uid="uid://blfvsup876agh" path="res://resource/sprite/ui/commonIcon/Search.png" id="3_laasd"]
 
 [node name="MapEditorSelectObject" type="Control"]
 layout_mode = 3
@@ -13,7 +14,7 @@
 grow_vertical = 2
 script = ExtResource("1_hdfkd")
 
-[node name="ScrollContainer" type="ScrollContainer" parent="."]
+[node name="HBoxContainer" type="HSplitContainer" parent="."]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -21,11 +22,106 @@
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="ObjectButton" type="Button" parent="ScrollContainer"]
-custom_minimum_size = Vector2(150, 192)
+[node name="Panel" type="Panel" parent="HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 25.0
+
+[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/Panel"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 2
+theme_override_constants/margin_top = 2
+theme_override_constants/margin_right = 2
+theme_override_constants/margin_bottom = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/Panel/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="ScrollContainer" type="ScrollContainer" parent="HBoxContainer/Panel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="TypeButton" type="Button" parent="HBoxContainer/Panel/MarginContainer/VBoxContainer/ScrollContainer"]
+custom_minimum_size = Vector2(0, 80)
+layout_mode = 2
+size_flags_horizontal = 3
+text = "所有类型"
+
+[node name="Select" type="NinePatchRect" parent="HBoxContainer/Panel/MarginContainer/VBoxContainer/ScrollContainer/TypeButton"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = ExtResource("3_4nhjm")
+patch_margin_left = 3
+patch_margin_top = 3
+patch_margin_right = 3
+patch_margin_bottom = 3
+
+[node name="Panel2" type="Panel" parent="HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 75.0
+
+[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/Panel2"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 2
+theme_override_constants/margin_top = 2
+theme_override_constants/margin_right = 2
+theme_override_constants/margin_bottom = 2
+
+[node name="VBoxContainer2" type="VBoxContainer" parent="HBoxContainer/Panel2/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2"]
+layout_mode = 2
+theme_override_constants/margin_left = 2
+theme_override_constants/margin_top = 2
+theme_override_constants/margin_right = 2
+theme_override_constants/margin_bottom = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2/MarginContainer"]
+custom_minimum_size = Vector2(0, 100)
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="LineEdit" type="LineEdit" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2/MarginContainer/HBoxContainer"]
+custom_minimum_size = Vector2(500, 44)
+layout_mode = 2
+size_flags_vertical = 4
+placeholder_text = "搜索名称/id"
+
+[node name="Search" type="Button" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2/MarginContainer/HBoxContainer"]
+custom_minimum_size = Vector2(44, 44)
+layout_mode = 2
+size_flags_vertical = 4
+icon = ExtResource("3_laasd")
+
+[node name="ScrollContainer" type="ScrollContainer" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+size_flags_stretch_ratio = 75.0
+
+[node name="ObjectButton" type="Button" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2/ScrollContainer"]
+custom_minimum_size = Vector2(124, 160)
 layout_mode = 2
 
-[node name="PreviewImage" type="TextureRect" parent="ScrollContainer/ObjectButton"]
+[node name="PreviewImage" type="TextureRect" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2/ScrollContainer/ObjectButton"]
 material = ExtResource("2_j6gjm")
 layout_mode = 1
 anchors_preset = 15
@@ -34,20 +130,20 @@
 offset_left = 2.0
 offset_top = 2.0
 offset_right = -2.0
-offset_bottom = -44.0
+offset_bottom = -38.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 stretch_mode = 5
 
-[node name="ObjectName" type="Label" parent="ScrollContainer/ObjectButton"]
+[node name="ObjectName" type="Label" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2/ScrollContainer/ObjectButton"]
 layout_mode = 1
 anchors_preset = 12
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_top = -43.0
-offset_right = 150.0
+offset_right = 124.0
 offset_bottom = 43.0
 grow_horizontal = 2
 grow_vertical = 0
@@ -59,7 +155,7 @@
 clip_text = true
 text_overrun_behavior = 3
 
-[node name="SelectImage" type="NinePatchRect" parent="ScrollContainer/ObjectButton"]
+[node name="Select" type="NinePatchRect" parent="HBoxContainer/Panel2/MarginContainer/VBoxContainer2/ScrollContainer/ObjectButton"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
diff --git a/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs b/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs
index a0777bc..13b5c5f 100644
--- a/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs
+++ b/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs
@@ -161,7 +161,7 @@
     {
         var window = UiManager.Open_EditorWindow();
         window.SetWindowTitle("创建标记");
-        window.SetWindowSize(new Vector2I(700, 600));
+        window.SetWindowSize(new Vector2I(1200, 900));
         var body = window.OpenBody<MapEditorCreateMarkPanel>(UiManager.UiName.MapEditorCreateMark);
         window.SetButtonList(
             new EditorWindowPanel.ButtonData("确定", () =>
@@ -183,8 +183,18 @@
     public static void ShowSelectObject(string title)
     {
         var window = UiManager.Open_EditorWindow();
-        window.S_Window.Instance.Size = new Vector2I(900, 600);
+        window.S_Window.Instance.Size = new Vector2I(1000, 700);
         window.SetWindowTitle(title);
         window.OpenBody(UiManager.UiName.MapEditorSelectObject);
+        window.SetButtonList(
+            new EditorWindowPanel.ButtonData("确定", () =>
+            {
+                window.CloseWindow();
+            }),
+            new EditorWindowPanel.ButtonData("取消", () =>
+            {
+                window.CloseWindow();
+            })
+        );
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs
index eadfbed..fc49e0b 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs
@@ -5,6 +5,19 @@
 /// </summary>
 public abstract partial class MapEditorCreateMark : UiBase
 {
+    /// <summary>
+    /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.MarginContainer"/>, 节点路径: MapEditorCreateMark.MarginContainer
+    /// </summary>
+    public MarginContainer L_MarginContainer
+    {
+        get
+        {
+            if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer((MapEditorCreateMarkPanel)this, GetNodeOrNull<Godot.MarginContainer>("MarginContainer"));
+            return _L_MarginContainer;
+        }
+    }
+    private MarginContainer _L_MarginContainer;
+
 
     public MapEditorCreateMark() : base(nameof(MapEditorCreateMark))
     {
@@ -14,5 +27,235 @@
     {
     }
 
+    /// <summary>
+    /// 类型: <see cref="Godot.Label"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer2.WaveNameLabel
+    /// </summary>
+    public class WaveNameLabel : UiNode<MapEditorCreateMarkPanel, Godot.Label, WaveNameLabel>
+    {
+        public WaveNameLabel(MapEditorCreateMarkPanel uiPanel, Godot.Label node) : base(uiPanel, node) {  }
+        public override WaveNameLabel Clone() => new (UiPanel, (Godot.Label)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.OptionButton"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer2.WaveOption
+    /// </summary>
+    public class WaveOption : UiNode<MapEditorCreateMarkPanel, Godot.OptionButton, WaveOption>
+    {
+        public WaveOption(MapEditorCreateMarkPanel uiPanel, Godot.OptionButton node) : base(uiPanel, node) {  }
+        public override WaveOption Clone() => new (UiPanel, (Godot.OptionButton)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer2
+    /// </summary>
+    public class HBoxContainer2 : UiNode<MapEditorCreateMarkPanel, Godot.HBoxContainer, HBoxContainer2>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.WaveNameLabel
+        /// </summary>
+        public WaveNameLabel L_WaveNameLabel
+        {
+            get
+            {
+                if (_L_WaveNameLabel == null) _L_WaveNameLabel = new WaveNameLabel(UiPanel, Instance.GetNodeOrNull<Godot.Label>("WaveNameLabel"));
+                return _L_WaveNameLabel;
+            }
+        }
+        private WaveNameLabel _L_WaveNameLabel;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.OptionButton"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.WaveOption
+        /// </summary>
+        public WaveOption L_WaveOption
+        {
+            get
+            {
+                if (_L_WaveOption == null) _L_WaveOption = new WaveOption(UiPanel, Instance.GetNodeOrNull<Godot.OptionButton>("WaveOption"));
+                return _L_WaveOption;
+            }
+        }
+        private WaveOption _L_WaveOption;
+
+        public HBoxContainer2(MapEditorCreateMarkPanel uiPanel, Godot.HBoxContainer node) : base(uiPanel, node) {  }
+        public override HBoxContainer2 Clone() => new (UiPanel, (Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Label"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer.DelayNameLabel
+    /// </summary>
+    public class DelayNameLabel : UiNode<MapEditorCreateMarkPanel, Godot.Label, DelayNameLabel>
+    {
+        public DelayNameLabel(MapEditorCreateMarkPanel uiPanel, Godot.Label node) : base(uiPanel, node) {  }
+        public override DelayNameLabel Clone() => new (UiPanel, (Godot.Label)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.SpinBox"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer.DelayInput
+    /// </summary>
+    public class DelayInput : UiNode<MapEditorCreateMarkPanel, Godot.SpinBox, DelayInput>
+    {
+        public DelayInput(MapEditorCreateMarkPanel uiPanel, Godot.SpinBox node) : base(uiPanel, node) {  }
+        public override DelayInput Clone() => new (UiPanel, (Godot.SpinBox)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer
+    /// </summary>
+    public class HBoxContainer : UiNode<MapEditorCreateMarkPanel, Godot.HBoxContainer, HBoxContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.DelayNameLabel
+        /// </summary>
+        public DelayNameLabel L_DelayNameLabel
+        {
+            get
+            {
+                if (_L_DelayNameLabel == null) _L_DelayNameLabel = new DelayNameLabel(UiPanel, Instance.GetNodeOrNull<Godot.Label>("DelayNameLabel"));
+                return _L_DelayNameLabel;
+            }
+        }
+        private DelayNameLabel _L_DelayNameLabel;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.SpinBox"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.DelayInput
+        /// </summary>
+        public DelayInput L_DelayInput
+        {
+            get
+            {
+                if (_L_DelayInput == null) _L_DelayInput = new DelayInput(UiPanel, Instance.GetNodeOrNull<Godot.SpinBox>("DelayInput"));
+                return _L_DelayInput;
+            }
+        }
+        private DelayInput _L_DelayInput;
+
+        public HBoxContainer(MapEditorCreateMarkPanel uiPanel, Godot.HBoxContainer node) : base(uiPanel, node) {  }
+        public override HBoxContainer Clone() => new (UiPanel, (Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.AddMark
+    /// </summary>
+    public class AddMark : UiNode<MapEditorCreateMarkPanel, Godot.Button, AddMark>
+    {
+        public AddMark(MapEditorCreateMarkPanel uiPanel, Godot.Button node) : base(uiPanel, node) {  }
+        public override AddMark Clone() => new (UiPanel, (Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.VBoxContainer"/>, 路径: MapEditorCreateMark.MarginContainer.VBoxContainer
+    /// </summary>
+    public class VBoxContainer : UiNode<MapEditorCreateMarkPanel, Godot.VBoxContainer, VBoxContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: MapEditorCreateMark.MarginContainer.HBoxContainer2
+        /// </summary>
+        public HBoxContainer2 L_HBoxContainer2
+        {
+            get
+            {
+                if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new HBoxContainer2(UiPanel, Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer2"));
+                return _L_HBoxContainer2;
+            }
+        }
+        private HBoxContainer2 _L_HBoxContainer2;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: MapEditorCreateMark.MarginContainer.HBoxContainer
+        /// </summary>
+        public HBoxContainer L_HBoxContainer
+        {
+            get
+            {
+                if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer(UiPanel, Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer"));
+                return _L_HBoxContainer;
+            }
+        }
+        private HBoxContainer _L_HBoxContainer;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorCreateMark.MarginContainer.AddMark
+        /// </summary>
+        public AddMark L_AddMark
+        {
+            get
+            {
+                if (_L_AddMark == null) _L_AddMark = new AddMark(UiPanel, Instance.GetNodeOrNull<Godot.Button>("AddMark"));
+                return _L_AddMark;
+            }
+        }
+        private AddMark _L_AddMark;
+
+        public VBoxContainer(MapEditorCreateMarkPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) {  }
+        public override VBoxContainer Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.MarginContainer"/>, 路径: MapEditorCreateMark.MarginContainer
+    /// </summary>
+    public class MarginContainer : UiNode<MapEditorCreateMarkPanel, Godot.MarginContainer, MarginContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.VBoxContainer"/>, 节点路径: MapEditorCreateMark.VBoxContainer
+        /// </summary>
+        public VBoxContainer L_VBoxContainer
+        {
+            get
+            {
+                if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer(UiPanel, Instance.GetNodeOrNull<Godot.VBoxContainer>("VBoxContainer"));
+                return _L_VBoxContainer;
+            }
+        }
+        private VBoxContainer _L_VBoxContainer;
+
+        public MarginContainer(MapEditorCreateMarkPanel uiPanel, Godot.MarginContainer node) : base(uiPanel, node) {  }
+        public override MarginContainer Clone() => new (UiPanel, (Godot.MarginContainer)Instance.Duplicate());
+    }
+
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer2.WaveNameLabel
+    /// </summary>
+    public WaveNameLabel S_WaveNameLabel => L_MarginContainer.L_VBoxContainer.L_HBoxContainer2.L_WaveNameLabel;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.OptionButton"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer2.WaveOption
+    /// </summary>
+    public WaveOption S_WaveOption => L_MarginContainer.L_VBoxContainer.L_HBoxContainer2.L_WaveOption;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer2
+    /// </summary>
+    public HBoxContainer2 S_HBoxContainer2 => L_MarginContainer.L_VBoxContainer.L_HBoxContainer2;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer.DelayNameLabel
+    /// </summary>
+    public DelayNameLabel S_DelayNameLabel => L_MarginContainer.L_VBoxContainer.L_HBoxContainer.L_DelayNameLabel;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.SpinBox"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer.DelayInput
+    /// </summary>
+    public DelayInput S_DelayInput => L_MarginContainer.L_VBoxContainer.L_HBoxContainer.L_DelayInput;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer
+    /// </summary>
+    public HBoxContainer S_HBoxContainer => L_MarginContainer.L_VBoxContainer.L_HBoxContainer;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.AddMark
+    /// </summary>
+    public AddMark S_AddMark => L_MarginContainer.L_VBoxContainer.L_AddMark;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.VBoxContainer"/>, 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer
+    /// </summary>
+    public VBoxContainer S_VBoxContainer => L_MarginContainer.L_VBoxContainer;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.MarginContainer"/>, 节点路径: MapEditorCreateMark.MarginContainer
+    /// </summary>
+    public MarginContainer S_MarginContainer => L_MarginContainer;
 
 }
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs
index 868a2d8..cae31d0 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs
@@ -7,7 +7,7 @@
 
     public override void OnCreateUi()
     {
-        
+        S_AddMark.Instance.Pressed += OnAddMark;
     }
 
     public override void OnDestroyUi()
@@ -15,4 +15,8 @@
         
     }
 
+    private void OnAddMark()
+    {
+        EditorWindowManager.ShowSelectObject("选择物体");
+    }
 }
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs
index 2449ccc..ed3a59e 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs
@@ -78,7 +78,14 @@
             optionButton.AddItem($"{item.Name} ({item.Weight})");
         }
 
-        optionButton.Selected = selectIndex;
+        if (selectIndex == -1 && preinstall.Count > 0)
+        {
+            OnItemSelected(0);
+        }
+        else
+        {
+            OnItemSelected(selectIndex);
+        }
     }
 
     /// <summary>
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorProject/MapEditorProjectPanel.cs b/DungeonShooting_Godot/src/game/ui/mapEditorProject/MapEditorProjectPanel.cs
index 95ca976..3cb597a 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditorProject/MapEditorProjectPanel.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorProject/MapEditorProjectPanel.cs
@@ -41,6 +41,16 @@
         _roomGrid.SetAutoColumns(true);
         _roomGrid.SetCellOffset(new Vector2I(10, 10));
         _roomGrid.SetHorizontalExpand(true);
+
+        if (PrevUi != null)
+        {
+            S_Back.Instance.Visible = true;
+            S_Back.Instance.Pressed += OpenPrevUi;
+        }
+        else
+        {
+            S_Back.Instance.Visible = false;
+        }
         
         S_GroupSearchButton.Instance.Pressed += OnSearchGroupButtonClick;
         S_RoomSearchButton.Instance.Pressed += OnSearchRoomButtonClick;
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObject.cs b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObject.cs
index 2c4dfd9..6cfc7e8 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObject.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObject.cs
@@ -6,17 +6,17 @@
 public abstract partial class MapEditorSelectObject : UiBase
 {
     /// <summary>
-    /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.ScrollContainer"/>, 节点路径: MapEditorSelectObject.ScrollContainer
+    /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HSplitContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer
     /// </summary>
-    public ScrollContainer L_ScrollContainer
+    public HBoxContainer L_HBoxContainer
     {
         get
         {
-            if (_L_ScrollContainer == null) _L_ScrollContainer = new ScrollContainer(this, GetNodeOrNull<Godot.ScrollContainer>("ScrollContainer"));
-            return _L_ScrollContainer;
+            if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer((MapEditorSelectObjectPanel)this, GetNodeOrNull<Godot.HSplitContainer>("HBoxContainer"));
+            return _L_HBoxContainer;
         }
     }
-    private ScrollContainer _L_ScrollContainer;
+    private HBoxContainer _L_HBoxContainer;
 
 
     public MapEditorSelectObject() : base(nameof(MapEditorSelectObject))
@@ -28,39 +28,233 @@
     }
 
     /// <summary>
-    /// 类型: <see cref="Godot.TextureRect"/>, 路径: MapEditorSelectObject.ScrollContainer.ObjectButton.PreviewImage
+    /// 类型: <see cref="Godot.NinePatchRect"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer.TypeButton.Select
     /// </summary>
-    public class PreviewImage : UiNode<MapEditorSelectObject, Godot.TextureRect, PreviewImage>
+    public class Select : UiNode<MapEditorSelectObjectPanel, Godot.NinePatchRect, Select>
     {
-        public PreviewImage(MapEditorSelectObject uiPanel, Godot.TextureRect node) : base(uiPanel, node) {  }
+        public Select(MapEditorSelectObjectPanel uiPanel, Godot.NinePatchRect node) : base(uiPanel, node) {  }
+        public override Select Clone() => new (UiPanel, (Godot.NinePatchRect)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer.TypeButton
+    /// </summary>
+    public class TypeButton : UiNode<MapEditorSelectObjectPanel, Godot.Button, TypeButton>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer.Select
+        /// </summary>
+        public Select L_Select
+        {
+            get
+            {
+                if (_L_Select == null) _L_Select = new Select(UiPanel, Instance.GetNodeOrNull<Godot.NinePatchRect>("Select"));
+                return _L_Select;
+            }
+        }
+        private Select _L_Select;
+
+        public TypeButton(MapEditorSelectObjectPanel uiPanel, Godot.Button node) : base(uiPanel, node) {  }
+        public override TypeButton Clone() => new (UiPanel, (Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.ScrollContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer
+    /// </summary>
+    public class ScrollContainer : UiNode<MapEditorSelectObjectPanel, Godot.ScrollContainer, ScrollContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer.TypeButton
+        /// </summary>
+        public TypeButton L_TypeButton
+        {
+            get
+            {
+                if (_L_TypeButton == null) _L_TypeButton = new TypeButton(UiPanel, Instance.GetNodeOrNull<Godot.Button>("TypeButton"));
+                return _L_TypeButton;
+            }
+        }
+        private TypeButton _L_TypeButton;
+
+        public ScrollContainer(MapEditorSelectObjectPanel uiPanel, Godot.ScrollContainer node) : base(uiPanel, node) {  }
+        public override ScrollContainer Clone() => new (UiPanel, (Godot.ScrollContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.VBoxContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer
+    /// </summary>
+    public class VBoxContainer : UiNode<MapEditorSelectObjectPanel, Godot.VBoxContainer, VBoxContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.ScrollContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.ScrollContainer
+        /// </summary>
+        public ScrollContainer L_ScrollContainer
+        {
+            get
+            {
+                if (_L_ScrollContainer == null) _L_ScrollContainer = new ScrollContainer(UiPanel, Instance.GetNodeOrNull<Godot.ScrollContainer>("ScrollContainer"));
+                return _L_ScrollContainer;
+            }
+        }
+        private ScrollContainer _L_ScrollContainer;
+
+        public VBoxContainer(MapEditorSelectObjectPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) {  }
+        public override VBoxContainer Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.MarginContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer
+    /// </summary>
+    public class MarginContainer : UiNode<MapEditorSelectObjectPanel, Godot.MarginContainer, MarginContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.VBoxContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel.VBoxContainer
+        /// </summary>
+        public VBoxContainer L_VBoxContainer
+        {
+            get
+            {
+                if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer(UiPanel, Instance.GetNodeOrNull<Godot.VBoxContainer>("VBoxContainer"));
+                return _L_VBoxContainer;
+            }
+        }
+        private VBoxContainer _L_VBoxContainer;
+
+        public MarginContainer(MapEditorSelectObjectPanel uiPanel, Godot.MarginContainer node) : base(uiPanel, node) {  }
+        public override MarginContainer Clone() => new (UiPanel, (Godot.MarginContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Panel"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel
+    /// </summary>
+    public class Panel : UiNode<MapEditorSelectObjectPanel, Godot.Panel, Panel>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.MarginContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.MarginContainer
+        /// </summary>
+        public MarginContainer L_MarginContainer
+        {
+            get
+            {
+                if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer(UiPanel, Instance.GetNodeOrNull<Godot.MarginContainer>("MarginContainer"));
+                return _L_MarginContainer;
+            }
+        }
+        private MarginContainer _L_MarginContainer;
+
+        public Panel(MapEditorSelectObjectPanel uiPanel, Godot.Panel node) : base(uiPanel, node) {  }
+        public override Panel Clone() => new (UiPanel, (Godot.Panel)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.LineEdit"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer.HBoxContainer.LineEdit
+    /// </summary>
+    public class LineEdit : UiNode<MapEditorSelectObjectPanel, Godot.LineEdit, LineEdit>
+    {
+        public LineEdit(MapEditorSelectObjectPanel uiPanel, Godot.LineEdit node) : base(uiPanel, node) {  }
+        public override LineEdit Clone() => new (UiPanel, (Godot.LineEdit)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer.HBoxContainer.Search
+    /// </summary>
+    public class Search : UiNode<MapEditorSelectObjectPanel, Godot.Button, Search>
+    {
+        public Search(MapEditorSelectObjectPanel uiPanel, Godot.Button node) : base(uiPanel, node) {  }
+        public override Search Clone() => new (UiPanel, (Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer.HBoxContainer
+    /// </summary>
+    public class HBoxContainer_1 : UiNode<MapEditorSelectObjectPanel, Godot.HBoxContainer, HBoxContainer_1>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.LineEdit"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer.LineEdit
+        /// </summary>
+        public LineEdit L_LineEdit
+        {
+            get
+            {
+                if (_L_LineEdit == null) _L_LineEdit = new LineEdit(UiPanel, Instance.GetNodeOrNull<Godot.LineEdit>("LineEdit"));
+                return _L_LineEdit;
+            }
+        }
+        private LineEdit _L_LineEdit;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer.Search
+        /// </summary>
+        public Search L_Search
+        {
+            get
+            {
+                if (_L_Search == null) _L_Search = new Search(UiPanel, Instance.GetNodeOrNull<Godot.Button>("Search"));
+                return _L_Search;
+            }
+        }
+        private Search _L_Search;
+
+        public HBoxContainer_1(MapEditorSelectObjectPanel uiPanel, Godot.HBoxContainer node) : base(uiPanel, node) {  }
+        public override HBoxContainer_1 Clone() => new (UiPanel, (Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.MarginContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer
+    /// </summary>
+    public class MarginContainer_2 : UiNode<MapEditorSelectObjectPanel, Godot.MarginContainer, MarginContainer_2>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.HBoxContainer
+        /// </summary>
+        public HBoxContainer_1 L_HBoxContainer
+        {
+            get
+            {
+                if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_1(UiPanel, Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer"));
+                return _L_HBoxContainer;
+            }
+        }
+        private HBoxContainer_1 _L_HBoxContainer;
+
+        public MarginContainer_2(MapEditorSelectObjectPanel uiPanel, Godot.MarginContainer node) : base(uiPanel, node) {  }
+        public override MarginContainer_2 Clone() => new (UiPanel, (Godot.MarginContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.TextureRect"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectButton.PreviewImage
+    /// </summary>
+    public class PreviewImage : UiNode<MapEditorSelectObjectPanel, Godot.TextureRect, PreviewImage>
+    {
+        public PreviewImage(MapEditorSelectObjectPanel uiPanel, Godot.TextureRect node) : base(uiPanel, node) {  }
         public override PreviewImage Clone() => new (UiPanel, (Godot.TextureRect)Instance.Duplicate());
     }
 
     /// <summary>
-    /// 类型: <see cref="Godot.Label"/>, 路径: MapEditorSelectObject.ScrollContainer.ObjectButton.ObjectName
+    /// 类型: <see cref="Godot.Label"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectButton.ObjectName
     /// </summary>
-    public class ObjectName : UiNode<MapEditorSelectObject, Godot.Label, ObjectName>
+    public class ObjectName : UiNode<MapEditorSelectObjectPanel, Godot.Label, ObjectName>
     {
-        public ObjectName(MapEditorSelectObject uiPanel, Godot.Label node) : base(uiPanel, node) {  }
+        public ObjectName(MapEditorSelectObjectPanel uiPanel, Godot.Label node) : base(uiPanel, node) {  }
         public override ObjectName Clone() => new (UiPanel, (Godot.Label)Instance.Duplicate());
     }
 
     /// <summary>
-    /// 类型: <see cref="Godot.NinePatchRect"/>, 路径: MapEditorSelectObject.ScrollContainer.ObjectButton.SelectImage
+    /// 类型: <see cref="Godot.NinePatchRect"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectButton.Select
     /// </summary>
-    public class SelectImage : UiNode<MapEditorSelectObject, Godot.NinePatchRect, SelectImage>
+    public class Select_1 : UiNode<MapEditorSelectObjectPanel, Godot.NinePatchRect, Select_1>
     {
-        public SelectImage(MapEditorSelectObject uiPanel, Godot.NinePatchRect node) : base(uiPanel, node) {  }
-        public override SelectImage Clone() => new (UiPanel, (Godot.NinePatchRect)Instance.Duplicate());
+        public Select_1(MapEditorSelectObjectPanel uiPanel, Godot.NinePatchRect node) : base(uiPanel, node) {  }
+        public override Select_1 Clone() => new (UiPanel, (Godot.NinePatchRect)Instance.Duplicate());
     }
 
     /// <summary>
-    /// 类型: <see cref="Godot.Button"/>, 路径: MapEditorSelectObject.ScrollContainer.ObjectButton
+    /// 类型: <see cref="Godot.Button"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectButton
     /// </summary>
-    public class ObjectButton : UiNode<MapEditorSelectObject, Godot.Button, ObjectButton>
+    public class ObjectButton : UiNode<MapEditorSelectObjectPanel, Godot.Button, ObjectButton>
     {
         /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: MapEditorSelectObject.ScrollContainer.PreviewImage
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.PreviewImage
         /// </summary>
         public PreviewImage L_PreviewImage
         {
@@ -73,7 +267,7 @@
         private PreviewImage _L_PreviewImage;
 
         /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorSelectObject.ScrollContainer.ObjectName
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectName
         /// </summary>
         public ObjectName L_ObjectName
         {
@@ -86,29 +280,29 @@
         private ObjectName _L_ObjectName;
 
         /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: MapEditorSelectObject.ScrollContainer.SelectImage
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.Select
         /// </summary>
-        public SelectImage L_SelectImage
+        public Select_1 L_Select
         {
             get
             {
-                if (_L_SelectImage == null) _L_SelectImage = new SelectImage(UiPanel, Instance.GetNodeOrNull<Godot.NinePatchRect>("SelectImage"));
-                return _L_SelectImage;
+                if (_L_Select == null) _L_Select = new Select_1(UiPanel, Instance.GetNodeOrNull<Godot.NinePatchRect>("Select"));
+                return _L_Select;
             }
         }
-        private SelectImage _L_SelectImage;
+        private Select_1 _L_Select;
 
-        public ObjectButton(MapEditorSelectObject uiPanel, Godot.Button node) : base(uiPanel, node) {  }
+        public ObjectButton(MapEditorSelectObjectPanel uiPanel, Godot.Button node) : base(uiPanel, node) {  }
         public override ObjectButton Clone() => new (UiPanel, (Godot.Button)Instance.Duplicate());
     }
 
     /// <summary>
-    /// 类型: <see cref="Godot.ScrollContainer"/>, 路径: MapEditorSelectObject.ScrollContainer
+    /// 类型: <see cref="Godot.ScrollContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer
     /// </summary>
-    public class ScrollContainer : UiNode<MapEditorSelectObject, Godot.ScrollContainer, ScrollContainer>
+    public class ScrollContainer_1 : UiNode<MapEditorSelectObjectPanel, Godot.ScrollContainer, ScrollContainer_1>
     {
         /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.ObjectButton
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ObjectButton
         /// </summary>
         public ObjectButton L_ObjectButton
         {
@@ -120,34 +314,173 @@
         }
         private ObjectButton _L_ObjectButton;
 
-        public ScrollContainer(MapEditorSelectObject uiPanel, Godot.ScrollContainer node) : base(uiPanel, node) {  }
-        public override ScrollContainer Clone() => new (UiPanel, (Godot.ScrollContainer)Instance.Duplicate());
+        public ScrollContainer_1(MapEditorSelectObjectPanel uiPanel, Godot.ScrollContainer node) : base(uiPanel, node) {  }
+        public override ScrollContainer_1 Clone() => new (UiPanel, (Godot.ScrollContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.VBoxContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2
+    /// </summary>
+    public class VBoxContainer2 : UiNode<MapEditorSelectObjectPanel, Godot.VBoxContainer, VBoxContainer2>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.MarginContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.MarginContainer
+        /// </summary>
+        public MarginContainer_2 L_MarginContainer
+        {
+            get
+            {
+                if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer_2(UiPanel, Instance.GetNodeOrNull<Godot.MarginContainer>("MarginContainer"));
+                return _L_MarginContainer;
+            }
+        }
+        private MarginContainer_2 _L_MarginContainer;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.ScrollContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.ScrollContainer
+        /// </summary>
+        public ScrollContainer_1 L_ScrollContainer
+        {
+            get
+            {
+                if (_L_ScrollContainer == null) _L_ScrollContainer = new ScrollContainer_1(UiPanel, Instance.GetNodeOrNull<Godot.ScrollContainer>("ScrollContainer"));
+                return _L_ScrollContainer;
+            }
+        }
+        private ScrollContainer_1 _L_ScrollContainer;
+
+        public VBoxContainer2(MapEditorSelectObjectPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) {  }
+        public override VBoxContainer2 Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.MarginContainer"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer
+    /// </summary>
+    public class MarginContainer_1 : UiNode<MapEditorSelectObjectPanel, Godot.MarginContainer, MarginContainer_1>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.VBoxContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.VBoxContainer2
+        /// </summary>
+        public VBoxContainer2 L_VBoxContainer2
+        {
+            get
+            {
+                if (_L_VBoxContainer2 == null) _L_VBoxContainer2 = new VBoxContainer2(UiPanel, Instance.GetNodeOrNull<Godot.VBoxContainer>("VBoxContainer2"));
+                return _L_VBoxContainer2;
+            }
+        }
+        private VBoxContainer2 _L_VBoxContainer2;
+
+        public MarginContainer_1(MapEditorSelectObjectPanel uiPanel, Godot.MarginContainer node) : base(uiPanel, node) {  }
+        public override MarginContainer_1 Clone() => new (UiPanel, (Godot.MarginContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Panel"/>, 路径: MapEditorSelectObject.HBoxContainer.Panel2
+    /// </summary>
+    public class Panel2 : UiNode<MapEditorSelectObjectPanel, Godot.Panel, Panel2>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.MarginContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.MarginContainer
+        /// </summary>
+        public MarginContainer_1 L_MarginContainer
+        {
+            get
+            {
+                if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer_1(UiPanel, Instance.GetNodeOrNull<Godot.MarginContainer>("MarginContainer"));
+                return _L_MarginContainer;
+            }
+        }
+        private MarginContainer_1 _L_MarginContainer;
+
+        public Panel2(MapEditorSelectObjectPanel uiPanel, Godot.Panel node) : base(uiPanel, node) {  }
+        public override Panel2 Clone() => new (UiPanel, (Godot.Panel)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HSplitContainer"/>, 路径: MapEditorSelectObject.HBoxContainer
+    /// </summary>
+    public class HBoxContainer : UiNode<MapEditorSelectObjectPanel, Godot.HSplitContainer, HBoxContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Panel"/>, 节点路径: MapEditorSelectObject.Panel
+        /// </summary>
+        public Panel L_Panel
+        {
+            get
+            {
+                if (_L_Panel == null) _L_Panel = new Panel(UiPanel, Instance.GetNodeOrNull<Godot.Panel>("Panel"));
+                return _L_Panel;
+            }
+        }
+        private Panel _L_Panel;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Panel"/>, 节点路径: MapEditorSelectObject.Panel2
+        /// </summary>
+        public Panel2 L_Panel2
+        {
+            get
+            {
+                if (_L_Panel2 == null) _L_Panel2 = new Panel2(UiPanel, Instance.GetNodeOrNull<Godot.Panel>("Panel2"));
+                return _L_Panel2;
+            }
+        }
+        private Panel2 _L_Panel2;
+
+        public HBoxContainer(MapEditorSelectObjectPanel uiPanel, Godot.HSplitContainer node) : base(uiPanel, node) {  }
+        public override HBoxContainer Clone() => new (UiPanel, (Godot.HSplitContainer)Instance.Duplicate());
     }
 
 
     /// <summary>
-    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: MapEditorSelectObject.ScrollContainer.ObjectButton.PreviewImage
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer.TypeButton
     /// </summary>
-    public PreviewImage S_PreviewImage => L_ScrollContainer.L_ObjectButton.L_PreviewImage;
+    public TypeButton S_TypeButton => L_HBoxContainer.L_Panel.L_MarginContainer.L_VBoxContainer.L_ScrollContainer.L_TypeButton;
 
     /// <summary>
-    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorSelectObject.ScrollContainer.ObjectButton.ObjectName
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.VBoxContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel.MarginContainer.VBoxContainer
     /// </summary>
-    public ObjectName S_ObjectName => L_ScrollContainer.L_ObjectButton.L_ObjectName;
+    public VBoxContainer S_VBoxContainer => L_HBoxContainer.L_Panel.L_MarginContainer.L_VBoxContainer;
 
     /// <summary>
-    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: MapEditorSelectObject.ScrollContainer.ObjectButton.SelectImage
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Panel"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel
     /// </summary>
-    public SelectImage S_SelectImage => L_ScrollContainer.L_ObjectButton.L_SelectImage;
+    public Panel S_Panel => L_HBoxContainer.L_Panel;
 
     /// <summary>
-    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.ScrollContainer.ObjectButton
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.LineEdit"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer.HBoxContainer.LineEdit
     /// </summary>
-    public ObjectButton S_ObjectButton => L_ScrollContainer.L_ObjectButton;
+    public LineEdit S_LineEdit => L_HBoxContainer.L_Panel2.L_MarginContainer.L_VBoxContainer2.L_MarginContainer.L_HBoxContainer.L_LineEdit;
 
     /// <summary>
-    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.ScrollContainer"/>, 节点路径: MapEditorSelectObject.ScrollContainer
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.MarginContainer.HBoxContainer.Search
     /// </summary>
-    public ScrollContainer S_ScrollContainer => L_ScrollContainer;
+    public Search S_Search => L_HBoxContainer.L_Panel2.L_MarginContainer.L_VBoxContainer2.L_MarginContainer.L_HBoxContainer.L_Search;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectButton.PreviewImage
+    /// </summary>
+    public PreviewImage S_PreviewImage => L_HBoxContainer.L_Panel2.L_MarginContainer.L_VBoxContainer2.L_ScrollContainer.L_ObjectButton.L_PreviewImage;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Label"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectButton.ObjectName
+    /// </summary>
+    public ObjectName S_ObjectName => L_HBoxContainer.L_Panel2.L_MarginContainer.L_VBoxContainer2.L_ScrollContainer.L_ObjectButton.L_ObjectName;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Button"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2.ScrollContainer.ObjectButton
+    /// </summary>
+    public ObjectButton S_ObjectButton => L_HBoxContainer.L_Panel2.L_MarginContainer.L_VBoxContainer2.L_ScrollContainer.L_ObjectButton;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.VBoxContainer"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2.MarginContainer.VBoxContainer2
+    /// </summary>
+    public VBoxContainer2 S_VBoxContainer2 => L_HBoxContainer.L_Panel2.L_MarginContainer.L_VBoxContainer2;
+
+    /// <summary>
+    /// 场景中唯一名称的节点, 节点类型: <see cref="Godot.Panel"/>, 节点路径: MapEditorSelectObject.HBoxContainer.Panel2
+    /// </summary>
+    public Panel2 S_Panel2 => L_HBoxContainer.L_Panel2;
 
 }
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObjectPanel.cs b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObjectPanel.cs
index acb7c74..718b5e0 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObjectPanel.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/MapEditorSelectObjectPanel.cs
@@ -6,25 +6,84 @@
 
 public partial class MapEditorSelectObjectPanel : MapEditorSelectObject
 {
+    public class TypeButtonData
+    {
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string Name;
+        /// <summary>
+        /// 类型值
+        /// </summary>
+        public int Type;
 
-    private UiGrid<ObjectButton, ExcelConfig.ActivityObject> _grid;
-
+        public TypeButtonData(string name, int type)
+        {
+            Name = name;
+            Type = type;
+        }
+    }
+    //类型网格组件
+    private UiGrid<TypeButton, TypeButtonData> _typeGrid;
+    //物体网格组件
+    private UiGrid<ObjectButton, ExcelConfig.ActivityObject> _objectGrid;
+    //允许出现在该面板中的物体类型
+    private int[] _typeArray = new[] { 4, 5, 9 };
+    
     public override void OnCreateUi()
     {
-        _grid = new UiGrid<ObjectButton, ExcelConfig.ActivityObject>(S_ObjectButton, typeof(ObjectButtonCell));
-        _grid.SetAutoColumns(true);
-        _grid.SetHorizontalExpand(true);
-        _grid.SetCellOffset(new Vector2I(10, 10));
+        S_Search.Instance.Pressed += OnSearch;
         
-        _grid.SetDataList(ExcelConfig.ActivityObject_List.Where(o =>
-        {
-            return o.Type == (int)ActivityIdPrefix.ActivityPrefixType.Weapon;
-        }).ToArray());
+        _typeGrid = new UiGrid<TypeButton, TypeButtonData>(S_TypeButton, typeof(TypeButtonCell));
+        _typeGrid.SetColumns(1);
+        _typeGrid.SetHorizontalExpand(true);
+        _typeGrid.SetCellOffset(new Vector2I(0, 5));
+        _typeGrid.Add(new TypeButtonData("所有", -1));
+        _typeGrid.Add(new TypeButtonData("武器", 5));
+        _typeGrid.Add(new TypeButtonData("道具", 9));
+        _typeGrid.Add(new TypeButtonData("敌人", 4));
+        
+        _objectGrid = new UiGrid<ObjectButton, ExcelConfig.ActivityObject>(S_ObjectButton, typeof(ObjectButtonCell));
+        _objectGrid.SetAutoColumns(true);
+        _objectGrid.SetHorizontalExpand(true);
+        _objectGrid.SetCellOffset(new Vector2I(10, 10));
+        
+        _typeGrid.SelectIndex = 0;
     }
 
     public override void OnDestroyUi()
     {
-        
+        _typeGrid.Destroy();
+        _objectGrid.Destroy();
     }
 
+    /// <summary>
+    /// 搜索对象
+    /// </summary>
+    public void OnSearch()
+    {
+        //类型
+        int type;
+        //名称
+        var name = S_LineEdit.Instance.Text;
+        var buttonData = _typeGrid.GetData(_typeGrid.SelectIndex);
+        if (buttonData != null)
+        {
+            type = buttonData.Type;
+        }
+        else
+        {
+            type = -1;
+        }
+
+        //搜索结果
+        var arr = ExcelConfig.ActivityObject_List.Where(
+            o =>
+            {
+                return (string.IsNullOrEmpty(name) || o.Name.Contains(name) || o.Id.Contains(name)) &&
+                       (type < 0 ? _typeArray.Contains(o.Type) : o.Type == type);
+            }
+        ).ToArray();
+        _objectGrid.SetDataList(arr);
+    }
 }
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/ObjectButtonCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/ObjectButtonCell.cs
index 53f83ab..989d9a9 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/ObjectButtonCell.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/ObjectButtonCell.cs
@@ -6,7 +6,7 @@
 {
     public override void OnInit()
     {
-        CellNode.L_SelectImage.Instance.Visible = false;
+        CellNode.L_Select.Instance.Visible = false;
     }
 
     public override void OnSetData(ExcelConfig.ActivityObject data)
@@ -14,17 +14,22 @@
         CellNode.L_ObjectName.Instance.Text = data.Name;
         if (!string.IsNullOrEmpty(data.Icon))
         {
+            CellNode.L_PreviewImage.Instance.Visible = true;
             CellNode.L_PreviewImage.Instance.Texture = ResourceManager.LoadTexture2D(data.Icon);
         }
+        else
+        {
+            CellNode.L_PreviewImage.Instance.Visible = false;
+        }
     }
 
     public override void OnSelect()
     {
-        CellNode.L_SelectImage.Instance.Visible = true;
+        CellNode.L_Select.Instance.Visible = true;
     }
 
     public override void OnUnSelect()
     {
-        CellNode.L_SelectImage.Instance.Visible = false;
+        CellNode.L_Select.Instance.Visible = false;
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/TypeButtonCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/TypeButtonCell.cs
new file mode 100644
index 0000000..9a8efc4
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/ui/mapEditorSelectObject/TypeButtonCell.cs
@@ -0,0 +1,25 @@
+namespace UI.MapEditorSelectObject;
+
+public class TypeButtonCell : UiCell<MapEditorSelectObject.TypeButton, MapEditorSelectObjectPanel.TypeButtonData>
+{
+    public override void OnInit()
+    {
+        CellNode.L_Select.Instance.Visible = false;
+    }
+
+    public override void OnSetData(MapEditorSelectObjectPanel.TypeButtonData data)
+    {
+        CellNode.Instance.Text = data.Name;
+    }
+
+    public override void OnSelect()
+    {
+        CellNode.L_Select.Instance.Visible = true;
+        CellNode.UiPanel.OnSearch();
+    }
+
+    public override void OnUnSelect()
+    {
+        CellNode.L_Select.Instance.Visible = false;
+    }
+}
\ No newline at end of file