diff --git a/DungeonShooting_Godot/DungeonShooting.csproj b/DungeonShooting_Godot/DungeonShooting.csproj
index f909828..4d20267 100644
--- a/DungeonShooting_Godot/DungeonShooting.csproj
+++ b/DungeonShooting_Godot/DungeonShooting.csproj
@@ -1,6 +1,9 @@
-<Project Sdk="Godot.NET.Sdk/4.0.0">
+<Project Sdk="Godot.NET.Sdk/4.0.1-rc.1">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="src\game\ui\editorTools" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs
deleted file mode 100644
index 576b44f..0000000
--- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-#if TOOLS
-using Generator;
-using Godot;
-
-[Tool]
-public partial class Automation : Control
-{
-	/// <summary>
-	/// 更新 ResourcePath
-	/// </summary>
-	private void _on_Button_pressed()
-	{
-		ResourcePathGenerator.Generate();
-	}
-
-	/// <summary>
-	/// 重新打包房间配置
-	/// </summary>
-	private void _on_Button2_pressed()
-	{
-		RoomPackGenerator.Generate();
-	}
-}
-#endif
\ No newline at end of file
diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.tscn b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.tscn
deleted file mode 100644
index 66d1942..0000000
--- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.tscn
+++ /dev/null
@@ -1,46 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://bygnukrvvm1vi"]
-
-[ext_resource type="Script" path="res://addons/dungeonShooting_plugin/Automation.cs" id="1"]
-
-[node name="Automation" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-script = ExtResource("1")
-
-[node name="ScrollContainer" type="ScrollContainer" parent="."]
-layout_mode = 0
-anchor_right = 1.0
-anchor_bottom = 1.0
-
-[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="ScrollContainer/VBoxContainer/HBoxContainer"]
-layout_mode = 2
-text = "ResourcePath.cs"
-
-[node name="Button" type="Button" parent="ScrollContainer/VBoxContainer/HBoxContainer"]
-layout_mode = 2
-text = "重新生成"
-
-[node name="HBoxContainer2" type="HBoxContainer" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="ScrollContainer/VBoxContainer/HBoxContainer2"]
-layout_mode = 2
-text = "地牢房间配置"
-
-[node name="Button" type="Button" parent="ScrollContainer/VBoxContainer/HBoxContainer2"]
-layout_mode = 2
-text = "重新打包"
-
-[connection signal="pressed" from="ScrollContainer/VBoxContainer/HBoxContainer/Button" to="." method="_on_Button_pressed"]
-[connection signal="pressed" from="ScrollContainer/VBoxContainer/HBoxContainer2/Button" to="." method="_on_Button2_pressed"]
diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/NodeMonitor.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/NodeMonitor.cs
new file mode 100644
index 0000000..fc17fff
--- /dev/null
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/NodeMonitor.cs
@@ -0,0 +1,148 @@
+#if TOOLS
+using System;
+using System.Collections.Generic;
+using Godot;
+
+namespace Plugin;
+
+/// <summary>
+/// 场景监听器, 一旦当前节点内容发生改变, 则直接调用 SceneNodeChangeEvent 事件
+/// </summary>
+public class NodeMonitor
+{
+    private class SceneNode : IEquatable<SceneNode>
+    {
+        public SceneNode(string type, string name)
+        {
+            Type = type;
+            Name = name;
+        }
+
+        public string Type;
+        public string Name;
+        public List<SceneNode> Children = new List<SceneNode>();
+
+        public bool Equals(SceneNode other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+
+            if (other.Name != Name || other.Type != Type)
+            {
+                return false;
+            }
+
+            if (other.Children.Count != Children.Count)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < Children.Count; i++)
+            {
+                if (!Children[i].Equals(other.Children[i]))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+
+    /// <summary>
+    /// 场景节点有变化时的回调事件
+    /// </summary>
+    public event Action<Node> SceneNodeChangeEvent;
+
+    private SceneNode _sceneNode;
+    private Node _targetNode;
+
+
+    private double _checkTreeTimer = 0;
+
+    /// <summary>
+    /// 更新监听的节点
+    /// </summary>
+    public void ChangeCurrentNode(Node node)
+    {
+        //更新前检查旧的节点是否发生改变
+        if (node != _targetNode && _targetNode != null)
+        {
+            try
+            {
+                var tempNode = ParseNodeTree(_targetNode);
+                if (!_sceneNode.Equals(tempNode))
+                {
+                    OnSceneNodeChange(_targetNode);
+                }
+            }
+            catch (Exception e)
+            {
+                //检查节点存在报错, 直接跳过该节点的检查
+                GD.Print(e.Message);
+            }
+        }
+
+        if (node != null)
+        {
+            _sceneNode = ParseNodeTree(node);
+            _targetNode = node;
+        }
+        else
+        {
+            _targetNode = null;
+        }
+        _checkTreeTimer = 0;
+    }
+
+    public void Process(float delta)
+    {
+        if (_targetNode == null)
+            return;
+        
+        _checkTreeTimer += delta;
+        if (_checkTreeTimer >= 5) //5秒检查一次
+        {
+            try
+            {
+                var tempNode = ParseNodeTree(_targetNode);
+                if (!_sceneNode.Equals(tempNode))
+                {
+                    OnSceneNodeChange(_targetNode);
+                    _sceneNode = tempNode;
+                }
+            }
+            catch (Exception e)
+            {
+                //检查节点存在报错, 直接跳过该节点的检查
+                GD.Print(e.Message);
+                _targetNode = null;
+            }
+            _checkTreeTimer = 0;
+        }
+    }
+    
+    
+    private SceneNode ParseNodeTree(Node node)
+    {
+        var uiNode = new SceneNode(node.GetType().FullName, node.Name);
+        var count = node.GetChildCount();
+        for (var i = 0; i < count; i++)
+        {
+            uiNode.Children.Add(ParseNodeTree(node.GetChild(i)));
+        }
+
+        return uiNode;
+    }
+
+    private void OnSceneNodeChange(Node node)
+    {
+        if (SceneNodeChangeEvent != null)
+        {
+            SceneNodeChangeEvent(node);
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
index 10ccbeb..27c2b46 100644
--- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
@@ -1,61 +1,273 @@
 #if TOOLS
+using System;
+using Generator;
 using Godot;
+using UI.EditorTools;
 
 namespace Plugin
 {
     [Tool]
     public partial class Plugin : EditorPlugin
     {
-        public static Plugin Instance => _instance;
-        private static Plugin _instance;
+        /// <summary>
+        /// 自定义节点类型数据
+        /// </summary>
+        private class CustomTypeInfo
+        {
+            public CustomTypeInfo(string name, string parentName, string scriptPath, string iconPath)
+            {
+                Name = name;
+                ParentName = parentName;
+                ScriptPath = scriptPath;
+                IconPath = iconPath;
+            }
 
-        private Control dock;
+            public string Name;
+            public string ParentName;
+            public string ScriptPath;
+            public string IconPath;
+        }
+        
+        /// <summary>
+        /// 当前插件实例
+        /// </summary>
+        public static Plugin Instance { get; private set; }
 
+        //工具面板
+        private EditorToolsPanel _editorTools;
+
+        //ui监听器
+        private NodeMonitor _uiMonitor;
+
+        //自定义节点
+        private CustomTypeInfo[] _customTypeInfos = new CustomTypeInfo[]
+        {
+            new CustomTypeInfo(
+                "ActivityObjectTemplate",
+                "Node",
+                "res://src/framework/activity/ActivityObjectTemplate.cs",
+                "res://addons/dungeonShooting_plugin/ActivityObject.svg"
+            ),
+            new CustomTypeInfo(
+                "DungeonRoomTemplate",
+                "TileMap",
+                "res://src/framework/activity/ActivityObjectTemplate.cs",
+                "res://addons/dungeonShooting_plugin/Map.svg"
+            ),
+            new CustomTypeInfo(
+                "ActivityMark",
+                "Node2D",
+                "res://src/framework/map/mark/ActivityMark.cs",
+                "res://addons/dungeonShooting_plugin/Mark.svg"
+            ),
+            new CustomTypeInfo(
+                "EnemyMark",
+                "Node2D",
+                "res://src/framework/map/mark/EnemyMark.cs",
+                "res://addons/dungeonShooting_plugin/Mark.svg"
+            ),
+            new CustomTypeInfo(
+                "WeaponMark",
+                "Node2D",
+                "res://src/framework/map/mark/WeaponMark.cs",
+                "res://addons/dungeonShooting_plugin/Mark.svg"
+            ),
+        };
+        
         public override void _Process(double delta)
         {
-            _instance = this;
+            Instance = this;
+            
+            if (_uiMonitor != null)
+            {
+                _uiMonitor.Process((float) delta);
+            }
+            else
+            {
+                _uiMonitor = new NodeMonitor();
+                _uiMonitor.SceneNodeChangeEvent += GenerateUiCode;
+                OnSceneChanged(GetEditorInterface().GetEditedSceneRoot());
+            }
         }
 
         public override void _EnterTree()
         {
-            _instance = this;
-            var script = GD.Load<Script>("res://src/framework/activity/ActivityObjectTemplate.cs");
-            var texture = GD.Load<Texture2D>("res://addons/dungeonShooting_plugin/ActivityObject.svg");
-            AddCustomType("ActivityObjectTemplate", "Node", script, texture);
+            Instance = this;
 
-            var script2 = GD.Load<Script>("res://src/framework/map/DungeonRoomTemplate.cs");
-            var texture2 = GD.Load<Texture2D>("res://addons/dungeonShooting_plugin/Map.svg");
-            AddCustomType("DungeonRoomTemplate", "TileMap", script2, texture2);
+            if (_customTypeInfos != null)
+            {
+                //注册自定义节点
+                foreach (var customTypeInfo in _customTypeInfos)
+                {
+                    try
+                    {
+                        var script = GD.Load<Script>(customTypeInfo.ScriptPath);
+                        var icon = GD.Load<Texture2D>(customTypeInfo.IconPath);
+                        AddCustomType(customTypeInfo.Name, customTypeInfo.ParentName, script, icon);
+                    }
+                    catch (Exception e)
+                    {
+                        GD.PrintErr(e.ToString());
+                    }
+                }
+            }
+
+            _editorTools = GD.Load<PackedScene>(ResourcePath.prefab_ui_EditorTools_tscn).Instantiate<EditorToolsPanel>();
+            var editorMainScreen = GetEditorInterface().GetEditorMainScreen();
+            editorMainScreen.AddChild(_editorTools);
+
+            try
+            {
+                _editorTools.OnCreateUi();
+            }
+            catch (Exception e)
+            {
+                GD.PrintErr(e.ToString());
+            }
+
+            try
+            {
+                _editorTools.OnShowUi();
+            }
+            catch (Exception e)
+            {
+                GD.PrintErr(e.ToString());
+            }
             
-            var script3 = GD.Load<Script>("res://src/framework/map/mark/ActivityMark.cs");
-            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);
+            _MakeVisible(false);
             
-            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);
+            //场景切换事件
+            SceneChanged += OnSceneChanged;
+
+            _uiMonitor = new NodeMonitor();
+            _uiMonitor.SceneNodeChangeEvent += GenerateUiCode;
+            OnSceneChanged(GetEditorInterface().GetEditedSceneRoot());
         }
 
         public override void _ExitTree()
         {
-            RemoveCustomType("ActivityObjectTemplate");
-            RemoveCustomType("DungeonRoomTemplate");
-            RemoveCustomType("ActivityMark");
-            RemoveCustomType("EnemyMark");
-            RemoveCustomType("WeaponMark");
-
-            if (dock != null)
+            //移除自定义节点
+            if (_customTypeInfos != null)
             {
-                RemoveControlFromDocks(dock);
-                dock.Free();
+                foreach (var customTypeInfo in _customTypeInfos)
+                {
+                    try
+                    {
+                        RemoveCustomType(customTypeInfo.Name);
+                    }
+                    catch (Exception e)
+                    {
+                        GD.PrintErr(e.ToString());
+                    }
+                }
+            }
+
+            if (_editorTools != null)
+            {
+                try
+                {
+                    _editorTools.OnHideUi();
+                }
+                catch (Exception e)
+                {
+                    GD.PrintErr(e.ToString());
+                }
+
+                try
+                {
+                    _editorTools.OnDisposeUi();
+                }
+                catch (Exception e)
+                {
+                    GD.PrintErr(e.ToString());
+                }
+
+                _editorTools.Free();
+                _editorTools = null;
+            }
+
+            SceneChanged -= OnSceneChanged;
+
+            if (_uiMonitor != null)
+            {
+                _uiMonitor.SceneNodeChangeEvent -= GenerateUiCode;
+                _uiMonitor = null;
             }
         }
-    }
 
+        public override bool _HasMainScreen()
+        {
+            return true;
+        }
+
+        public override Texture2D _GetPluginIcon()
+        {
+            return GD.Load<Texture2D>("res://addons/dungeonShooting_plugin/Tool.svg");
+        }
+
+        public override string _GetPluginName()
+        {
+            return "Tools";
+        }
+
+        public override void _MakeVisible(bool visible)
+        {
+            if (_editorTools != null)
+            {
+                _editorTools.Visible = visible;
+            }
+        }
+        
+        
+        /// <summary>
+        /// 检查节点是否为UI节点
+        /// </summary>
+        public bool CheckIsUi(Node node)
+        {
+            var resourcePath = node.GetScript().As<CSharpScript>()?.ResourcePath;
+            if (resourcePath == null)
+            {
+                return false;
+            }
+
+            if (resourcePath.StartsWith("res://src/game/ui/") && resourcePath.EndsWith("Panel.cs"))
+            {
+                var index = resourcePath.LastIndexOf("/", StringComparison.Ordinal);
+                var uiName = resourcePath.Substring(index + 1, resourcePath.Length - index - 8 - 1);
+                var codePath = "res://src/game/ui/" + uiName.FirstToLower() + "/" + uiName + "Panel.cs";
+                if (ResourceLoader.Exists(codePath))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 执行生成ui代码操作
+        /// </summary>
+        public void GenerateUiCode(Node node)
+        {
+            UiGenerator.GenerateUiCodeFromEditor(node);
+        }
+
+        /// <summary>
+        /// 切换场景
+        /// </summary>
+        private void OnSceneChanged(Node node)
+        {
+            if (_uiMonitor != null)
+            {
+                _uiMonitor.ChangeCurrentNode(null);
+                if (CheckIsUi(node))
+                {
+                    _uiMonitor.ChangeCurrentNode(node);
+                }
+            }
+        }
+
+    }
 }
 #endif
diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Tool.svg b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Tool.svg
new file mode 100644
index 0000000..dfac3f9
--- /dev/null
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Tool.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1678960145720" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2786" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><path d="M810.666667 942.933333c-34.133333 0-68.266667-12.8-93.866667-38.4l-234.666667-234.666666c-140.8 51.2-302.933333-12.8-371.2-153.6-38.4-81.066667-38.4-174.933333 0-256 4.266667-12.8 17.066667-21.333333 29.866667-25.6s25.6 0 38.4 12.8L315.733333 384H384V315.733333L247.466667 179.2c-8.533333-8.533333-12.8-21.333333-12.8-38.4 4.266667-12.8 12.8-25.6 25.6-29.866667 72.533333-34.133333 153.6-38.4 230.4-12.8s136.533333 81.066667 170.666666 153.6c34.133333 72.533333 38.4 153.6 12.8 230.4l234.666667 234.666667c51.2 51.2 51.2 136.533333 0 187.733333-29.866667 25.6-64 38.4-98.133333 38.4z m-320-366.933333c12.8 0 21.333333 4.266667 29.866666 12.8l256 256c17.066667 17.066667 51.2 17.066667 68.266667 0 8.533333-8.533333 12.8-21.333333 12.8-34.133333s-4.266667-25.6-12.8-34.133334l-256-256c-12.8-12.8-17.066667-34.133333-8.533333-46.933333 29.866667-59.733333 29.866667-123.733333 0-183.466667-25.6-51.2-68.266667-93.866667-119.466667-110.933333-34.133333-12.8-68.266667-17.066667-102.4-8.533333l98.133333 98.133333c8.533333 8.533333 12.8 17.066667 12.8 29.866667v128c0 25.6-17.066667 42.666667-42.666666 42.666666H298.666667c-12.8 0-21.333333-4.266667-29.866667-12.8L170.666667 358.4c-4.266667 42.666667 0 85.333333 17.066666 123.733333 51.2 106.666667 179.2 149.333333 285.866667 102.4 4.266667-8.533333 12.8-8.533333 17.066667-8.533333z" p-id="2787" fill="#ffffff"></path></svg>
\ No newline at end of file
diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Tool.svg.import b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Tool.svg.import
new file mode 100644
index 0000000..92bf6a5
--- /dev/null
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Tool.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dfk7b7gbhsfvx"
+path="res://.godot/imported/Tool.svg-10dd90fe1d003820551f73e2889d24d2.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dungeonShooting_plugin/Tool.svg"
+dest_files=["res://.godot/imported/Tool.svg-10dd90fe1d003820551f73e2889d24d2.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false
diff --git a/DungeonShooting_Godot/prefab/Cursor.tscn b/DungeonShooting_Godot/prefab/Cursor.tscn
new file mode 100644
index 0000000..c228d62
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/Cursor.tscn
@@ -0,0 +1,43 @@
+[gd_scene load_steps=4 format=3]
+
+[ext_resource type="Texture2D" uid="uid://ct5v768lsf6nc" path="res://resource/sprite/ui/Cursor.png" id="1"]
+[ext_resource type="Script" path="res://src/game/Cursor.cs" id="2"]
+[ext_resource type="Texture2D" uid="uid://cjiiu86a42mnj" path="res://resource/sprite/ui/CursorCenter.png" id="2_2j135"]
+
+
+[node name="Cursor" type="Node2D"]
+z_index = 10
+script = ExtResource("2")
+
+[node name="Center" type="Sprite2D" parent="."]
+visible = false
+scale = Vector2(4, 4)
+texture = ExtResource("2_2j135")
+
+[node name="LT" type="Sprite2D" parent="."]
+scale = Vector2(4, 4)
+texture = ExtResource("1")
+offset = Vector2(-2, -2)
+region_enabled = true
+region_rect = Rect2(0, 0, 4, 4)
+
+[node name="LB" type="Sprite2D" parent="."]
+scale = Vector2(4, 4)
+texture = ExtResource("1")
+offset = Vector2(-2, 2)
+region_enabled = true
+region_rect = Rect2(0, 4, 4, 4)
+
+[node name="RT" type="Sprite2D" parent="."]
+scale = Vector2(4, 4)
+texture = ExtResource("1")
+offset = Vector2(2, -2)
+region_enabled = true
+region_rect = Rect2(4, 0, 4, 4)
+
+[node name="RB" type="Sprite2D" parent="."]
+scale = Vector2(4, 4)
+texture = ExtResource("1")
+offset = Vector2(2, 2)
+region_enabled = true
+region_rect = Rect2(4, 4, 4, 4)
diff --git a/DungeonShooting_Godot/prefab/test/TestActivity.tscn b/DungeonShooting_Godot/prefab/test/TestActivity.tscn
index 475c7ad..4f7ee6c 100644
--- a/DungeonShooting_Godot/prefab/test/TestActivity.tscn
+++ b/DungeonShooting_Godot/prefab/test/TestActivity.tscn
@@ -1,24 +1,22 @@
-[gd_scene load_steps=7 format=3]
+[gd_scene load_steps=7 format=3 uid="uid://bjf0e6nehg51j"]
 
 [ext_resource type="Shader" path="res://resource/materlal/Blend.gdshader" id="1"]
 [ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="2"]
 [ext_resource type="Texture2D" uid="uid://uhhfgdhpk7i4" path="res://icon.png" id="3"]
 
-
-
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_rxkv3"]
 resource_local_to_scene = true
 shader = ExtResource("1")
 shader_parameter/blend = Color(0, 0, 0, 0.470588)
 shader_parameter/schedule = 1
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_s2ghg"]
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_aaga8"]
 resource_local_to_scene = true
 shader = ExtResource("1")
 shader_parameter/blend = Color(1, 1, 1, 1)
 shader_parameter/schedule = 0
 
-[sub_resource type="SpriteFrames" id="SpriteFrames_4au77"]
+[sub_resource type="SpriteFrames" id="SpriteFrames_kkdcb"]
 animations = [{
 "frames": [{
 "duration": 1.0,
@@ -36,10 +34,8 @@
 z_index = -5
 material = SubResource("ShaderMaterial_rxkv3")
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
-material = SubResource("ShaderMaterial_s2ghg")
-sprite_frames = SubResource("SpriteFrames_4au77")
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_aaga8")
+sprite_frames = SubResource("SpriteFrames_kkdcb")
 
 [node name="Collision" type="CollisionShape2D" parent="."]
-
-[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
diff --git a/DungeonShooting_Godot/prefab/ui/Cursor.tscn b/DungeonShooting_Godot/prefab/ui/Cursor.tscn
deleted file mode 100644
index 93edd6b..0000000
--- a/DungeonShooting_Godot/prefab/ui/Cursor.tscn
+++ /dev/null
@@ -1,42 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://brx7nc4mdgjat"]
-
-[ext_resource type="Texture2D" uid="uid://ct5v768lsf6nc" path="res://resource/sprite/ui/Cursor.png" id="1"]
-[ext_resource type="Script" path="res://src/game/ui/Cursor.cs" id="2"]
-[ext_resource type="Texture2D" uid="uid://cjiiu86a42mnj" path="res://resource/sprite/ui/CursorCenter.png" id="2_2j135"]
-
-[node name="Cursor" type="Node2D"]
-z_index = 10
-script = ExtResource("2")
-
-[node name="Center" type="Sprite2D" parent="."]
-visible = false
-scale = Vector2(4, 4)
-texture = ExtResource("2_2j135")
-
-[node name="LT" type="Sprite2D" parent="."]
-scale = Vector2(4, 4)
-texture = ExtResource("1")
-offset = Vector2(-2, -2)
-region_enabled = true
-region_rect = Rect2(0, 0, 4, 4)
-
-[node name="LB" type="Sprite2D" parent="."]
-scale = Vector2(4, 4)
-texture = ExtResource("1")
-offset = Vector2(-2, 2)
-region_enabled = true
-region_rect = Rect2(0, 4, 4, 4)
-
-[node name="RT" type="Sprite2D" parent="."]
-scale = Vector2(4, 4)
-texture = ExtResource("1")
-offset = Vector2(2, -2)
-region_enabled = true
-region_rect = Rect2(4, 0, 4, 4)
-
-[node name="RB" type="Sprite2D" parent="."]
-scale = Vector2(4, 4)
-texture = ExtResource("1")
-offset = Vector2(2, 2)
-region_enabled = true
-region_rect = Rect2(4, 4, 4, 4)
diff --git a/DungeonShooting_Godot/prefab/ui/EditorTools.tscn b/DungeonShooting_Godot/prefab/ui/EditorTools.tscn
new file mode 100644
index 0000000..59f0d92
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/ui/EditorTools.tscn
@@ -0,0 +1,110 @@
+[gd_scene load_steps=2 format=3 uid="uid://kw3o772vpne"]
+
+[ext_resource type="Script" path="res://src/game/ui/editorTools/EditorToolsPanel.cs" id="1_pav1q"]
+
+[node name="EditorTools" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+script = ExtResource("1_pav1q")
+
+[node name="ScrollContainer" type="ScrollContainer" parent="."]
+layout_mode = 0
+anchor_right = 1.0
+anchor_bottom = 1.0
+
+[node name="MarginContainer" type="MarginContainer" parent="ScrollContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_constants/separation = 10
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 5
+
+[node name="Label" type="Label" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+text = "重新生成ResourcePath.cs文件"
+vertical_alignment = 1
+
+[node name="Button" type="Button" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 0
+text = "运行"
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="ScrollContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 5
+
+[node name="Label" type="Label" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+text = "重新打包地牢房间配置"
+
+[node name="Button" type="Button" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+text = "运行"
+
+[node name="HBoxContainer4" type="HBoxContainer" parent="ScrollContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 5
+
+[node name="Label" type="Label" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+text = "重新生成当前UI的代码"
+
+[node name="Button" type="Button" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+text = "运行"
+
+[node name="HBoxContainer3" type="HBoxContainer" parent="ScrollContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 5
+
+[node name="Label" type="Label" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer3"]
+layout_mode = 2
+text = "创建游戏Ui"
+
+[node name="LineEdit" type="LineEdit" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer3"]
+custom_minimum_size = Vector2(400, 0)
+layout_mode = 2
+placeholder_text = "请输入ui名称"
+
+[node name="Button" type="Button" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer3"]
+layout_mode = 2
+text = "创建
+"
+
+[node name="HBoxContainer5" type="HBoxContainer" parent="ScrollContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 5
+
+[node name="Label" type="Label" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer5"]
+layout_mode = 2
+text = "重新生成UiManagerMethods.cs代码"
+
+[node name="Button" type="Button" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer5"]
+layout_mode = 2
+text = "运行"
+
+[node name="Confirm" type="ConfirmationDialog" parent="."]
+initial_position = 1
+size = Vector2i(200, 124)
+unresizable = true
+
+[node name="Tips" type="AcceptDialog" parent="."]
+initial_position = 1
+unresizable = true
diff --git a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn
index 91c4332..22dc29c 100644
--- a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn
+++ b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn
@@ -115,12 +115,14 @@
 expand_mode = 1
 
 [node name="MapBar" type="TextureRect" parent="Control"]
-layout_mode = 0
+layout_mode = 1
+anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
 offset_left = -176.0
 offset_right = -132.0
 offset_bottom = 44.0
+grow_horizontal = 0
 scale = Vector2(4, 4)
 texture = ExtResource("2")
 
diff --git a/DungeonShooting_Godot/project.godot b/DungeonShooting_Godot/project.godot
index 660f32a..1c92e97 100644
--- a/DungeonShooting_Godot/project.godot
+++ b/DungeonShooting_Godot/project.godot
@@ -189,6 +189,7 @@
 
 [rendering]
 
+renderer/rendering_method="gl_compatibility"
 environment/defaults/default_clear_color=Color(0.109804, 0.0666667, 0.0901961, 1)
 textures/canvas_textures/default_texture_filter=0
 2d/snapping/use_gpu_pixel_snap=true
diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index a3f2a1e..a963a84 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_55nhs"]
+[sub_resource type="Image" id="Image_mscx5"]
 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_55nhs")
+image = SubResource("Image_mscx5")
 
 [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_8hfn8"]
+[sub_resource type="Image" id="Image_0l3gk"]
 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_8hfn8")
+image = SubResource("Image_0l3gk")
 
 [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_73ey7"]
+[sub_resource type="Image" id="Image_4exhg"]
 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_73ey7")
+image = SubResource("Image_4exhg")
 
 [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_t6clc"]
+[sub_resource type="Image" id="Image_1suh6"]
 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_t6clc")
+image = SubResource("Image_1suh6")
 
 [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_7qvk8"]
+[sub_resource type="Image" id="Image_3pmbh"]
 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_7qvk8")
+image = SubResource("Image_3pmbh")
 
 [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 0b7e589..5b225e8 100644
--- a/DungeonShooting_Godot/scene/Main.tscn
+++ b/DungeonShooting_Godot/scene/Main.tscn
@@ -29,23 +29,23 @@
 
 [node name="ViewCanvas" type="CanvasLayer" parent="."]
 layer = -1
-offset = Vector2(-4, -4)
-transform = Transform2D(1, 0, 0, 1, -4, -4)
 
 [node name="SubViewportContainer" type="SubViewportContainer" parent="ViewCanvas"]
 material = SubResource("2")
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_right = -1438.0
-offset_bottom = -808.0
+offset_right = -1440.0
+offset_bottom = -810.0
+grow_horizontal = 2
+grow_vertical = 2
 scale = Vector2(4, 4)
 stretch = true
 
 [node name="SubViewport" type="SubViewport" parent="ViewCanvas/SubViewportContainer"]
 handle_input_locally = false
 canvas_item_default_texture_filter = 0
-size = Vector2i(482, 272)
+size = Vector2i(480, 270)
 render_target_update_mode = 4
 
 [node name="SceneRoot" type="Node2D" parent="ViewCanvas/SubViewportContainer/SubViewport"]
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityFallData.cs b/DungeonShooting_Godot/src/framework/activity/ActivityFallData.cs
new file mode 100644
index 0000000..0d6c002
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityFallData.cs
@@ -0,0 +1,19 @@
+using Godot;
+
+public class ActivityFallData
+{
+    //----------- 用于记录原始信息 --------------
+    public bool UseOrigin = true;
+    public Shape2D OriginShape;
+    public Vector2 OriginPosition;
+    public float OriginRotation;
+    public Vector2 OriginScale;
+    public int OriginZIndex;
+    public Vector2 OriginSpritePosition;
+    public bool OriginCollisionEnable;
+    public Vector2 OriginCollisionPosition;
+    public float OriginCollisionRotation;
+    public Vector2 OriginCollisionScale;
+    public uint OriginCollisionMask;
+    public uint OriginCollisionLayer;
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
index 8ba098e..7b63117 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
@@ -45,7 +45,7 @@
     /// <summary>
     /// 是否正在投抛过程中
     /// </summary>
-    public bool IsThrowing => _throwData != null && !_throwData.IsOver;
+    public bool IsThrowing => _fallData != null && !_isFallOver;
 
     /// <summary>
     /// 阴影偏移
@@ -82,6 +82,68 @@
         }
     }
 
+    /// <summary>
+    /// 当前物体的海拔高度, 如果大于0, 则会做自由落体运动, 也就是执行投抛代码
+    /// </summary>
+    public float Altitude
+    {
+        get => _altitude;
+        set
+        {
+            _altitude = value;
+            _hasResilienceVerticalSpeed = false;
+        }
+    }
+
+    private float _altitude = 0;
+
+    /// <summary>
+    /// 物体纵轴移动速度, 如果设置大于0, 就可以营造向上投抛物体的效果, 该值会随着重力加速度衰减
+    /// </summary>
+    public float VerticalSpeed
+    {
+        get => _verticalSpeed;
+        set
+        {
+            _verticalSpeed = value;
+            _hasResilienceVerticalSpeed = false;
+        }
+    }
+
+    private float _verticalSpeed;
+    
+    /// <summary>
+    /// 物体投抛时旋转速度, 角度制
+    /// </summary>
+    public float ThrowRotationDegreesSpeed { get; set; }
+
+    /// <summary>
+    /// 落地之后是否回弹
+    /// </summary>
+    public bool Bounce { get; set; } = true;
+
+    /// <summary>
+    /// 物体下坠回弹的强度
+    /// </summary>
+    public float BounceStrength { get; set; } = 0.5f;
+
+    /// <summary>
+    /// 物体下坠回弹后的运动速度衰减量
+    /// </summary>
+    public float BounceSpeed { get; set; } = 0.75f;
+    
+    /// <summary>
+    /// 投抛状态下物体碰撞器大小, 如果 (x, y) 都小于 0, 则默认使用 AnimatedSprite 的默认动画第一帧的大小
+    /// </summary>
+    public Vector2 ThrowCollisionSize { get; set; } = new Vector2(-1, -1);
+
+    /// <summary>
+    /// 是否启用垂直方向上的运动模拟, 默认开启, 如果禁用, 那么下落和投抛效果, 同样 Throw() 函数也将失效
+    /// </summary>
+    public bool EnableVerticalMotion { get; set; } = true;
+
+    // --------------------------------------------------------------------------------
+
     //组件集合
     private List<KeyValuePair<Type, Component>> _components = new List<KeyValuePair<Type, Component>>();
     //是否初始化阴影
@@ -99,7 +161,7 @@
     private ShaderMaterial _blendShaderMaterial;
     
     //存储投抛该物体时所产生的数据
-    private ActivityThrowData _throwData;
+    private ActivityFallData _fallData;
     
     //所在层级
     private RoomLayerEnum _currLayer;
@@ -112,8 +174,28 @@
     //模板实例
     private ActivityObjectTemplate _templateInstance;
     
+    //物体所在区域
     private AffiliationArea _affiliationArea;
+
+    //是否是第一次下坠
+    private bool _firstFall = true;
     
+    //下坠是否已经结束
+    private bool _isFallOver = true;
+
+    //下坠状态碰撞器形状
+    private RectangleShape2D _throwRectangleShape;
+
+    //投抛移动速率
+    private ExternalForce _throwForce;
+    
+    //落到地上回弹的速度
+    private float _resilienceVerticalSpeed = 0;
+    private bool _hasResilienceVerticalSpeed = false;
+    
+    // --------------------------------------------------------------------------------
+    
+    //实例索引
     private static long _instanceIndex = 0;
 
     //初始化节点
@@ -171,6 +253,13 @@
     }
 
     /// <summary>
+    /// 子类重写的 _Ready() 可能会比 _InitNode() 函数调用晚, 所以禁止子类重写, 如需要 _Ready() 类似的功能需重写 OnInit()
+    /// </summary>
+    public sealed override void _Ready()
+    {
+    }
+
+    /// <summary>
     /// 显示阴影
     /// </summary>
     public void ShowShadowSprite()
@@ -431,54 +520,57 @@
     /// <summary>
     /// 将该节点投抛出去
     /// </summary>
-    /// <param name="size">碰撞器大小</param>
-    /// <param name="start">起始坐标 (全局)</param>
-    /// <param name="startHeight">起始高度</param>
-    /// <param name="direction">投抛角度 (0-360)</param>
-    /// <param name="xSpeed">移动速度</param>
-    /// <param name="ySpeed">下坠速度</param>
+    /// <param name="altitude">初始高度</param>
     /// <param name="rotate">旋转速度</param>
-    /// <param name="bounce">落地时是否回弹</param>
-    /// <param name="bounceStrength">落地回弹力度, 1为不消耗能量, 值越小回弹力度越小</param>
-    /// <param name="bounceSpeed">落地回弹后的速度, 1为不消速度, 值越小回弹速度消耗越大</param>
-    public void Throw(Vector2 size, Vector2 start, float startHeight, float direction, float xSpeed,
-        float ySpeed, float rotate, bool bounce = false, float bounceStrength = 0.5f, float bounceSpeed = 0.8f)
+    /// <param name="velocity">移动速率</param>
+    /// <param name="verticalSpeed">纵轴速度</param>
+    public void Throw(float altitude, float verticalSpeed, Vector2 velocity, float rotate)
     {
-        if (_throwData == null)
+        var parent = GetParent();
+        if (parent == null)
         {
-            _throwData = new ActivityThrowData();
+            GameApplication.Instance.RoomManager.YSortLayer.AddChild(this);
+        }
+        else if (parent != GameApplication.Instance.RoomManager.YSortLayer)
+        {
+            parent.RemoveChild(this);
+            GameApplication.Instance.RoomManager.YSortLayer.AddChild(this);
+        }
+        
+        Altitude = altitude;
+        VerticalSpeed = verticalSpeed;
+        ThrowRotationDegreesSpeed = rotate;
+        if (_throwForce != null)
+        {
+            MoveController.RemoveForce(_throwForce);
         }
 
-        SetThrowCollision();
-
-        _throwData.IsOver = false;
-        _throwData.Size = size;
-        _throwData.StartPosition = _throwData.CurrPosition = start;
-        _throwData.Direction = direction;
-        _throwData.XSpeed = xSpeed;
-        _throwData.YSpeed = ySpeed;
-        _throwData.StartXSpeed = xSpeed;
-        _throwData.StartYSpeed = ySpeed;
-        _throwData.RotateSpeed = rotate;
-        _throwData.ThrowForce = MoveController.AddConstantForce("ThrowForce");
-        _throwData.ThrowForce.Velocity =
-            new Vector2(_throwData.XSpeed, 0).Rotated(_throwData.Direction * Mathf.Pi / 180);
-        _throwData.Y = startHeight;
-        _throwData.Bounce = bounce;
-        _throwData.BounceStrength = bounceStrength;
-        _throwData.BounceSpeed = bounceSpeed;
-
-        _throwData.RectangleShape.Size = _throwData.Size * 0.5f;
-
-        Throw();
+        _throwForce = new ExternalForce("throw");
+        _throwForce.Velocity = velocity;
+        MoveController.AddConstantForce(_throwForce);
     }
 
     /// <summary>
+    /// 将该节点投抛出去
+    /// </summary>
+    /// <param name="position">初始位置</param>
+    /// <param name="altitude">初始高度</param>
+    /// <param name="rotate">旋转速度</param>
+    /// <param name="velocity">移动速率</param>
+    /// <param name="verticalSpeed">纵轴速度</param>
+    public void Throw(Vector2 position, float altitude, float verticalSpeed, Vector2 velocity, float rotate)
+    {
+        GlobalPosition = position;
+        Throw(altitude, verticalSpeed, velocity, rotate);
+    }
+
+
+    /// <summary>
     /// 强制停止投抛运动
     /// </summary>
     public void StopThrow()
     {
-        _throwData.IsOver = true;
+        _isFallOver = true;
         RestoreCollision();
     }
 
@@ -566,65 +658,111 @@
             }
         }
 
-        //投抛计算
-        if (_throwData != null && !_throwData.IsOver)
+        // 下坠判定
+        if (Altitude > 0 || VerticalSpeed != 0)
         {
-            GlobalRotationDegrees = GlobalRotationDegrees + _throwData.RotateSpeed * newDelta;
-            CalcThrowAnimatedPosition();
-
-            var ysp = _throwData.YSpeed;
-
-            _throwData.Y += _throwData.YSpeed * newDelta;
-            _throwData.YSpeed -= GameConfig.G * newDelta;
-
-            //当高度大于16时, 显示在所有物体上
-            if (_throwData.Y >= 16)
+            if (_fallData == null)
             {
-                AnimatedSprite.ZIndex = 20;
+                _fallData = new ActivityFallData();
+            }
+            
+            if (_isFallOver) // 没有处于下坠状态, 则进入下坠状态
+            {
+                SetFallCollision();
+
+                _isFallOver = false;
+                _firstFall = true;
+                _hasResilienceVerticalSpeed = false;
+                _resilienceVerticalSpeed = 0;
+                
+                if (ThrowCollisionSize.X < 0 && ThrowCollisionSize.Y < 0)
+                {
+                    _throwRectangleShape.Size = GetDefaultTexture().GetSize();
+                }
+                else
+                {
+                    _throwRectangleShape.Size = ThrowCollisionSize;
+                }
+
+                Throw();
             }
             else
             {
-                AnimatedSprite.ZIndex = 0;
-            }
-            
-            //达到最高点
-            if (ysp * _throwData.YSpeed < 0)
-            {
-                OnThrowMaxHeight(_throwData.Y);
-            }
-
-            //落地判断
-            if (_throwData.Y <= 0)
-            {
-
-                _throwData.IsOver = true;
-
-                //第一次接触地面
-                if (_throwData.FirstOver)
+                if (EnableVerticalMotion) //如果启用了纵向运动, 则更新运动
                 {
-                    _throwData.FirstOver = false;
-                    OnFirstFallToGround();
+                    GlobalRotationDegrees = GlobalRotationDegrees + ThrowRotationDegreesSpeed * newDelta;
+
+                    var ysp = VerticalSpeed;
+
+                    _altitude += VerticalSpeed * newDelta;
+                    _verticalSpeed -= GameConfig.G * newDelta;
+
+                    //当高度大于16时, 显示在所有物体上
+                    if (Altitude >= 16)
+                    {
+                        AnimatedSprite.ZIndex = 20;
+                    }
+                    else
+                    {
+                        AnimatedSprite.ZIndex = 0;
+                    }
+                
+                    //达到最高点
+                    if (ysp > 0 && ysp * VerticalSpeed < 0)
+                    {
+                        OnThrowMaxHeight(Altitude);
+                    }
+
+                    //落地判断
+                    if (Altitude <= 0)
+                    {
+                        _altitude = 0;
+
+                        //第一次接触地面
+                        if (_firstFall)
+                        {
+                            _firstFall = false;
+                            OnFirstFallToGround();
+                        }
+
+                        MoveController.ScaleAllForce(BounceSpeed);
+                        //如果落地高度不够低, 再抛一次
+                        if (Bounce && (!_hasResilienceVerticalSpeed || _resilienceVerticalSpeed > 1))
+                        {
+                            if (!_hasResilienceVerticalSpeed)
+                            {
+                                _hasResilienceVerticalSpeed = true;
+                                _resilienceVerticalSpeed = -VerticalSpeed * BounceStrength;
+                            }
+                            else
+                            {
+                                _resilienceVerticalSpeed = _resilienceVerticalSpeed * BounceStrength;
+                            }
+                            _verticalSpeed = _resilienceVerticalSpeed;
+                            ThrowRotationDegreesSpeed = ThrowRotationDegreesSpeed * BounceStrength;
+                            _isFallOver = false;
+
+                            OnFallToGround();
+                        }
+                        else //结束
+                        {
+                            _verticalSpeed = 0;
+
+                            if (_throwForce != null)
+                            {
+                                MoveController.RemoveForce(_throwForce);
+                                _throwForce = null;
+                            }
+                            _isFallOver = true;
+                            
+                            OnFallToGround();
+                            ThrowOver();
+                        }
+                    }
                 }
 
-                //如果落地高度不够低, 再抛一次
-                if (_throwData.StartYSpeed > 1 && _throwData.Bounce)
-                {
-                    _throwData.StartPosition = Position;
-                    _throwData.Y = 0;
-                    _throwData.XSpeed = _throwData.StartXSpeed = _throwData.StartXSpeed * _throwData.BounceSpeed;
-                    _throwData.YSpeed = _throwData.StartYSpeed = _throwData.StartYSpeed * _throwData.BounceStrength;
-                    _throwData.RotateSpeed = _throwData.RotateSpeed * _throwData.BounceStrength;
-                    _throwData.ThrowForce.Velocity *= _throwData.BounceSpeed;
-                    _throwData.FirstOver = false;
-                    _throwData.IsOver = false;
-
-                    OnFallToGround();
-                }
-                else //结束
-                {
-                    OnFallToGround();
-                    ThrowOver();
-                }
+                //计算精灵位置
+                CalcThrowAnimatedPosition();
             }
         }
 
@@ -673,84 +811,7 @@
         //协程更新
         if (_coroutineList != null)
         {
-            var pairs = _coroutineList.ToArray();
-            for (var i = 0; i < pairs.Length; i++)
-            {
-                var item = pairs[i];
-                var canNext = true;
-
-                if (item.WaitType == CoroutineData.WaitTypeEnum.WaitForSeconds) //等待秒数
-                {
-                    if (!item.WaitForSeconds.NextStep(newDelta))
-                    {
-                        canNext = false;
-                    }
-                    else
-                    {
-                        item.WaitType = CoroutineData.WaitTypeEnum.None;
-                        item.WaitForSeconds = null;
-                    }
-                }
-                else if (item.WaitType == CoroutineData.WaitTypeEnum.WaitForFixedProcess) //等待帧数
-                {
-                    if (!item.WaitForFixedProcess.NextStep())
-                    {
-                        canNext = false;
-                    }
-                    else
-                    {
-                        item.WaitType = CoroutineData.WaitTypeEnum.None;
-                        item.WaitForFixedProcess = null;
-                    }
-                }
-
-                if (canNext)
-                {
-                    if (item.Enumerator.MoveNext()) //嵌套协程
-                    {
-                        var next = item.Enumerator.Current;
-                        if (next is IEnumerable enumerable)
-                        {
-                            if (item.EnumeratorStack == null)
-                            {
-                                item.EnumeratorStack = new Stack<IEnumerator>();
-                            }
-
-                            item.EnumeratorStack.Push(item.Enumerator);
-                            item.Enumerator = enumerable.GetEnumerator();
-                        }
-                        else if (next is IEnumerator enumerator)
-                        {
-                            if (item.EnumeratorStack == null)
-                            {
-                                item.EnumeratorStack = new Stack<IEnumerator>();
-                            }
-
-                            item.EnumeratorStack.Push(item.Enumerator);
-                            item.Enumerator = enumerator;
-                        }
-                        else if (next is WaitForSeconds seconds) //等待秒数
-                        {
-                            item.WaitFor(seconds);
-                        }
-                        else if (next is WaitForFixedProcess process) //等待帧数
-                        {
-                            item.WaitFor(process);
-                        }
-                    }
-                    else
-                    {
-                        if (item.EnumeratorStack == null || item.EnumeratorStack.Count == 0)
-                        {
-                            StopCoroutine(item.Id);
-                        }
-                        else
-                        {
-                            item.Enumerator = item.EnumeratorStack.Pop();
-                        }
-                    }
-                }
-            }
+            ProxyCoroutineHandler.ProxyUpdateCoroutine(ref _coroutineList, newDelta);
         }
 
         ProcessOver(newDelta);
@@ -826,26 +887,19 @@
         ShadowSprite.Rotation = 0;
         //阴影位置计算
         var pos = AnimatedSprite.GlobalPosition;
-        if (_throwData != null && !_throwData.IsOver)
-        {
-            ShadowSprite.GlobalPosition = new Vector2(pos.X + ShadowOffset.X, pos.Y + ShadowOffset.Y + _throwData.Y);
-        }
-        else
-        {
-            ShadowSprite.GlobalPosition = pos + ShadowOffset;
-        }
+        ShadowSprite.GlobalPosition = new Vector2(pos.X + ShadowOffset.X, pos.Y + ShadowOffset.Y + Altitude);
     }
-    
+
     //计算位置
     private void CalcThrowAnimatedPosition()
     {
         if (Scale.Y < 0)
         {
-            AnimatedSprite.GlobalPosition = GlobalPosition + new Vector2(0, -_throwData.Y) - _throwData.OriginSpritePosition.Rotated(Rotation) * Scale.Abs();
+            AnimatedSprite.GlobalPosition = GlobalPosition + new Vector2(0, -Altitude) - _fallData.OriginSpritePosition.Rotated(Rotation) * Scale.Abs();
         }
         else
         {
-            AnimatedSprite.GlobalPosition = GlobalPosition + new Vector2(0, -_throwData.Y) + _throwData.OriginSpritePosition.Rotated(Rotation);
+            AnimatedSprite.GlobalPosition = GlobalPosition + new Vector2(0, -Altitude) + _fallData.OriginSpritePosition.Rotated(Rotation);
         }
     }
 
@@ -904,40 +958,42 @@
             this.AddToActivityRoot(RoomLayerEnum.YSortLayer);
         }
 
-        GlobalPosition = _throwData.StartPosition;
-
         CalcThrowAnimatedPosition();
         //显示阴影
         ShowShadowSprite();
-        OnThrowStart();
+
+        if (EnableVerticalMotion)
+        {
+            OnThrowStart();
+        }
     }
 
     /// <summary>
-    /// 设置投抛状态下的碰撞器
+    /// 设置下坠状态下的碰撞器
     /// </summary>
-    private void SetThrowCollision()
+    private void SetFallCollision()
     {
-        if (_throwData != null && _throwData.UseOrigin)
+        if (_fallData != null && _fallData.UseOrigin)
         {
-            _throwData.OriginShape = Collision.Shape;
-            _throwData.OriginPosition = Collision.Position;
-            _throwData.OriginRotation = Collision.Rotation;
-            _throwData.OriginScale = Collision.Scale;
-            _throwData.OriginZIndex = ZIndex;
-            _throwData.OriginSpritePosition = AnimatedSprite.Position;
-            _throwData.OriginCollisionEnable = Collision.Disabled;
-            _throwData.OriginCollisionPosition = Collision.Position;
-            _throwData.OriginCollisionRotation = Collision.Rotation;
-            _throwData.OriginCollisionScale = Collision.Scale;
-            _throwData.OriginCollisionMask = CollisionMask;
-            _throwData.OriginCollisionLayer = CollisionLayer;
+            _fallData.OriginShape = Collision.Shape;
+            _fallData.OriginPosition = Collision.Position;
+            _fallData.OriginRotation = Collision.Rotation;
+            _fallData.OriginScale = Collision.Scale;
+            _fallData.OriginZIndex = ZIndex;
+            _fallData.OriginSpritePosition = AnimatedSprite.Position;
+            _fallData.OriginCollisionEnable = Collision.Disabled;
+            _fallData.OriginCollisionPosition = Collision.Position;
+            _fallData.OriginCollisionRotation = Collision.Rotation;
+            _fallData.OriginCollisionScale = Collision.Scale;
+            _fallData.OriginCollisionMask = CollisionMask;
+            _fallData.OriginCollisionLayer = CollisionLayer;
 
-            if (_throwData.RectangleShape == null)
+            if (_throwRectangleShape == null)
             {
-                _throwData.RectangleShape = new RectangleShape2D();
+                _throwRectangleShape = new RectangleShape2D();
             }
 
-            Collision.Shape = _throwData.RectangleShape;
+            Collision.Shape = _throwRectangleShape;
             Collision.Position = Vector2.Zero;
             Collision.Rotation = 0;
             Collision.Scale = Vector2.One;
@@ -948,7 +1004,7 @@
             Collision.Scale = Vector2.One;
             CollisionMask = 1;
             CollisionLayer = 0;
-            _throwData.UseOrigin = false;
+            _fallData.UseOrigin = false;
         }
     }
 
@@ -957,22 +1013,22 @@
     /// </summary>
     private void RestoreCollision()
     {
-        if (_throwData != null && !_throwData.UseOrigin)
+        if (_fallData != null && !_fallData.UseOrigin)
         {
-            Collision.Shape = _throwData.OriginShape;
-            Collision.Position = _throwData.OriginPosition;
-            Collision.Rotation = _throwData.OriginRotation;
-            Collision.Scale = _throwData.OriginScale;
-            ZIndex = _throwData.OriginZIndex;
-            AnimatedSprite.Position = _throwData.OriginSpritePosition;
-            Collision.Disabled = _throwData.OriginCollisionEnable;
-            Collision.Position = _throwData.OriginCollisionPosition;
-            Collision.Rotation = _throwData.OriginCollisionRotation;
-            Collision.Scale = _throwData.OriginCollisionScale;
-            CollisionMask = _throwData.OriginCollisionMask;
-            CollisionLayer = _throwData.OriginCollisionLayer;
+            Collision.Shape = _fallData.OriginShape;
+            Collision.Position = _fallData.OriginPosition;
+            Collision.Rotation = _fallData.OriginRotation;
+            Collision.Scale = _fallData.OriginScale;
+            ZIndex = _fallData.OriginZIndex;
+            AnimatedSprite.Position = _fallData.OriginSpritePosition;
+            Collision.Disabled = _fallData.OriginCollisionEnable;
+            Collision.Position = _fallData.OriginCollisionPosition;
+            Collision.Rotation = _fallData.OriginCollisionRotation;
+            Collision.Scale = _fallData.OriginCollisionScale;
+            CollisionMask = _fallData.OriginCollisionMask;
+            CollisionLayer = _fallData.OriginCollisionLayer;
 
-            _throwData.UseOrigin = true;
+            _fallData.UseOrigin = true;
         }
     }
 
@@ -981,11 +1037,13 @@
     /// </summary>
     private void ThrowOver()
     {
-        //移除投抛的力
-        MoveController.RemoveForce(_throwData.ThrowForce);
-        
-        GetParent().RemoveChild(this);
-        this.AddToActivityRoot(_currLayer);
+        var parent = GetParent();
+        var roomLayer = GameApplication.Instance.RoomManager.GetRoomLayer(_currLayer);
+        if (parent != roomLayer)
+        {
+            parent.RemoveChild(this);
+            roomLayer.AddChild(this);
+        }
         RestoreCollision();
 
         OnThrowOver();
@@ -1071,22 +1129,7 @@
     /// </summary>
     public long StartCoroutine(IEnumerator able)
     {
-        if (_coroutineList == null)
-        {
-            _coroutineList = new List<CoroutineData>();
-        }
-
-        var data = new CoroutineData(able);
-        _coroutineList.Add(data);
-        return data.Id;
-    }
-    
-    /// <summary>
-    /// 开启一个协程, 返回协程 id, 协程是在普通帧执行的, 支持: 协程嵌套, WaitForSeconds, WaitForFixedProcess
-    /// </summary>
-    public long StartCoroutine(IEnumerable able)
-    {
-        return StartCoroutine(able.GetEnumerator());
+        return ProxyCoroutineHandler.ProxyStartCoroutine(ref _coroutineList, able);
     }
 
     /// <summary>
@@ -1094,18 +1137,7 @@
     /// </summary>
     public void StopCoroutine(long coroutineId)
     {
-        if (_coroutineList != null)
-        {
-            for (var i = 0; i < _coroutineList.Count; i++)
-            {
-                var item = _coroutineList[i];
-                if (item.Id == coroutineId)
-                {
-                    _coroutineList.RemoveAt(i);
-                    return;
-                }
-            }
-        }
+        ProxyCoroutineHandler.ProxyStopCoroutine(ref _coroutineList, coroutineId);
     }
     
     /// <summary>
@@ -1113,9 +1145,6 @@
     /// </summary>
     public void StopAllCoroutine()
     {
-        if (_coroutineList != null)
-        {
-            _coroutineList.Clear();
-        }
+        ProxyCoroutineHandler.ProxyStopAllCoroutine(ref _coroutineList);
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs
index 2ff215f..01e9f66 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Register.cs
@@ -65,11 +65,11 @@
                 foreach (var att in attrs)
                 {
                     //注册操作
-                    if (_activityRegisterMap.ContainsKey(att.Id))
+                    if (_activityRegisterMap.ContainsKey(att.ItemId))
                     {
-                        throw new Exception($"Object ID: '{att.Id}' is already registered");
+                        throw new Exception($"Object ID: '{att.ItemId}' is already registered");
                     }
-                    _activityRegisterMap.Add(att.Id, new RegisterActivityData(att, () =>
+                    _activityRegisterMap.Add(att.ItemId, new RegisterActivityData(att, () =>
                     {
                         return (ActivityObject)Activator.CreateInstance(type);
                     }));
@@ -86,7 +86,7 @@
         if (_activityRegisterMap.TryGetValue(itemId, out var item))
         {
             var instance = item.CallBack();
-            instance._InitNode(item.RegisterActivity.Id, item.RegisterActivity.PrefabPath);
+            instance._InitNode(item.RegisterActivity.ItemId, item.RegisterActivity.PrefabPath);
             item.RegisterActivity.CustomHandler(instance);
             return instance;
         }
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityThrowData.cs b/DungeonShooting_Godot/src/framework/activity/ActivityThrowData.cs
deleted file mode 100644
index 73a4b65..0000000
--- a/DungeonShooting_Godot/src/framework/activity/ActivityThrowData.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Godot;
-
-public class ActivityThrowData
-{
-    /// <summary>
-    /// 是否是第一次结束
-    /// </summary>
-    public bool FirstOver = true;
-    
-    /// <summary>
-    /// 是否已经结束
-    /// </summary>
-    public bool IsOver = true;
-
-    /// <summary>
-    /// 物体大小
-    /// </summary>
-    public Vector2 Size = Vector2.One;
-
-    /// <summary>
-    /// 起始坐标
-    /// </summary>
-    public Vector2 StartPosition;
-
-    /// <summary>
-    /// 移动方向, 0 - 360
-    /// </summary>
-    public float Direction;
-
-    /// <summary>
-    /// x速度, 也就是水平速度
-    /// </summary>
-    public float XSpeed;
-
-    /// <summary>
-    /// y轴速度, 也就是竖直速度
-    /// </summary>
-    public float YSpeed;
-
-    /// <summary>
-    /// 初始x轴组队
-    /// </summary>
-    public float StartXSpeed;
-
-    /// <summary>
-    /// 初始y轴速度
-    /// </summary>
-    public float StartYSpeed;
-
-    /// <summary>
-    /// 旋转速度
-    /// </summary>
-    public float RotateSpeed;
-    
-    /// <summary>
-    /// 碰撞器形状
-    /// </summary>
-    public RectangleShape2D RectangleShape;
-
-    /// <summary>
-    /// 落地之后是否弹跳
-    /// </summary>
-    public bool Bounce;
-
-    /// <summary>
-    /// 回弹的强度
-    /// </summary>
-    public float BounceStrength = 0.5f;
-
-    /// <summary>
-    /// 回弹后的速度
-    /// </summary>
-    public float BounceSpeed = 0.8f;
-
-    public Vector2 CurrPosition;
-    public float Y;
-    public ExternalForce ThrowForce;
-
-    //----------- 用于记录原始信息 --------------
-    public bool UseOrigin = true;
-    public Shape2D OriginShape;
-    public Vector2 OriginPosition;
-    public float OriginRotation;
-    public Vector2 OriginScale;
-    public int OriginZIndex;
-    public Vector2 OriginSpritePosition;
-    public bool OriginCollisionEnable;
-    public Vector2 OriginCollisionPosition;
-    public float OriginCollisionRotation;
-    public Vector2 OriginCollisionScale;
-    public uint OriginCollisionMask;
-    public uint OriginCollisionLayer;
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/activity/CoroutineData.cs b/DungeonShooting_Godot/src/framework/activity/CoroutineData.cs
deleted file mode 100644
index b2f1225..0000000
--- a/DungeonShooting_Godot/src/framework/activity/CoroutineData.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-
-using System.Collections;
-using System.Collections.Generic;
-
-public class CoroutineData
-{
-    private static long _id;
-    
-    public enum WaitTypeEnum
-    {
-        None,
-        WaitForSeconds,
-        WaitForFixedProcess,
-    }
-
-    public readonly long Id;
-    public WaitTypeEnum WaitType = WaitTypeEnum.None;
-    public IEnumerator Enumerator;
-    public Stack<IEnumerator> EnumeratorStack;
-
-    public WaitForSeconds WaitForSeconds;
-    public WaitForFixedProcess WaitForFixedProcess;
-
-    public CoroutineData(IEnumerator enumerator)
-    {
-        Id = _id++;
-        Enumerator = enumerator;
-    }
-
-    public void WaitFor(WaitForSeconds seconds)
-    {
-        WaitType = WaitTypeEnum.WaitForSeconds;
-        WaitForSeconds = seconds;
-    }
-    
-    public void WaitFor(WaitForFixedProcess process)
-    {
-        WaitType = WaitTypeEnum.WaitForFixedProcess;
-        WaitForFixedProcess = process;
-    }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/activity/ExternalForce.cs b/DungeonShooting_Godot/src/framework/activity/ExternalForce.cs
index cfd4ce9..e6b1d2f 100644
--- a/DungeonShooting_Godot/src/framework/activity/ExternalForce.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ExternalForce.cs
@@ -22,7 +22,7 @@
     public float Resistance { get; set; } = 5;
 
     /// <summary>
-    /// 当速度到达 0 后是否自动销毁
+    /// 当速度到达 0 后是否自动销毁, 默认 true
     /// </summary>
     public bool AutoDestroy { get; set; } = true;
     
diff --git a/DungeonShooting_Godot/src/framework/activity/RegisterActivity.cs b/DungeonShooting_Godot/src/framework/activity/RegisterActivity.cs
index d3247b1..4782dd1 100644
--- a/DungeonShooting_Godot/src/framework/activity/RegisterActivity.cs
+++ b/DungeonShooting_Godot/src/framework/activity/RegisterActivity.cs
@@ -10,16 +10,16 @@
     /// <summary>
     /// 注册物体唯一ID， 该ID不能有重复
     /// </summary>
-    public string Id { get; protected set; }
+    public string ItemId { get; protected set; }
 
     /// <summary>
     /// 模板 Prefab 的路径
     /// </summary>
     public string PrefabPath { get; protected set; }
 
-    public RegisterActivity(string id, string prefabPath)
+    public RegisterActivity(string itemId, string prefabPath)
     {
-        Id = id;
+        ItemId = itemId;
         PrefabPath = prefabPath;
     }
 
diff --git a/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs b/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs
index d7b3b59..3d84323 100644
--- a/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs
+++ b/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs
@@ -32,6 +32,32 @@
     private Vector2 _basisVelocity = Vector2.Zero;
 
     /// <summary>
+    /// 缩放所有力对象, 包括基础速率
+    /// </summary>
+    public void ScaleAllForce(float scale)
+    {
+        foreach (var externalForce in _forceList)
+        {
+            externalForce.Velocity *= scale;
+        }
+
+        BasisVelocity *= scale;
+    }
+    
+    /// <summary>
+    /// 设置所有力对象, 包括基础速率
+    /// </summary>
+    public void SetAllForce(Vector2 value)
+    {
+        foreach (var externalForce in _forceList)
+        {
+            externalForce.Velocity = value;
+        }
+
+        BasisVelocity = value;
+    }
+    
+    /// <summary>
     /// 获取所有外力对象
     /// </summary>
     public ExternalForce[] GetAllForce()
@@ -53,11 +79,12 @@
     }
 
     /// <summary>
-    /// 根据名称添加一个外力, 并返回创建的外力的对象, 如果存在这个名称的外力, 移除之前的外力
+    /// 根据名称添加一个外力, 并返回创建的外力的对象, 如果存在这个名称的外力, 移除之前的外力, 当速率变为 0 时不会自动销毁
     /// </summary>
     public ExternalForce AddConstantForce(string name)
     {
         var f = new ExternalForce(name);
+        f.AutoDestroy = false;
         AddConstantForce(f);
         return f;
     }
@@ -146,18 +173,27 @@
 
         //先调用更新
         var externalForces = _forceList.ToArray();
-        foreach (var fore in externalForces)
+        for (var i = 0; i < externalForces.Length; i++)
         {
-            if (fore.Enable)
-                fore.PhysicsProcess(delta);
+            var force = externalForces[i];
+            if (force.Enable)
+            {
+                force.PhysicsProcess(delta);
+                //自动销毁
+                if (force.AutoDestroy && force.Velocity == Vector2.Zero)
+                {
+                    _forceList.Remove(force);
+                    externalForces[i] = null;
+                }
+            }
         }
 
         //外力总和
         var finallyEf = new Vector2();
-        foreach (var fore in externalForces)
+        foreach (var force in externalForces)
         {
-            if (fore.Enable)
-                finallyEf += fore.Velocity;
+            if (force != null && force.Enable)
+                finallyEf += force.Velocity;
         }
 
         //最终速率
@@ -180,28 +216,27 @@
             }
 
             //调整外力速率
-            if (externalForces.Length > 0)
+            for (var i = 0; i < _forceList.Count; i++)
             {
-                for (var i = 0; i < _forceList.Count; i++)
+                var force = _forceList[i];
+                if (force.Enable)
                 {
-                    var force = _forceList[i];
-                    if (force.Enable)
+                    var velocity = force.Velocity;
+                    force.Velocity = new Vector2(
+                        newVelocity.X == 0f && velocity.X * finallyVelocity.X > 0 ? 0 : velocity.X,
+                        newVelocity.Y == 0f && velocity.Y * finallyVelocity.Y > 0 ? 0 : velocity.Y
+                    );
+
+                    //力速度衰减
+                    if (force.Resistance != 0)
                     {
-                        var velocity = force.Velocity;
-                        force.Velocity = new Vector2(
-                            newVelocity.X == 0f && velocity.X * finallyVelocity.X > 0 ? 0 : velocity.X,
-                            newVelocity.Y == 0f && velocity.Y * finallyVelocity.Y > 0 ? 0 : velocity.Y
-                        );
+                        force.Velocity = force.Velocity.MoveToward(Vector2.Zero, force.Resistance * delta);
+                    }
 
-                        if (force.Resistance != 0)
-                        {
-                            force.Velocity = force.Velocity.MoveToward(Vector2.Zero, force.Resistance * delta);
-                        }
-
-                        if (force.AutoDestroy && force.Velocity == Vector2.Zero)
-                        {
-                            _forceList.RemoveAt(i--);
-                        }
+                    //自动销毁
+                    if (force.AutoDestroy && force.Velocity == Vector2.Zero)
+                    {
+                        _forceList.RemoveAt(i--);
                     }
                 }
             }
diff --git a/DungeonShooting_Godot/src/framework/common/Utils.cs b/DungeonShooting_Godot/src/framework/common/Utils.cs
index 052042d..b3e2910 100644
--- a/DungeonShooting_Godot/src/framework/common/Utils.cs
+++ b/DungeonShooting_Godot/src/framework/common/Utils.cs
@@ -130,4 +130,12 @@
             }
         }
     }
+
+    /// <summary>
+    /// 字符串首字母小写
+    /// </summary>
+    public static string FirstToLower(this string str)
+    {
+        return str.Substring(0, 1).ToLower() + str.Substring(1);
+    }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/coroutine/CoroutineData.cs b/DungeonShooting_Godot/src/framework/coroutine/CoroutineData.cs
new file mode 100644
index 0000000..0d5ed90
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/coroutine/CoroutineData.cs
@@ -0,0 +1,44 @@
+
+using System.Collections;
+using System.Collections.Generic;
+
+/// <summary>
+/// 协程数据
+/// </summary>
+public class CoroutineData
+{
+    private static long _id;
+    
+    public enum WaitTypeEnum
+    {
+        None,
+        WaitForSeconds,
+        WaitForFixedProcess,
+    }
+
+    public readonly long Id;
+    public WaitTypeEnum WaitType = WaitTypeEnum.None;
+    public IEnumerator Enumerator;
+    public Stack<IEnumerator> EnumeratorStack;
+
+    public WaitForSeconds WaitForSeconds;
+    public WaitForFixedProcess WaitForFixedProcess;
+
+    public CoroutineData(IEnumerator enumerator)
+    {
+        Id = _id++;
+        Enumerator = enumerator;
+    }
+
+    public void WaitFor(WaitForSeconds seconds)
+    {
+        WaitType = WaitTypeEnum.WaitForSeconds;
+        WaitForSeconds = seconds;
+    }
+    
+    public void WaitFor(WaitForFixedProcess process)
+    {
+        WaitType = WaitTypeEnum.WaitForFixedProcess;
+        WaitForFixedProcess = process;
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/coroutine/ProxyCoroutineHandler.cs b/DungeonShooting_Godot/src/framework/coroutine/ProxyCoroutineHandler.cs
new file mode 100644
index 0000000..c9e1ecd
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/coroutine/ProxyCoroutineHandler.cs
@@ -0,0 +1,140 @@
+
+using System.Collections;
+using System.Collections.Generic;
+
+/// <summary>
+/// 协程代理类
+/// </summary>
+public static class ProxyCoroutineHandler
+{
+    /// <summary>
+    /// 代理更新协程
+    /// </summary>
+    public static void ProxyUpdateCoroutine(ref List<CoroutineData> coroutineList, float delta)
+    {
+        var pairs = coroutineList.ToArray();
+        for (var i = 0; i < pairs.Length; i++)
+        {
+            var item = pairs[i];
+            var canNext = true;
+
+            if (item.WaitType == CoroutineData.WaitTypeEnum.WaitForSeconds) //等待秒数
+            {
+                if (!item.WaitForSeconds.NextStep(delta))
+                {
+                    canNext = false;
+                }
+                else
+                {
+                    item.WaitType = CoroutineData.WaitTypeEnum.None;
+                    item.WaitForSeconds = null;
+                }
+            }
+            else if (item.WaitType == CoroutineData.WaitTypeEnum.WaitForFixedProcess) //等待帧数
+            {
+                if (!item.WaitForFixedProcess.NextStep())
+                {
+                    canNext = false;
+                }
+                else
+                {
+                    item.WaitType = CoroutineData.WaitTypeEnum.None;
+                    item.WaitForFixedProcess = null;
+                }
+            }
+
+            if (canNext)
+            {
+                if (item.Enumerator.MoveNext()) //嵌套协程
+                {
+                    var next = item.Enumerator.Current;
+                    if (next is IEnumerable enumerable)
+                    {
+                        if (item.EnumeratorStack == null)
+                        {
+                            item.EnumeratorStack = new Stack<IEnumerator>();
+                        }
+
+                        item.EnumeratorStack.Push(item.Enumerator);
+                        item.Enumerator = enumerable.GetEnumerator();
+                    }
+                    else if (next is IEnumerator enumerator)
+                    {
+                        if (item.EnumeratorStack == null)
+                        {
+                            item.EnumeratorStack = new Stack<IEnumerator>();
+                        }
+
+                        item.EnumeratorStack.Push(item.Enumerator);
+                        item.Enumerator = enumerator;
+                    }
+                    else if (next is WaitForSeconds seconds) //等待秒数
+                    {
+                        item.WaitFor(seconds);
+                    }
+                    else if (next is WaitForFixedProcess process) //等待帧数
+                    {
+                        item.WaitFor(process);
+                    }
+                }
+                else
+                {
+                    if (item.EnumeratorStack == null || item.EnumeratorStack.Count == 0)
+                    {
+                        ProxyStopCoroutine(ref coroutineList, item.Id);
+                    }
+                    else
+                    {
+                        item.Enumerator = item.EnumeratorStack.Pop();
+                    }
+                }
+            }
+        }
+    }
+    
+    /// <summary>
+    /// 代理协程, 开启一个协程, 返回协程 id, 协程是在普通帧执行的, 支持: 协程嵌套, WaitForSeconds, WaitForFixedProcess
+    /// </summary>
+    public static long ProxyStartCoroutine(ref List<CoroutineData> coroutineList, IEnumerator able)
+    {
+        if (coroutineList == null)
+        {
+            coroutineList = new List<CoroutineData>();
+        }
+
+        var data = new CoroutineData(able);
+        coroutineList.Add(data);
+        return data.Id;
+    }
+
+    /// <summary>
+    /// 代理协程, 根据协程 id 停止协程
+    /// </summary>
+    public static void ProxyStopCoroutine(ref List<CoroutineData> coroutineList, long coroutineId)
+    {
+        if (coroutineList != null)
+        {
+            for (var i = 0; i < coroutineList.Count; i++)
+            {
+                var item = coroutineList[i];
+                if (item.Id == coroutineId)
+                {
+                    coroutineList.RemoveAt(i);
+                    return;
+                }
+            }
+        }
+    }
+    
+    /// <summary>
+    /// 代理协程, 停止所有协程
+    /// </summary>
+    public static void ProxyStopAllCoroutine(ref List<CoroutineData> coroutineList)
+    {
+        if (coroutineList != null)
+        {
+            coroutineList.Clear();
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/generator/ResourcePathGenerator.cs b/DungeonShooting_Godot/src/framework/generator/ResourcePathGenerator.cs
index 0958ed4..dd4dfde 100644
--- a/DungeonShooting_Godot/src/framework/generator/ResourcePathGenerator.cs
+++ b/DungeonShooting_Godot/src/framework/generator/ResourcePathGenerator.cs
@@ -1,4 +1,5 @@
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -19,49 +20,58 @@
     //排除第一层的文件夹
     private static string[] exclude =
     {
-        ".vscode", ".idea", ".git", ".import", ".mono", "android", "addons", ".godot"
+        ".vscode", ".idea", ".git", ".import", ".mono", "android", "addons", ".godot", ".vs"
     };
-    private static string currDir = System.Environment.CurrentDirectory;
 
     private static string resultStr = "";
 
     //保存路径
-    public static string savePath = "src/game/manager/ResourcePath.cs";
+    private static string savePath = "src/game/manager/ResourcePath.cs";
 
     /// <summary>
-    /// 执行生成操作
+    /// 执行生成操作, 返回是否执行成功
     /// </summary>
-    public static void Generate()
+    public static bool Generate()
     {
-        resultStr = "/// <summary>\n" +
-                    "/// 编辑器下所有资源路径, 该类为 Automation 面板下自动生成的, 请不要手动编辑!\n" +
-                    "/// </summary>\n" +
-                    "public class ResourcePath\n" +
-                    "{\n";
-
-        GD.Print("更新 ResourcePath...");
-
-        var directoryInfo = new DirectoryInfo(currDir);
-
-        var directories = directoryInfo.GetDirectories();
-        for (int i = 0; i < directories.Length; i++)
+        try
         {
-            var directory = directories[i];
-            if (!exclude.Contains(directory.Name))
+            resultStr = "/// <summary>\n" +
+                        "/// 编辑器下所有资源路径, 该类为 Automation 面板下自动生成的, 请不要手动编辑!\n" +
+                        "/// </summary>\n" +
+                        "public class ResourcePath\n" +
+                        "{\n";
+
+            GD.Print("更新 ResourcePath...");
+
+            var directoryInfo = new DirectoryInfo(System.Environment.CurrentDirectory);
+
+            var directories = directoryInfo.GetDirectories();
+            for (int i = 0; i < directories.Length; i++)
             {
-                EachDir(directory);
+                var directory = directories[i];
+                if (!exclude.Contains(directory.Name))
+                {
+                    EachDir(directory);
+                }
             }
-        }
 
-        var fileInfos = directoryInfo.GetFiles();
-        for (var i = 0; i < fileInfos.Length; i++)
+            var fileInfos = directoryInfo.GetFiles();
+            for (var i = 0; i < fileInfos.Length; i++)
+            {
+                HandleFile(fileInfos[i]);
+            }
+
+            resultStr += "}";
+            File.WriteAllText(savePath, resultStr);
+            GD.Print("ResourcePath.cs 写出完成!");
+        }
+        catch (Exception e)
         {
-            HandleFile(fileInfos[i]);
+            GD.PrintErr(e.ToString());
+            return false;
         }
 
-        resultStr += "}";
-        File.WriteAllText(savePath, resultStr);
-        GD.Print("ResourcePath.cs 写出完成!");
+        return true;
     }
     
     private static void EachDir(DirectoryInfo directoryInfos)
@@ -83,12 +93,12 @@
     {
         if (suffix.Contains(fileInfo.Extension))
         {
-            var field = fileInfo.FullName.Substring(currDir.Length + 1);
+            var field = fileInfo.FullName.Substring(System.Environment.CurrentDirectory.Length + 1);
             field = field.Replace("\\", "/");
             var resPath = "res://" + field;
             field = field.Replace(".", "_");
             field = field.Replace("/", "_");
-            field = Regex.Replace(field, "[^\\w_]", "");
+            field = Regex.Replace(field, "[^\\w]", "");
             resultStr += $"    public const string {field} = \"{resPath}\";\n";
         }
     }
diff --git a/DungeonShooting_Godot/src/framework/generator/RoomPackGenerator.cs b/DungeonShooting_Godot/src/framework/generator/RoomPackGenerator.cs
index ae872c9..510757f 100644
--- a/DungeonShooting_Godot/src/framework/generator/RoomPackGenerator.cs
+++ b/DungeonShooting_Godot/src/framework/generator/RoomPackGenerator.cs
@@ -13,105 +13,112 @@
 /// </summary>
 public static class RoomPackGenerator
 {
-	private static string currDir = System.Environment.CurrentDirectory;
-	
 	/// <summary>
-	/// 执行生成操作
+	/// 执行生成操作, 返回是否执行成功
 	/// </summary>
-    public static void Generate()
+    public static bool Generate()
     {
-        //地图路径
-		var tileDir = GameConfig.RoomTileDir;
-		//地图描述数据路径
-		var tileDataDir = GameConfig.RoomTileDataDir;
+	    try
+	    {
+		    //地图路径
+		    var tileDir = GameConfig.RoomTileDir;
+		    //地图描述数据路径
+		    var tileDataDir = GameConfig.RoomTileDataDir;
 		
-		var tileDirInfo = new DirectoryInfo(tileDir);
-		var tileDataDirInfo = new DirectoryInfo(tileDataDir);
+		    var tileDirInfo = new DirectoryInfo(tileDir);
+		    var tileDataDirInfo = new DirectoryInfo(tileDataDir);
 
-		//所有地图列表
-		var mapList = new HashSet<string>();
+		    //所有地图列表
+		    var mapList = new HashSet<string>();
 		
-		//收集所有名称
-		var fileDataInfos = tileDataDirInfo.GetFiles();
-		foreach (var fileInfo in fileDataInfos)
-		{
-			mapList.Add(RemoveExtension(fileInfo.Name));
-		}
-		//收集所有名称
-		var fileInfos = tileDirInfo.GetFiles();
-		foreach (var fileInfo in fileInfos)
-		{
-			if (fileInfo.Extension == ".tscn")
-			{
-				mapList.Add(RemoveExtension(fileInfo.Name));
-			}
-		}
+		    //收集所有名称
+		    var fileDataInfos = tileDataDirInfo.GetFiles();
+		    foreach (var fileInfo in fileDataInfos)
+		    {
+			    mapList.Add(RemoveExtension(fileInfo.Name));
+		    }
+		    //收集所有名称
+		    var fileInfos = tileDirInfo.GetFiles();
+		    foreach (var fileInfo in fileInfos)
+		    {
+			    if (fileInfo.Extension == ".tscn")
+			    {
+				    mapList.Add(RemoveExtension(fileInfo.Name));
+			    }
+		    }
 		
-		//剔除多余的 tile.json
-		var arrays = mapList.ToArray();
-		foreach (var item in arrays)
-		{
-			if (!File.Exists(tileDir + item + ".tscn"))
-			{
-				mapList.Remove(item);
-				var filePath = tileDataDir + item + ".json";
-				if (File.Exists(filePath))
-				{
-					GD.Print($"未找到'{tileDir + item}.tscn', 删除配置文件: {filePath}");
-					File.Delete(filePath);
-				}
-			}
-		}
+		    //剔除多余的 tile.json
+		    var arrays = mapList.ToArray();
+		    foreach (var item in arrays)
+		    {
+			    if (!File.Exists(tileDir + item + ".tscn"))
+			    {
+				    mapList.Remove(item);
+				    var filePath = tileDataDir + item + ".json";
+				    if (File.Exists(filePath))
+				    {
+					    GD.Print($"未找到'{tileDir + item}.tscn', 删除配置文件: {filePath}");
+					    File.Delete(filePath);
+				    }
+			    }
+		    }
 
-		//手动生成缺失的 tile.json
-		foreach (var item in mapList)
-		{
-			if (!File.Exists(tileDataDir + item + ".json"))
-			{
-				var tscnName = tileDir + item + ".tscn";
-				var packedScene = ResourceManager.Load<PackedScene>(tscnName, false);
-				if (packedScene != null)
-				{
-					var dungeonRoomTemplate = packedScene.Instantiate<DungeonRoomTemplate>();
-					var usedRect = dungeonRoomTemplate.GetUsedRect();
-					var dungeonTile = new DungeonTile(dungeonRoomTemplate);
-					dungeonTile.SetFloorAtlasCoords(new List<Vector2I>() { new Vector2I(0, 8) });
-					//计算导航网格
-					dungeonTile.GenerateNavigationPolygon(0);
-					var polygonData = dungeonTile.GetPolygonData();
-					DungeonRoomTemplate.SaveConfig(new List<DoorAreaInfo>(), usedRect.Position, usedRect.Size, polygonData.ToList(), item);
-					dungeonRoomTemplate.QueueFree();
-				}
-			}
-		}
+		    //手动生成缺失的 tile.json
+		    foreach (var item in mapList)
+		    {
+			    if (!File.Exists(tileDataDir + item + ".json"))
+			    {
+				    var tscnName = tileDir + item + ".tscn";
+				    var packedScene = ResourceManager.Load<PackedScene>(tscnName, false);
+				    if (packedScene != null)
+				    {
+					    var dungeonRoomTemplate = packedScene.Instantiate<DungeonRoomTemplate>();
+					    var usedRect = dungeonRoomTemplate.GetUsedRect();
+					    var dungeonTile = new DungeonTile(dungeonRoomTemplate);
+					    dungeonTile.SetFloorAtlasCoords(new List<Vector2I>() { new Vector2I(0, 8) });
+					    //计算导航网格
+					    dungeonTile.GenerateNavigationPolygon(0);
+					    var polygonData = dungeonTile.GetPolygonData();
+					    DungeonRoomTemplate.SaveConfig(new List<DoorAreaInfo>(), usedRect.Position, usedRect.Size, polygonData.ToList(), item);
+					    dungeonRoomTemplate.QueueFree();
+				    }
+			    }
+		    }
 
-		var list = new List<DungeonRoomSplit>();
-		//整合操作
-		foreach (var item in mapList)
-		{
-			var configPath = tileDataDir + item + ".json";
-			var configText = File.ReadAllText(configPath);
-			var roomInfo = DungeonRoomTemplate.DeserializeDungeonRoomInfo(configText);
-			var split = new DungeonRoomSplit();
-			split.ScenePath = ToResPath(tileDir + item + ".tscn");
-			split.ConfigPath = ToResPath(configPath);
-			split.RoomInfo = roomInfo;
-			list.Add(split);
-		}
+		    var list = new List<DungeonRoomSplit>();
+		    //整合操作
+		    foreach (var item in mapList)
+		    {
+			    var configPath = tileDataDir + item + ".json";
+			    var configText = File.ReadAllText(configPath);
+			    var roomInfo = DungeonRoomTemplate.DeserializeDungeonRoomInfo(configText);
+			    var split = new DungeonRoomSplit();
+			    split.ScenePath = ToResPath(tileDir + item + ".tscn");
+			    split.ConfigPath = ToResPath(configPath);
+			    split.RoomInfo = roomInfo;
+			    list.Add(split);
+		    }
 
-		//写出配置
-		var config = new JsonSerializerOptions();
-		config.WriteIndented = true;
-		var text = JsonSerializer.Serialize(list, config);
-		File.WriteAllText(GameConfig.RoomTileConfigFile, text);
+		    //写出配置
+		    var config = new JsonSerializerOptions();
+		    config.WriteIndented = true;
+		    var text = JsonSerializer.Serialize(list, config);
+		    File.WriteAllText(GameConfig.RoomTileConfigFile, text);
 
-		GD.Print("地牢房间配置, 重新打包完成!");
+		    GD.Print("地牢房间配置, 重新打包完成!");
+	    }
+	    catch (Exception e)
+	    {
+		    GD.PrintErr(e.ToString());
+		    return false;
+	    }
+
+	    return true;
     }
     
     private static string ToResPath(string path)
     {
-	    var field = path.Substring(currDir.Length + 1);
-	    field = field.Replace("\\", "/");
+	    var field = path.Replace("\\", "/");
 	    return "res://" + field;
     }
 
diff --git a/DungeonShooting_Godot/src/framework/generator/UiGenerator.cs b/DungeonShooting_Godot/src/framework/generator/UiGenerator.cs
index decc0ad..23c24a8 100644
--- a/DungeonShooting_Godot/src/framework/generator/UiGenerator.cs
+++ b/DungeonShooting_Godot/src/framework/generator/UiGenerator.cs
@@ -1,4 +1,5 @@
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -11,41 +12,148 @@
 /// </summary>
 public static class UiGenerator
 {
-    private static int _nodeIndex = 0;
+    private static Dictionary<string, int> _nodeNameMap = new Dictionary<string, int>();
+
+    /// <summary>
+    /// 根据名称在编辑器中创建Ui, open 表示创建完成后是否在编辑器中打开这个ui
+    /// </summary>
+    public static bool CreateUi(string uiName, bool open = false)
+    {
+        try
+        {
+            //创建脚本代码
+            var scriptPath = GameConfig.UiCodeDir + uiName.FirstToLower();
+            var scriptFile = scriptPath + "/" + uiName + "Panel.cs";
+            var scriptCode = $"using Godot;\n" +
+                             $"\n" +
+                             $"namespace UI.{uiName};\n" +
+                             $"\n" +
+                             $"public partial class {uiName}Panel : {uiName}\n" +
+                             $"{{\n" +
+                             $"\n" +
+                             $"    public override void OnShowUi(params object[] args)\n" +
+                             $"    {{\n" +
+                             $"        \n" +
+                             $"    }}\n" +
+                             $"\n" +
+                             $"    public override void OnHideUi()\n" +
+                             $"    {{\n" +
+                             $"        \n" +
+                             $"    }}\n" +
+                             $"\n" +
+                             $"}}\n";
+            if (!Directory.Exists(scriptPath))
+            {
+                Directory.CreateDirectory(scriptPath);
+            }
+            File.WriteAllText(scriptFile, scriptCode);
+
+            //加载脚本资源
+            var scriptRes = GD.Load<CSharpScript>("res://" + scriptFile);
+
+            //创建场景资源
+            var prefabFile = GameConfig.UiPrefabDir + uiName + ".tscn";
+            var prefabResPath = "res://" + prefabFile;
+            if (!Directory.Exists(GameConfig.UiPrefabDir))
+            {
+                Directory.CreateDirectory(GameConfig.UiPrefabDir);
+            }
+            var uiNode = new Control();
+            uiNode.Name = uiName;
+            uiNode.SetAnchorsPreset(Control.LayoutPreset.FullRect, true);
+            uiNode.SetScript(scriptRes);
+            var scene = new PackedScene();
+            scene.Pack(uiNode);
+            ResourceSaver.Save(scene, prefabResPath);
+            
+            //生成Ui结构代码
+            GenerateUiCode(uiNode, scriptPath + "/" + uiName + ".cs");
+
+            //生成 ResourcePath.cs 代码
+            ResourcePathGenerator.Generate();
+            
+            //生成 UiManager_Methods.cs 代码
+            UiManagerMethodsGenerator.Generate();
+#if TOOLS
+            //打开ui
+            if (open)
+            {
+                Plugin.Plugin.Instance.GetEditorInterface().OpenSceneFromPath(prefabResPath);
+            }   
+#endif
+        }
+        catch (Exception e)
+        {
+            GD.PrintErr(e.ToString());
+            return false;
+        }
+
+        return true;
+    }
 
     /// <summary>
     /// 根据指定ui节点生成相应的Ui类, 并保存到指定路径下
     /// </summary>
-    public static void GenerateUi(Control control, string path)
+    public static void GenerateUiCode(Node control, string path)
     {
-        _nodeIndex = 0;
+        _nodeNameMap.Clear();
         var uiNode = EachNode(control);
         var code = GenerateClassCode(uiNode);
         File.WriteAllText(path, code);
     }
 
-    private static string GenerateClassCode(UiNode uiNode)
+    /// <summary>
+    /// 从编辑器中生成ui代码
+    /// </summary>
+    public static bool GenerateUiCodeFromEditor(Node control)
     {
-        return $"namespace UI.{uiNode.OriginName};\n\n" +
+        try
+        {
+            _nodeNameMap.Clear();
+        
+            var uiName = control.Name.ToString();
+            var path = GameConfig.UiCodeDir + uiName.FirstToLower() + "/" + uiName + ".cs";
+            GD.Print("重新生成ui代码: " + path);
+
+            var uiNode = EachNodeFromEditor(control);
+            var code = GenerateClassCode(uiNode);
+            File.WriteAllText(path, code);
+        }
+        catch (Exception e)
+        {
+            GD.PrintErr(e.ToString());
+            return false;
+        }
+
+        return true;
+    }
+
+    private static string GenerateClassCode(UiNodeInfo uiNodeInfo)
+    {
+        return $"namespace UI.{uiNodeInfo.OriginName};\n\n" +
                $"/// <summary>\n" + 
                $"/// Ui代码, 该类是根据ui场景自动生成的, 请不要手动编辑该类, 以免造成代码丢失\n" + 
                $"/// </summary>\n" + 
-               $"public abstract partial class {uiNode.OriginName} : UiBase\n" +
+               $"public abstract partial class {uiNodeInfo.OriginName} : UiBase\n" +
                $"{{\n" +
-               GeneratePropertyListClassCode("", uiNode.OriginName + ".", uiNode, "    ") +
-               $"\n\n" +
-               GenerateAllChildrenClassCode(uiNode.OriginName + ".", uiNode, "    ") +
+               GeneratePropertyListClassCode("", uiNodeInfo.OriginName + ".", uiNodeInfo, "    ") +
+               $"\n" +
+               $"    public {uiNodeInfo.OriginName}() : base(nameof({uiNodeInfo.OriginName}))\n" +
+               $"    {{\n" +
+               $"    }}\n" +
+               $"\n" +
+               GenerateAllChildrenClassCode(uiNodeInfo.OriginName + ".", uiNodeInfo, "    ") +
                $"}}\n";
     }
 
-    private static string GenerateAllChildrenClassCode(string parent, UiNode uiNode, string retraction)
+    private static string GenerateAllChildrenClassCode(string parent, UiNodeInfo uiNodeInfo, string retraction)
     {
         var str = "";
-        if (uiNode.Children != null)
+        if (uiNodeInfo.Children != null)
         {
-            for (var i = 0; i < uiNode.Children.Count; i++)
+            for (var i = 0; i < uiNodeInfo.Children.Count; i++)
             {
-                var item = uiNode.Children[i];
+                var item = uiNodeInfo.Children[i];
                 str += GenerateAllChildrenClassCode(parent + item.OriginName + ".", item, retraction);
                 str += GenerateChildrenClassCode(parent, item, retraction);
             }
@@ -54,31 +162,27 @@
         return str;
     }
     
-    private static string GenerateChildrenClassCode(string parent, UiNode uiNode, string retraction)
+    private static string GenerateChildrenClassCode(string parent, UiNodeInfo uiNodeInfo, string retraction)
     {
         return retraction + $"/// <summary>\n" + 
-               retraction + $"/// 类型: <see cref=\"{uiNode.TypeName}\"/>, 路径: {parent}{uiNode.OriginName}\n" + 
+               retraction + $"/// 类型: <see cref=\"{uiNodeInfo.TypeName}\"/>, 路径: {parent}{uiNodeInfo.OriginName}\n" + 
                retraction + $"/// </summary>\n" + 
-               retraction + $"public class {uiNode.ClassName}\n" +
+               retraction + $"public class {uiNodeInfo.ClassName} : IUiNode<{uiNodeInfo.TypeName}, {uiNodeInfo.ClassName}>\n" +
                retraction + $"{{\n" +
-               retraction + $"    /// <summary>\n" +
-               retraction + $"    /// Ui节点实例, 节点类型: <see cref=\"{uiNode.TypeName}\"/>, 节点路径: {parent}{uiNode.OriginName}\n" +
-               retraction + $"    /// </summary>\n" +
-               retraction + $"    public {uiNode.TypeName} Instance {{ get; }}\n\n" +
-               GeneratePropertyListClassCode("Instance.", parent, uiNode, retraction + "    ") + 
-               retraction + $"    public {uiNode.ClassName}({uiNode.TypeName} node) => Instance = node;\n" +
-               retraction + $"    public {uiNode.ClassName} Clone() => new (({uiNode.TypeName})Instance.Duplicate());\n" +
+               GeneratePropertyListClassCode("Instance.", parent, uiNodeInfo, retraction + "    ") + 
+               retraction + $"    public {uiNodeInfo.ClassName}({uiNodeInfo.TypeName} node) : base(node) {{  }}\n" +
+               retraction + $"    public override {uiNodeInfo.ClassName} Clone() => new (({uiNodeInfo.TypeName})Instance.Duplicate());\n" +
                retraction + $"}}\n\n";
     }
 
-    private static string GeneratePropertyListClassCode(string target, string parent, UiNode uiNode, string retraction)
+    private static string GeneratePropertyListClassCode(string target, string parent, UiNodeInfo uiNodeInfo, string retraction)
     {
         var str = "";
-        if (uiNode.Children != null)
+        if (uiNodeInfo.Children != null)
         {
-            for (var i = 0; i < uiNode.Children.Count; i++)
+            for (var i = 0; i < uiNodeInfo.Children.Count; i++)
             {
-                var item = uiNode.Children[i];
+                var item = uiNodeInfo.Children[i];
                 str += GeneratePropertyCode(target, parent, item, retraction);
             }
         }
@@ -86,26 +190,43 @@
         return str;
     }
     
-    private static string GeneratePropertyCode(string target, string parent, UiNode uiNode, string retraction)
+    private static string GeneratePropertyCode(string target, string parent, UiNodeInfo uiNodeInfo, string retraction)
     {
         return retraction + $"/// <summary>\n" + 
-               retraction + $"/// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref=\"{uiNode.TypeName}\"/>, 节点路径: {parent}{uiNode.OriginName}\n" + 
+               retraction + $"/// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref=\"{uiNodeInfo.TypeName}\"/>, 节点路径: {parent}{uiNodeInfo.OriginName}\n" + 
                retraction + $"/// </summary>\n" + 
-               retraction + $"public {uiNode.ClassName} {uiNode.Name}\n" +
+               retraction + $"public {uiNodeInfo.ClassName} {uiNodeInfo.Name}\n" +
                retraction + $"{{\n" + 
                retraction + $"    get\n" + 
                retraction + $"    {{\n" + 
-               retraction + $"        if (_{uiNode.Name} == null) _{uiNode.Name} = new {uiNode.ClassName}({target}GetNode<{uiNode.TypeName}>(\"{uiNode.OriginName}\"));\n" + 
-               retraction + $"        return _{uiNode.Name};\n" + 
+               retraction + $"        if (_{uiNodeInfo.Name} == null) _{uiNodeInfo.Name} = new {uiNodeInfo.ClassName}({target}GetNodeOrNull<{uiNodeInfo.TypeName}>(\"{uiNodeInfo.OriginName}\"));\n" + 
+               retraction + $"        return _{uiNodeInfo.Name};\n" + 
                retraction + $"    }}\n" + 
                retraction + $"}}\n" +
-               retraction + $"private {uiNode.ClassName} _{uiNode.Name};\n\n";
+               retraction + $"private {uiNodeInfo.ClassName} _{uiNodeInfo.Name};\n\n";
     }
     
-    private static UiNode EachNode(Node node)
+    /// <summary>
+    /// 递归解析节点, 并生成 UiNodeInfo 数据
+    /// </summary>
+    private static UiNodeInfo EachNode(Node node)
     {
-        var name = Regex.Replace(node.Name, "[^\\w_]", "");
-        var uiNode = new UiNode("L_" + name, name, "UiNode" + (_nodeIndex++) + "_" + name, node.GetType().FullName);
+        var originName = Regex.Replace(node.Name, "[^\\w]", "");
+        //类定义该图层的类名
+        string className;
+        if (_nodeNameMap.ContainsKey(originName)) //有同名图层, 为了防止类名冲突, 需要在 UiNode 后面加上索引
+        {
+            var count = _nodeNameMap[originName];
+            className = "UiNode" + (count) + "_" + originName;
+            _nodeNameMap[originName] = count + 1;
+        }
+        else
+        {
+            className = "UiNode" + "_" + originName;
+            _nodeNameMap.Add(originName, 1);
+        }
+        
+        var uiNode = new UiNodeInfo("L_" + originName, originName, className, node.GetType().FullName);
 
         var childCount = node.GetChildCount();
         if (childCount > 0)
@@ -117,7 +238,7 @@
                 {
                     if (uiNode.Children == null)
                     {
-                        uiNode.Children = new List<UiNode>();
+                        uiNode.Children = new List<UiNodeInfo>();
                     }
 
                     uiNode.Children.Add(EachNode(children));
@@ -128,15 +249,82 @@
         return uiNode;
     }
 
-    private class UiNode
+    /// <summary>
+    /// 在编辑器下递归解析节点, 由于编辑器下绑定用户脚本的节点无法直接判断节点类型, 那么就只能获取节点的脚本然后解析名称和命名空间
+    /// </summary>
+    private static UiNodeInfo EachNodeFromEditor(Node node)
+    {
+        UiNodeInfo uiNode;
+        //原名称
+        var originName = Regex.Replace(node.Name, "[^\\w]", "");
+        //字段名称
+        var fieldName = "L_" + originName;
+        //类定义该图层的类名
+        string className;
+        if (_nodeNameMap.ContainsKey(originName)) //有同名图层, 为了防止类名冲突, 需要在 UiNode 后面加上索引
+        {
+            var count = _nodeNameMap[originName];
+            className = "UiNode" + (count) + "_" + originName;
+            _nodeNameMap[originName] = count + 1;
+        }
+        else
+        {
+            className = "UiNode" + "_" + originName;
+            _nodeNameMap.Add(originName, 1);
+        }
+
+        var script = node.GetScript().As<CSharpScript>();
+        if (script == null) //无脚本, 说明是内置节点
+        {
+            uiNode = new UiNodeInfo(fieldName, originName, className, node.GetType().FullName);
+        }
+        else //存在脚本
+        {
+            var index = script.ResourcePath.LastIndexOf("/", StringComparison.Ordinal);
+            //文件名称
+            var fileName = script.ResourcePath.Substring(index + 1, script.ResourcePath.Length - index - 3 - 1);
+            //在源代码中寻找命名空间
+            var match = Regex.Match(script.SourceCode, "(?<=namespace\\s+)[\\w\\.]+");
+            if (match.Success) //存在命名空间
+            {
+                uiNode = new UiNodeInfo(fieldName, originName, className, match.Value + "." + fileName);
+            }
+            else //不存在命名空间
+            {
+                uiNode = new UiNodeInfo(fieldName, originName, className, fileName);
+            }
+        }
+        
+        var childCount = node.GetChildCount();
+        if (childCount > 0)
+        {
+            for (var i = 0; i < childCount; i++)
+            {
+                var children = node.GetChild(i);
+                if (children != null)
+                {
+                    if (uiNode.Children == null)
+                    {
+                        uiNode.Children = new List<UiNodeInfo>();
+                    }
+
+                    uiNode.Children.Add(EachNodeFromEditor(children));
+                }
+            }
+        }
+        
+        return uiNode;
+    }
+
+    private class UiNodeInfo
     {
         public string Name;
         public string OriginName;
         public string ClassName;
         public string TypeName;
-        public List<UiNode> Children;
+        public List<UiNodeInfo> Children;
 
-        public UiNode(string name, string originName, string className, string typeName)
+        public UiNodeInfo(string name, string originName, string className, string typeName)
         {
             Name = name;
             OriginName = originName;
diff --git a/DungeonShooting_Godot/src/framework/generator/UiManagerMethodsGenerator.cs b/DungeonShooting_Godot/src/framework/generator/UiManagerMethodsGenerator.cs
new file mode 100644
index 0000000..7634384
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/generator/UiManagerMethodsGenerator.cs
@@ -0,0 +1,82 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using Godot;
+
+namespace Generator;
+
+/// <summary>
+/// 生成 UiManager 中打开Ui相关的函数代码
+/// </summary>
+public static class UiManagerMethodsGenerator
+{
+    private static string savePath = "src/game/manager/UiManager_Methods.cs";
+
+    /// <summary>
+    /// 执行生成操作, 并返回执行结果
+    /// </summary>
+    public static bool Generate()
+    {
+        //扫描所有ui
+        if (!Directory.Exists(GameConfig.UiPrefabDir))
+        {
+            return true;
+        }
+
+        try
+        {
+            var directoryInfo = new DirectoryInfo(GameConfig.UiPrefabDir);
+            var fileInfos = directoryInfo.GetFiles();
+
+            var code = $"/**\n" +
+                       $" * 该类为自动生成的, 请不要手动编辑, 以免造成代码丢失\n" +
+                       $" */\n" +
+                       $"public static partial class UiManager\n" +
+                       $"{{\n" +
+                       $"\n";
+
+            var uiNameClass = $"    public static class UiName\n" +
+                              $"    {{\n";
+            var methodClass = "";
+
+            foreach (var fileInfo in fileInfos)
+            {
+                if (fileInfo.Extension == ".tscn")
+                {
+                    var uiName = fileInfo.Name.Substring(0, fileInfo.Name.Length - 5);
+                    uiNameClass += $"        public const string {uiName} = \"{uiName}\";\n";
+                    methodClass += $"    /// <summary>\n" +
+                                   $"    /// 打开 {uiName}, 并返回UI实例\n" +
+                                   $"    /// </summary>\n" +
+                                   $"    public static UI.{uiName}.{uiName}Panel Open_{uiName}()\n" +
+                                   $"    {{\n" +
+                                   $"        return OpenUi<UI.{uiName}.{uiName}Panel>(UiName.{uiName});\n" +
+                                   $"    }}\n" +
+                                   $"\n" +
+                                   $"    /// <summary>\n" +
+                                   $"    /// 获取所有 {uiName} 的实例, 如果没有实例, 则返回一个空数组\n" +
+                                   $"    /// </summary>\n" +
+                                   $"    public static UI.{uiName}.{uiName}Panel[] Get_{uiName}_Instance()\n" +
+                                   $"    {{\n" +
+                                   $"        return GetUiInstance<UI.{uiName}.{uiName}Panel>(nameof(UI.{uiName}.{uiName}));\n" +
+                                   $"    }}\n" +
+                                   $"\n";
+                }
+            }
+            uiNameClass += $"    }}\n\n";
+
+            code += uiNameClass;
+            code += methodClass;
+            code += $"}}\n";
+
+            File.WriteAllText(savePath, code);
+        }
+        catch (Exception e)
+        {
+            GD.PrintErr(e.ToString());
+            return false;
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/ui/IUiNode.cs b/DungeonShooting_Godot/src/framework/ui/IUiNode.cs
new file mode 100644
index 0000000..2d7ce1c
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/ui/IUiNode.cs
@@ -0,0 +1,47 @@
+
+using Godot;
+
+/// <summary>
+/// Ui节点代码接口
+/// </summary>
+/// <typeparam name="TNodeType">Godot中的节点类型</typeparam>
+/// <typeparam name="TCloneType">克隆该对象返回的类型</typeparam>
+public abstract class IUiNode<TNodeType, TCloneType> where TNodeType : Node
+{
+    /// <summary>
+    /// Godot节点实例
+    /// </summary>
+    public TNodeType Instance { get; }
+    /// <summary>
+    /// 克隆当前对象, 并返回新的对象,
+    /// 注意: 如果子节点改名或者移动层级, 那么有可能对导致属性中的子节点无法访问
+    /// </summary>
+    public abstract TCloneType Clone();
+
+    public IUiNode(TNodeType node)
+    {
+        Instance = node;
+    }
+    
+    /// <summary>
+    /// 嵌套打开子ui
+    /// </summary>
+    public UiBase OpenNestedUi(string uiName, params object[] args)
+    {
+        var packedScene = ResourceManager.Load<PackedScene>("res://" + GameConfig.UiPrefabDir + uiName + ".tscn");
+        var uiBase = packedScene.Instantiate<UiBase>();
+        Instance.AddChild(uiBase);
+        
+        uiBase.OnCreateUi();
+        uiBase.ShowUi(args);
+        return uiBase;
+    }
+    
+    /// <summary>
+    /// 嵌套打开子ui
+    /// </summary>
+    public T OpenNestedUi<T>(string uiName) where T : UiBase
+    {
+        return (T)OpenNestedUi(uiName);
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/ui/UiBase.cs b/DungeonShooting_Godot/src/framework/ui/UiBase.cs
index d3e50ef..de19aca 100644
--- a/DungeonShooting_Godot/src/framework/ui/UiBase.cs
+++ b/DungeonShooting_Godot/src/framework/ui/UiBase.cs
@@ -1,9 +1,11 @@
-
+using System.Collections;
+using System.Collections.Generic;
 using Godot;
 
 /// <summary>
 /// Ui 基类
 /// </summary>
+[Tool]
 public abstract partial class UiBase : Control
 {
     /// <summary>
@@ -25,26 +27,141 @@
     public bool KeepOut = false;
 
     /// <summary>
+    /// ui名称
+    /// </summary>
+    public string UiName { get; } 
+    
+    /// <summary>
+    /// 是否已经打开ui
+    /// </summary>
+    public bool IsOpen { get; private set; } = false;
+    
+    /// <summary>
+    /// 是否已经销毁
+    /// </summary>
+    public bool IsDisposed { get; private set; } = false;
+
+    //开启的协程
+    private List<CoroutineData> _coroutineList;
+    
+    public UiBase(string uiName)
+    {
+        UiName = uiName;
+        //记录ui打开
+        UiManager.RecordUi(this, UiManager.RecordType.Open);
+    }
+    
+    /// <summary>
     /// 创建当前ui时调用
     /// </summary>
-    public virtual void OnCreate()
+    public virtual void OnCreateUi()
     {
     }
     
     /// <summary>
-    /// 当前ui打开时调用，并接收参数
+    /// 当前ui显示时调用，并接收参数
     /// </summary>
-    public abstract void OnOpen(params object[] args);
+    public abstract void OnShowUi(params object[] args);
 
     /// <summary>
-    /// 当前ui关闭时调用
+    /// 当前ui隐藏时调用
     /// </summary>
-    public abstract void OnClose();
+    public abstract void OnHideUi();
 
     /// <summary>
     /// 销毁当前ui时调用
     /// </summary>
-    public virtual void OnDispose()
+    public virtual void OnDisposeUi()
     {
     }
+
+    /// <summary>
+    /// 每帧调用一次
+    /// </summary>
+    public virtual void Process(float delta)
+    {
+    }
+
+    /// <summary>
+    /// 显示ui, 并传入参数
+    /// </summary>
+    public void ShowUi(params object[] args)
+    {
+        if (IsOpen)
+        {
+            return;
+        }
+
+        IsOpen = true;
+        Visible = true;
+        OnShowUi(args);
+    }
+    
+    /// <summary>
+    /// 隐藏ui
+    /// </summary>
+    public void HideUi()
+    {
+        if (!IsOpen)
+        {
+            return;
+        }
+
+        IsOpen = false;
+        Visible = false;
+        OnHideUi();
+    }
+
+    /// <summary>
+    /// 关闭并销毁ui
+    /// </summary>
+    public void DisposeUi()
+    {
+        if (IsDisposed)
+        {
+            return;
+        }
+        //记录ui关闭
+        UiManager.RecordUi(this, UiManager.RecordType.Close);
+        HideUi();
+        IsDisposed = true;
+        OnDisposeUi();
+        QueueFree();
+    }
+
+    public sealed override void _Process(double delta)
+    {
+        var newDelta = (float)delta;
+        Process(newDelta);
+        
+        //协程更新
+        if (_coroutineList != null)
+        {
+            ProxyCoroutineHandler.ProxyUpdateCoroutine(ref _coroutineList, newDelta);
+        }
+    }
+
+    /// <summary>
+    /// 开启一个协程, 返回协程 id, 协程是在普通帧执行的, 支持: 协程嵌套, WaitForSeconds, WaitForFixedProcess
+    /// </summary>
+    public long StartCoroutine(IEnumerator able)
+    {
+        return ProxyCoroutineHandler.ProxyStartCoroutine(ref _coroutineList, able);
+    }
+
+    /// <summary>
+    /// 根据协程 id 停止协程
+    /// </summary>
+    public void StopCoroutine(long coroutineId)
+    {
+        ProxyCoroutineHandler.ProxyStopCoroutine(ref _coroutineList, coroutineId);
+    }
+    
+    /// <summary>
+    /// 停止所有协程
+    /// </summary>
+    public void StopAllCoroutine()
+    {
+        ProxyCoroutineHandler.ProxyStopAllCoroutine(ref _coroutineList);
+    }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/ui/UiManager.cs b/DungeonShooting_Godot/src/framework/ui/UiManager.cs
index 0141236..c3b86f1 100644
--- a/DungeonShooting_Godot/src/framework/ui/UiManager.cs
+++ b/DungeonShooting_Godot/src/framework/ui/UiManager.cs
@@ -1,5 +1,4 @@
-
-using System;
+using System.Collections.Generic;
 using Godot;
 
 /// <summary>
@@ -7,13 +6,21 @@
 /// </summary>
 public static partial class UiManager
 {
+    public enum RecordType
+    {
+        Open,
+        Close,
+    }
+    
     private static bool _init = false;
 
     private static CanvasLayer _bottomLayer;
     private static CanvasLayer _middleLayer;
     private static CanvasLayer _heightLayer;
     private static CanvasLayer _popLayer;
-    
+
+    private static Dictionary<string, List<UiBase>> _recordUiMap = new Dictionary<string, List<UiBase>>();
+
     public static void Init()
     {
         if (_init)
@@ -50,6 +57,9 @@
         GameApplication.Instance.AddChild(_popLayer);
     }
 
+    /// <summary>
+    /// 获取指定的Ui层根节点
+    /// </summary>
     public static CanvasLayer GetUiLayer(UiLayer uiLayer)
     {
         switch (uiLayer)
@@ -66,20 +76,83 @@
 
         return null;
     }
-    
-    public static UiBase OpenUi(string resourcePath)
+
+    /// <summary>
+    /// 记录ui的创建或者销毁
+    /// </summary>
+    public static void RecordUi(UiBase uiBase, RecordType type)
     {
-        var packedScene = ResourceManager.Load<PackedScene>(resourcePath);
+        if (type == RecordType.Open)
+        {
+            if (_recordUiMap.TryGetValue(uiBase.UiName, out var list))
+            {
+                list.Add(uiBase);
+            }
+            else
+            {
+                list = new List<UiBase>();
+                list.Add(uiBase);
+                _recordUiMap.Add(uiBase.UiName, list);
+            }
+        }
+        else
+        {
+            if (_recordUiMap.TryGetValue(uiBase.UiName, out var list))
+            {
+                list.Remove(uiBase);
+                if (list.Count == 0)
+                {
+                    _recordUiMap.Remove(uiBase.UiName);
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// 根据Ui资源路径打开Ui, 并返回Ui实例, 该Ui资源的场景根节点必须继承<see cref="UiBase"/>
+    /// </summary>
+    public static UiBase OpenUi(string uiName, params object[] args)
+    {
+        var packedScene = ResourceManager.Load<PackedScene>("res://" + GameConfig.UiPrefabDir + uiName + ".tscn");
         var uiBase = packedScene.Instantiate<UiBase>();
         var canvasLayer = GetUiLayer(uiBase.Layer);
         canvasLayer.AddChild(uiBase);
-        uiBase.OnCreate();
-        uiBase.OnOpen();
+        uiBase.OnCreateUi();
+        uiBase.ShowUi(args);
         return uiBase;
     }
 
-    public static T OpenUi<T>(string resourcePath) where T : UiBase
+    /// <summary>
+    /// 根据Ui资源路径打开Ui, 并返回Ui实例, 该Ui资源的场景根节点必须继承<see cref="UiBase"/>
+    /// </summary>
+    public static T OpenUi<T>(string uiName, params object[] args) where T : UiBase
     {
-        return (T)OpenUi(resourcePath);
+        return (T)OpenUi(uiName, args);
+    }
+
+    /// <summary>
+    /// 销毁指定Ui
+    /// </summary>
+    public static void DisposeUi(UiBase uiBase)
+    {
+        uiBase.DisposeUi();
+    }
+
+    /// <summary>
+    /// 获取Ui实例
+    /// </summary>
+    public static T[] GetUiInstance<T>(string uiName) where T : UiBase
+    {
+        if (_recordUiMap.TryGetValue(uiName, out var list))
+        {
+            var result = new T[list.Count];
+            for (var i = 0; i < list.Count; i++)
+            {
+                result[i] = (T)list[i];
+            }
+            return result;
+        }
+
+        return new T[0];
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/ui/UiManager_Methods.cs b/DungeonShooting_Godot/src/framework/ui/UiManager_Methods.cs
deleted file mode 100644
index 1bb9e16..0000000
--- a/DungeonShooting_Godot/src/framework/ui/UiManager_Methods.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-using UI.RoomUI;
-
-public static partial class UiManager
-{
-    public static RoomUIPanel Open_RoomUI()
-    {
-        return OpenUi<RoomUIPanel>(ResourcePath.prefab_ui_RoomUI_tscn);
-    }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/Cursor.cs b/DungeonShooting_Godot/src/game/Cursor.cs
new file mode 100644
index 0000000..639c7cd
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/Cursor.cs
@@ -0,0 +1,115 @@
+using Godot;
+
+/// <summary>
+/// 鼠标指针
+/// </summary>
+public partial class Cursor : Node2D
+{
+    /// <summary>
+    /// 是否是GUI模式
+    /// </summary>
+    private bool _isGuiMode = true;
+
+    /// <summary>
+    /// 非GUI模式下鼠标指针所挂载的角色
+    /// </summary>
+    private Role _mountRole;
+
+    private Sprite2D center;
+    private Sprite2D lt;
+    private Sprite2D lb;
+    private Sprite2D rt;
+    private Sprite2D rb;
+    
+    public override void _Ready()
+    {
+        center = GetNode<Sprite2D>("Center");
+        lt = GetNode<Sprite2D>("LT");
+        lb = GetNode<Sprite2D>("LB");
+        rt = GetNode<Sprite2D>("RT");
+        rb = GetNode<Sprite2D>("RB");
+    }
+
+    public override void _Process(double delta)
+    {
+        if (_isGuiMode)
+        {
+            SetScope(0, null);
+        }
+        else
+        {
+            var targetGun = _mountRole?.Holster.ActiveWeapon;
+            if (targetGun != null)
+            {
+                SetScope(targetGun.CurrScatteringRange, targetGun);
+            }
+            else
+            {
+                SetScope(0, null);
+            }
+        }
+
+        SetCursorPos();
+    }
+
+    /// <summary>
+    /// 设置是否是Gui模式
+    /// </summary>
+    public void SetGuiMode(bool flag)
+    {
+        _isGuiMode = flag;
+    }
+    
+    /// <summary>
+    /// 获取是否是Gui模式
+    /// </summary>
+    public bool GetGuiMode()
+    {
+        return _isGuiMode;
+    }
+    
+    /// <summary>
+    /// 设置非GUI模式下鼠标指针所挂载的角色
+    /// </summary>
+    public void SetMountRole(Role role)
+    {
+        _mountRole = role;
+    }
+
+    /// <summary>
+    /// 获取非GUI模式下鼠标指针所挂载的角色
+    /// </summary>
+    public Role GetMountRole()
+    {
+        return _mountRole;
+    }
+
+    /// <summary>
+    /// 设置光标半径范围
+    /// </summary>
+    private void SetScope(float scope, Weapon targetGun)
+    {
+        if (targetGun != null)
+        {
+            var tunPos = GameApplication.Instance.ViewToGlobalPosition(targetGun.GlobalPosition);
+            var len = GlobalPosition.DistanceTo(tunPos);
+            if (targetGun.Attribute != null)
+            {
+                len = Mathf.Max(0, len - targetGun.Attribute.FirePosition.X);
+            }
+            scope = len / GameConfig.ScatteringDistance * scope;
+        }
+        scope = Mathf.Clamp(scope, 0, 192);
+        center.Visible = scope > 64;
+
+        lt.Position = new Vector2(-scope, -scope);
+        lb.Position = new Vector2(-scope, scope);
+        rt.Position = new Vector2(scope, -scope);
+        rb.Position = new Vector2(scope, scope);
+    }
+
+    private void SetCursorPos()
+    {
+        GlobalPosition = GetGlobalMousePosition();
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/GameApplication.cs b/DungeonShooting_Godot/src/game/GameApplication.cs
index 183c2bf..39f0116 100644
--- a/DungeonShooting_Godot/src/game/GameApplication.cs
+++ b/DungeonShooting_Godot/src/game/GameApplication.cs
@@ -65,15 +65,19 @@
 		Engine.MaxFps = 60;
 		//调试绘制开关
 		ActivityObject.IsDebug = Debug;
-		//Engine.TimeScale = 0.3f;
+		//Engine.TimeScale = 0.2f;
 
 		//初始化ui
 		UiManager.Init();
 		
 		// 初始化鼠标
 		Input.MouseMode = Input.MouseModeEnum.Hidden;
-		Cursor = ResourceManager.Load<PackedScene>(ResourcePath.prefab_ui_Cursor_tscn).Instantiate<Cursor>();
-		AddChild(Cursor);
+		Cursor = ResourceManager.Load<PackedScene>(ResourcePath.prefab_Cursor_tscn).Instantiate<Cursor>();
+		var cursorLayer = new CanvasLayer();
+		cursorLayer.Name = "CursorLayer";
+		cursorLayer.Layer = UiManager.GetUiLayer(UiLayer.Pop).Layer + 10;
+		AddChild(cursorLayer);
+		cursorLayer.AddChild(Cursor);
 
 		//打开ui
 		UiManager.Open_RoomUI();
diff --git a/DungeonShooting_Godot/src/game/GameConfig.cs b/DungeonShooting_Godot/src/game/GameConfig.cs
index 6ba7f2c..238deea 100644
--- a/DungeonShooting_Godot/src/game/GameConfig.cs
+++ b/DungeonShooting_Godot/src/game/GameConfig.cs
@@ -42,13 +42,21 @@
     /// <summary>
     /// 地图数据路径
     /// </summary>
-    public static readonly string RoomTileDir = System.Environment.CurrentDirectory + "/resource/map/tileMaps/";
+    public const string RoomTileDir = "resource/map/tileMaps/";
     /// <summary>
     /// 地图描述数据路径
     /// </summary>
-    public static readonly string RoomTileDataDir = System.Environment.CurrentDirectory + "/resource/map/tiledata/";
+    public const string RoomTileDataDir = "resource/map/tiledata/";
     /// <summary>
     /// 房间配置汇总数据路径
     /// </summary>
-    public static readonly string RoomTileConfigFile = System.Environment.CurrentDirectory + "/resource/map/RoomConfig.json";
+    public const string RoomTileConfigFile = "resource/map/RoomConfig.json";
+    /// <summary>
+    /// ui预制体路径
+    /// </summary>
+    public const string UiPrefabDir = "prefab/ui/";
+    /// <summary>
+    /// ui代码根路径
+    /// </summary>
+    public const string UiCodeDir = "src/game/ui/";
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/item/weapon/RegisterWeapon.cs b/DungeonShooting_Godot/src/game/item/weapon/RegisterWeapon.cs
index 0ee6aad..0a1ca23 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/RegisterWeapon.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/RegisterWeapon.cs
@@ -11,7 +11,7 @@
     /// </summary>
     private readonly WeaponAttribute _weaponAttribute;
     
-    public RegisterWeapon(string id, Type attribute) : base(id, null)
+    public RegisterWeapon(string itemId, Type attribute) : base(itemId, null)
     {
         _weaponAttribute = (WeaponAttribute)Activator.CreateInstance(attribute);
         if (_weaponAttribute != null) PrefabPath = _weaponAttribute.WeaponPrefab;
diff --git a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
index c15e166..8d24a04 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
@@ -192,6 +192,8 @@
         CurrAmmo = Attribute.AmmoCapacity;
         //剩余弹药量
         ResidueAmmo = Mathf.Min(Attribute.StandbyAmmoCapacity + CurrAmmo, Attribute.MaxAmmoCapacity) - CurrAmmo;
+        
+        ThrowCollisionSize = new Vector2(20, 15);
     }
 
     /// <summary>
@@ -928,9 +930,7 @@
                 //播放互动效果
                 if (flag)
                 {
-                    Throw(new Vector2(30, 15), GlobalPosition, 0, 0,
-                        Utils.RandomRangeInt(-20, 20), Utils.RandomRangeInt(20, 50),
-                        Utils.RandomRangeInt(-180, 180));
+                    Throw(GlobalPosition, 0, Utils.RandomRangeInt(20, 50), Vector2.Zero, Utils.RandomRangeInt(-180, 180));
                 }
             }
             else //没有武器
@@ -986,10 +986,10 @@
 
         var startHeight = 6;
         var direction = angle + Utils.RandomRangeInt(-20, 20);
-        var xf = 20;
+        var velocity = new Vector2(20, 0).Rotated(direction * Mathf.Pi / 180);
         var yf = Utils.RandomRangeInt(50, 70);
         var rotate = Utils.RandomRangeInt(-90, 90);
-        Throw(new Vector2(30, 15), startPosition, startHeight, direction, xf, yf, rotate, true);
+        Throw(startPosition, startHeight, yf, velocity, rotate);
     }
 
     protected override void OnThrowOver()
diff --git a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
index 0d9b41c..8a5ecc1 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
@@ -79,7 +79,7 @@
     /// </summary>
     public float StartFiringSpeed = 300;
     /// <summary>
-    /// 最终射速, 最终每分钟能开火次数
+    /// 最终射速, 最终每分钟能开火次数, 仅当 ContinuousShoot 为 true 时生效
     /// </summary>
     public float FinalFiringSpeed = 300;
     /// <summary>
diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
index acad95f..5a2c9f0 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
@@ -99,13 +99,14 @@
     protected override void OnFire()
     {
         //创建一个弹壳
+        var startPos = Master.GlobalPosition;
         var startHeight = 6;
         var direction = GlobalRotationDegrees + Utils.RandomRangeInt(-30, 30) + 180;
-        var xf = Utils.RandomRangeInt(20, 60);
-        var yf = Utils.RandomRangeInt(60, 120);
+        var verticalSpeed = Utils.RandomRangeInt(60, 120);
+        var velocity = new Vector2(Utils.RandomRangeInt(20, 60), 0).Rotated(direction * Mathf.Pi / 180);
         var rotate = Utils.RandomRangeInt(-720, 720);
-        var shell = ActivityObject.Create<ShellCase>(ActivityIdPrefix.Shell + "0001");;
-        shell.Throw(new Vector2(10, 5), Master.GlobalPosition, startHeight, direction, xf, yf, rotate, true);
+        var shell = Create<ShellCase>(ActivityIdPrefix.Shell + "0001");
+        shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate);
         
         if (Master == GameApplication.Instance.RoomManager.Player)
         {
diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
index 74183ad..7ee7c40 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
@@ -54,23 +54,23 @@
     /// </summary>
     public PackedScene ShellPack;
 
-    public override void _Ready()
+    public override void OnInit()
     {
-        base._Ready();
+        base.OnInit();
         ShellPack = ResourceManager.Load<PackedScene>(ResourcePath.prefab_weapon_shell_ShellCase_tscn);
     }
 
     protected override void OnFire()
     {
         //创建一个弹壳
-        var startPos = GlobalPosition + new Vector2(0, 5);
+        var startPos = Master.GlobalPosition;
         var startHeight = 6;
         var direction = GlobalRotationDegrees + Utils.RandomRangeInt(-30, 30) + 180;
-        var xf = Utils.RandomRangeInt(20, 60);
-        var yf = Utils.RandomRangeInt(60, 120);
+        var verticalSpeed = Utils.RandomRangeInt(60, 120);
+        var velocity = new Vector2(Utils.RandomRangeInt(20, 60), 0).Rotated(direction * Mathf.Pi / 180);
         var rotate = Utils.RandomRangeInt(-720, 720);
-        var shell = ActivityObject.Create<ShellCase>(ActivityIdPrefix.Shell + "0001");;
-        shell.Throw(new Vector2(5, 10), startPos, startHeight, direction, xf, yf, rotate, true);
+        var shell = Create<ShellCase>(ActivityIdPrefix.Shell + "0001");
+        shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate);
         
         if (Master == GameApplication.Instance.RoomManager.Player)
         {
diff --git a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs
index 5d329ac..3bd5f31 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs
@@ -37,9 +37,9 @@
     private Area2D _hitArea;
     private int _attackIndex = 0;
     
-    public override void _Ready()
+    public override void OnInit()
     {
-        base._Ready();
+        base.OnInit();
         
         _hitArea = GetNode<Area2D>("HitArea");
         _hitArea.Monitoring = false;
diff --git a/DungeonShooting_Godot/src/game/item/weapon/shell/ShellCase.cs b/DungeonShooting_Godot/src/game/item/weapon/shell/ShellCase.cs
index 58cd68e..24c56b8 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/shell/ShellCase.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/shell/ShellCase.cs
@@ -12,15 +12,18 @@
     /// </summary>
     public AnimationPlayer AnimationPlayer { get; private set; }
     
-    public override void _Ready()
+    public override void OnInit()
     {
+        base.OnInit();
         AnimationPlayer = GetNode<AnimationPlayer>("AnimationPlayer");
         ShadowOffset = new Vector2(0, 1);
+        ThrowCollisionSize = new Vector2(5, 5);
     }
 
     protected override void OnThrowOver()
     {
         //AwaitDestroy();
+        MoveController.SetAllForce(Vector2.Zero);
         AnimationPlayer.Play("flicker");
     }
 
diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
index c837b6c..ba1e64c 100644
--- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
+++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
@@ -3,6 +3,7 @@
 /// </summary>
 public class ResourcePath
 {
+    public const string prefab_Cursor_tscn = "res://prefab/Cursor.tscn";
     public const string prefab_FanCollisionShape_tscn = "res://prefab/FanCollisionShape.tscn";
     public const string prefab_effect_Blood_tscn = "res://prefab/effect/Blood.tscn";
     public const string prefab_effect_BulletDisappear_tscn = "res://prefab/effect/BulletDisappear.tscn";
@@ -15,7 +16,7 @@
     public const string prefab_role_Role_tscn = "res://prefab/role/Role.tscn";
     public const string prefab_test_MoveComponent_tscn = "res://prefab/test/MoveComponent.tscn";
     public const string prefab_test_TestActivity_tscn = "res://prefab/test/TestActivity.tscn";
-    public const string prefab_ui_Cursor_tscn = "res://prefab/ui/Cursor.tscn";
+    public const string prefab_ui_EditorTools_tscn = "res://prefab/ui/EditorTools.tscn";
     public const string prefab_ui_RoomUI_tscn = "res://prefab/ui/RoomUI.tscn";
     public const string prefab_weapon_Knife_tscn = "res://prefab/weapon/Knife.tscn";
     public const string prefab_weapon_Weapon_tscn = "res://prefab/weapon/Weapon.tscn";
@@ -239,6 +240,7 @@
     public const string resource_sprite_role_role9_png = "res://resource/sprite/role/role9.png";
     public const string resource_sprite_shell_shellCase_png = "res://resource/sprite/shell/shellCase.png";
     public const string resource_sprite_ui_Cursor_png = "res://resource/sprite/ui/Cursor.png";
+    public const string resource_sprite_ui_CursorCenter_png = "res://resource/sprite/ui/CursorCenter.png";
     public const string resource_sprite_ui_font_bg_png = "res://resource/sprite/ui/font_bg.png";
     public const string resource_sprite_ui_healthBar_png = "res://resource/sprite/ui/healthBar.png";
     public const string resource_sprite_ui_hpBar_png = "res://resource/sprite/ui/hpBar.png";
diff --git a/DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs b/DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs
new file mode 100644
index 0000000..91aaa92
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs
@@ -0,0 +1,45 @@
+/**
+ * 该类为自动生成的, 请不要手动编辑, 以免造成代码丢失
+ */
+public static partial class UiManager
+{
+
+    public static class UiName
+    {
+        public const string EditorTools = "EditorTools";
+        public const string RoomUI = "RoomUI";
+    }
+
+    /// <summary>
+    /// 打开 EditorTools, 并返回UI实例
+    /// </summary>
+    public static UI.EditorTools.EditorToolsPanel Open_EditorTools()
+    {
+        return OpenUi<UI.EditorTools.EditorToolsPanel>(UiName.EditorTools);
+    }
+
+    /// <summary>
+    /// 获取所有 EditorTools 的实例, 如果没有实例, 则返回一个空数组
+    /// </summary>
+    public static UI.EditorTools.EditorToolsPanel[] Get_EditorTools_Instance()
+    {
+        return GetUiInstance<UI.EditorTools.EditorToolsPanel>(nameof(UI.EditorTools.EditorTools));
+    }
+
+    /// <summary>
+    /// 打开 RoomUI, 并返回UI实例
+    /// </summary>
+    public static UI.RoomUI.RoomUIPanel Open_RoomUI()
+    {
+        return OpenUi<UI.RoomUI.RoomUIPanel>(UiName.RoomUI);
+    }
+
+    /// <summary>
+    /// 获取所有 RoomUI 的实例, 如果没有实例, 则返回一个空数组
+    /// </summary>
+    public static UI.RoomUI.RoomUIPanel[] Get_RoomUI_Instance()
+    {
+        return GetUiInstance<UI.RoomUI.RoomUIPanel>(nameof(UI.RoomUI.RoomUI));
+    }
+
+}
diff --git a/DungeonShooting_Godot/src/game/role/Characters/CPlusPlus.cs b/DungeonShooting_Godot/src/game/role/Characters/CPlusPlus.cs
index 85b216a..00e5353 100644
--- a/DungeonShooting_Godot/src/game/role/Characters/CPlusPlus.cs
+++ b/DungeonShooting_Godot/src/game/role/Characters/CPlusPlus.cs
@@ -18,9 +18,9 @@
 {
 
 
-    public override void _Ready()
+    public override void OnInit()
     {
-        base._Ready();
+        base.OnInit();
         #region 初始属性
 
         MaxHp = 55;
diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs
index ae6cdc4..f3afe6a 100644
--- a/DungeonShooting_Godot/src/game/room/RoomManager.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs
@@ -65,7 +65,6 @@
         _dungeonGenerator = new DungeonGenerator();
         _dungeonGenerator.Generate();
         
-        
         //填充地牢
         _autoTileConfig = new AutoTileConfig();
         _dungeonTile = new DungeonTile(TileRoot);
@@ -92,9 +91,12 @@
         Player.Position = new Vector2(30, 30);
         Player.Name = "Player";
         Player.PutDown(RoomLayerEnum.YSortLayer);
-        
         Player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityIdPrefix.Weapon + "0001"));
 
+        // var weapon = ActivityObject.Create(ActivityIdPrefix.Test + "0001");
+        // weapon.PutDown(new  Vector2(200, 200), RoomLayerEnum.NormalLayer);
+        // //weapon.Altitude = 50;
+
         // for (int i = 0; i < 10; i++)
         // {
         //     var enemy = ActivityObject.Create<Enemy>(ActivityIdPrefix.Enemy + "0001");
diff --git a/DungeonShooting_Godot/src/game/ui/Cursor.cs b/DungeonShooting_Godot/src/game/ui/Cursor.cs
deleted file mode 100644
index 639c7cd..0000000
--- a/DungeonShooting_Godot/src/game/ui/Cursor.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using Godot;
-
-/// <summary>
-/// 鼠标指针
-/// </summary>
-public partial class Cursor : Node2D
-{
-    /// <summary>
-    /// 是否是GUI模式
-    /// </summary>
-    private bool _isGuiMode = true;
-
-    /// <summary>
-    /// 非GUI模式下鼠标指针所挂载的角色
-    /// </summary>
-    private Role _mountRole;
-
-    private Sprite2D center;
-    private Sprite2D lt;
-    private Sprite2D lb;
-    private Sprite2D rt;
-    private Sprite2D rb;
-    
-    public override void _Ready()
-    {
-        center = GetNode<Sprite2D>("Center");
-        lt = GetNode<Sprite2D>("LT");
-        lb = GetNode<Sprite2D>("LB");
-        rt = GetNode<Sprite2D>("RT");
-        rb = GetNode<Sprite2D>("RB");
-    }
-
-    public override void _Process(double delta)
-    {
-        if (_isGuiMode)
-        {
-            SetScope(0, null);
-        }
-        else
-        {
-            var targetGun = _mountRole?.Holster.ActiveWeapon;
-            if (targetGun != null)
-            {
-                SetScope(targetGun.CurrScatteringRange, targetGun);
-            }
-            else
-            {
-                SetScope(0, null);
-            }
-        }
-
-        SetCursorPos();
-    }
-
-    /// <summary>
-    /// 设置是否是Gui模式
-    /// </summary>
-    public void SetGuiMode(bool flag)
-    {
-        _isGuiMode = flag;
-    }
-    
-    /// <summary>
-    /// 获取是否是Gui模式
-    /// </summary>
-    public bool GetGuiMode()
-    {
-        return _isGuiMode;
-    }
-    
-    /// <summary>
-    /// 设置非GUI模式下鼠标指针所挂载的角色
-    /// </summary>
-    public void SetMountRole(Role role)
-    {
-        _mountRole = role;
-    }
-
-    /// <summary>
-    /// 获取非GUI模式下鼠标指针所挂载的角色
-    /// </summary>
-    public Role GetMountRole()
-    {
-        return _mountRole;
-    }
-
-    /// <summary>
-    /// 设置光标半径范围
-    /// </summary>
-    private void SetScope(float scope, Weapon targetGun)
-    {
-        if (targetGun != null)
-        {
-            var tunPos = GameApplication.Instance.ViewToGlobalPosition(targetGun.GlobalPosition);
-            var len = GlobalPosition.DistanceTo(tunPos);
-            if (targetGun.Attribute != null)
-            {
-                len = Mathf.Max(0, len - targetGun.Attribute.FirePosition.X);
-            }
-            scope = len / GameConfig.ScatteringDistance * scope;
-        }
-        scope = Mathf.Clamp(scope, 0, 192);
-        center.Visible = scope > 64;
-
-        lt.Position = new Vector2(-scope, -scope);
-        lb.Position = new Vector2(-scope, scope);
-        rt.Position = new Vector2(scope, -scope);
-        rb.Position = new Vector2(scope, scope);
-    }
-
-    private void SetCursorPos()
-    {
-        GlobalPosition = GetGlobalMousePosition();
-    }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/ui/editorTools/EditorTools.cs b/DungeonShooting_Godot/src/game/ui/editorTools/EditorTools.cs
new file mode 100644
index 0000000..8616e70
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/ui/editorTools/EditorTools.cs
@@ -0,0 +1,475 @@
+namespace UI.EditorTools;
+
+/// <summary>
+/// Ui代码, 该类是根据ui场景自动生成的, 请不要手动编辑该类, 以免造成代码丢失
+/// </summary>
+public abstract partial class EditorTools : UiBase
+{
+    /// <summary>
+    /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.ScrollContainer"/>, 节点路径: EditorTools.ScrollContainer
+    /// </summary>
+    public UiNode_ScrollContainer L_ScrollContainer
+    {
+        get
+        {
+            if (_L_ScrollContainer == null) _L_ScrollContainer = new UiNode_ScrollContainer(GetNodeOrNull<Godot.ScrollContainer>("ScrollContainer"));
+            return _L_ScrollContainer;
+        }
+    }
+    private UiNode_ScrollContainer _L_ScrollContainer;
+
+    /// <summary>
+    /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.ConfirmationDialog"/>, 节点路径: EditorTools.Confirm
+    /// </summary>
+    public UiNode_Confirm L_Confirm
+    {
+        get
+        {
+            if (_L_Confirm == null) _L_Confirm = new UiNode_Confirm(GetNodeOrNull<Godot.ConfirmationDialog>("Confirm"));
+            return _L_Confirm;
+        }
+    }
+    private UiNode_Confirm _L_Confirm;
+
+    /// <summary>
+    /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.AcceptDialog"/>, 节点路径: EditorTools.Tips
+    /// </summary>
+    public UiNode_Tips L_Tips
+    {
+        get
+        {
+            if (_L_Tips == null) _L_Tips = new UiNode_Tips(GetNodeOrNull<Godot.AcceptDialog>("Tips"));
+            return _L_Tips;
+        }
+    }
+    private UiNode_Tips _L_Tips;
+
+
+    public EditorTools() : base(nameof(EditorTools))
+    {
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Label"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer.Label
+    /// </summary>
+    public class UiNode_Label : IUiNode<Godot.Label, UiNode_Label>
+    {
+        public UiNode_Label(Godot.Label node) : base(node) {  }
+        public override UiNode_Label Clone() => new ((Godot.Label)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer.Button
+    /// </summary>
+    public class UiNode_Button : IUiNode<Godot.Button, UiNode_Button>
+    {
+        public UiNode_Button(Godot.Button node) : base(node) {  }
+        public override UiNode_Button Clone() => new ((Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer
+    /// </summary>
+    public class UiNode_HBoxContainer : IUiNode<Godot.HBoxContainer, UiNode_HBoxContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Label
+        /// </summary>
+        public UiNode_Label L_Label
+        {
+            get
+            {
+                if (_L_Label == null) _L_Label = new UiNode_Label(Instance.GetNodeOrNull<Godot.Label>("Label"));
+                return _L_Label;
+            }
+        }
+        private UiNode_Label _L_Label;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Button
+        /// </summary>
+        public UiNode_Button L_Button
+        {
+            get
+            {
+                if (_L_Button == null) _L_Button = new UiNode_Button(Instance.GetNodeOrNull<Godot.Button>("Button"));
+                return _L_Button;
+            }
+        }
+        private UiNode_Button _L_Button;
+
+        public UiNode_HBoxContainer(Godot.HBoxContainer node) : base(node) {  }
+        public override UiNode_HBoxContainer Clone() => new ((Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Label"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer2.Label
+    /// </summary>
+    public class UiNode1_Label : IUiNode<Godot.Label, UiNode1_Label>
+    {
+        public UiNode1_Label(Godot.Label node) : base(node) {  }
+        public override UiNode1_Label Clone() => new ((Godot.Label)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer2.Button
+    /// </summary>
+    public class UiNode1_Button : IUiNode<Godot.Button, UiNode1_Button>
+    {
+        public UiNode1_Button(Godot.Button node) : base(node) {  }
+        public override UiNode1_Button Clone() => new ((Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer2
+    /// </summary>
+    public class UiNode_HBoxContainer2 : IUiNode<Godot.HBoxContainer, UiNode_HBoxContainer2>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Label
+        /// </summary>
+        public UiNode1_Label L_Label
+        {
+            get
+            {
+                if (_L_Label == null) _L_Label = new UiNode1_Label(Instance.GetNodeOrNull<Godot.Label>("Label"));
+                return _L_Label;
+            }
+        }
+        private UiNode1_Label _L_Label;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Button
+        /// </summary>
+        public UiNode1_Button L_Button
+        {
+            get
+            {
+                if (_L_Button == null) _L_Button = new UiNode1_Button(Instance.GetNodeOrNull<Godot.Button>("Button"));
+                return _L_Button;
+            }
+        }
+        private UiNode1_Button _L_Button;
+
+        public UiNode_HBoxContainer2(Godot.HBoxContainer node) : base(node) {  }
+        public override UiNode_HBoxContainer2 Clone() => new ((Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Label"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer4.Label
+    /// </summary>
+    public class UiNode2_Label : IUiNode<Godot.Label, UiNode2_Label>
+    {
+        public UiNode2_Label(Godot.Label node) : base(node) {  }
+        public override UiNode2_Label Clone() => new ((Godot.Label)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer4.Button
+    /// </summary>
+    public class UiNode2_Button : IUiNode<Godot.Button, UiNode2_Button>
+    {
+        public UiNode2_Button(Godot.Button node) : base(node) {  }
+        public override UiNode2_Button Clone() => new ((Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer4
+    /// </summary>
+    public class UiNode_HBoxContainer4 : IUiNode<Godot.HBoxContainer, UiNode_HBoxContainer4>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Label
+        /// </summary>
+        public UiNode2_Label L_Label
+        {
+            get
+            {
+                if (_L_Label == null) _L_Label = new UiNode2_Label(Instance.GetNodeOrNull<Godot.Label>("Label"));
+                return _L_Label;
+            }
+        }
+        private UiNode2_Label _L_Label;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Button
+        /// </summary>
+        public UiNode2_Button L_Button
+        {
+            get
+            {
+                if (_L_Button == null) _L_Button = new UiNode2_Button(Instance.GetNodeOrNull<Godot.Button>("Button"));
+                return _L_Button;
+            }
+        }
+        private UiNode2_Button _L_Button;
+
+        public UiNode_HBoxContainer4(Godot.HBoxContainer node) : base(node) {  }
+        public override UiNode_HBoxContainer4 Clone() => new ((Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Label"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer3.Label
+    /// </summary>
+    public class UiNode3_Label : IUiNode<Godot.Label, UiNode3_Label>
+    {
+        public UiNode3_Label(Godot.Label node) : base(node) {  }
+        public override UiNode3_Label Clone() => new ((Godot.Label)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.LineEdit"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer3.LineEdit
+    /// </summary>
+    public class UiNode_LineEdit : IUiNode<Godot.LineEdit, UiNode_LineEdit>
+    {
+        public UiNode_LineEdit(Godot.LineEdit node) : base(node) {  }
+        public override UiNode_LineEdit Clone() => new ((Godot.LineEdit)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer3.Button
+    /// </summary>
+    public class UiNode3_Button : IUiNode<Godot.Button, UiNode3_Button>
+    {
+        public UiNode3_Button(Godot.Button node) : base(node) {  }
+        public override UiNode3_Button Clone() => new ((Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer3
+    /// </summary>
+    public class UiNode_HBoxContainer3 : IUiNode<Godot.HBoxContainer, UiNode_HBoxContainer3>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Label
+        /// </summary>
+        public UiNode3_Label L_Label
+        {
+            get
+            {
+                if (_L_Label == null) _L_Label = new UiNode3_Label(Instance.GetNodeOrNull<Godot.Label>("Label"));
+                return _L_Label;
+            }
+        }
+        private UiNode3_Label _L_Label;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.LineEdit"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.LineEdit
+        /// </summary>
+        public UiNode_LineEdit L_LineEdit
+        {
+            get
+            {
+                if (_L_LineEdit == null) _L_LineEdit = new UiNode_LineEdit(Instance.GetNodeOrNull<Godot.LineEdit>("LineEdit"));
+                return _L_LineEdit;
+            }
+        }
+        private UiNode_LineEdit _L_LineEdit;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Button
+        /// </summary>
+        public UiNode3_Button L_Button
+        {
+            get
+            {
+                if (_L_Button == null) _L_Button = new UiNode3_Button(Instance.GetNodeOrNull<Godot.Button>("Button"));
+                return _L_Button;
+            }
+        }
+        private UiNode3_Button _L_Button;
+
+        public UiNode_HBoxContainer3(Godot.HBoxContainer node) : base(node) {  }
+        public override UiNode_HBoxContainer3 Clone() => new ((Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Label"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer5.Label
+    /// </summary>
+    public class UiNode4_Label : IUiNode<Godot.Label, UiNode4_Label>
+    {
+        public UiNode4_Label(Godot.Label node) : base(node) {  }
+        public override UiNode4_Label Clone() => new ((Godot.Label)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.Button"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer5.Button
+    /// </summary>
+    public class UiNode4_Button : IUiNode<Godot.Button, UiNode4_Button>
+    {
+        public UiNode4_Button(Godot.Button node) : base(node) {  }
+        public override UiNode4_Button Clone() => new ((Godot.Button)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.HBoxContainer"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.HBoxContainer5
+    /// </summary>
+    public class UiNode_HBoxContainer5 : IUiNode<Godot.HBoxContainer, UiNode_HBoxContainer5>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Label
+        /// </summary>
+        public UiNode4_Label L_Label
+        {
+            get
+            {
+                if (_L_Label == null) _L_Label = new UiNode4_Label(Instance.GetNodeOrNull<Godot.Label>("Label"));
+                return _L_Label;
+            }
+        }
+        private UiNode4_Label _L_Label;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Button"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer.Button
+        /// </summary>
+        public UiNode4_Button L_Button
+        {
+            get
+            {
+                if (_L_Button == null) _L_Button = new UiNode4_Button(Instance.GetNodeOrNull<Godot.Button>("Button"));
+                return _L_Button;
+            }
+        }
+        private UiNode4_Button _L_Button;
+
+        public UiNode_HBoxContainer5(Godot.HBoxContainer node) : base(node) {  }
+        public override UiNode_HBoxContainer5 Clone() => new ((Godot.HBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.VBoxContainer"/>, 路径: EditorTools.ScrollContainer.MarginContainer.VBoxContainer
+    /// </summary>
+    public class UiNode_VBoxContainer : IUiNode<Godot.VBoxContainer, UiNode_VBoxContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.HBoxContainer
+        /// </summary>
+        public UiNode_HBoxContainer L_HBoxContainer
+        {
+            get
+            {
+                if (_L_HBoxContainer == null) _L_HBoxContainer = new UiNode_HBoxContainer(Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer"));
+                return _L_HBoxContainer;
+            }
+        }
+        private UiNode_HBoxContainer _L_HBoxContainer;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.HBoxContainer2
+        /// </summary>
+        public UiNode_HBoxContainer2 L_HBoxContainer2
+        {
+            get
+            {
+                if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new UiNode_HBoxContainer2(Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer2"));
+                return _L_HBoxContainer2;
+            }
+        }
+        private UiNode_HBoxContainer2 _L_HBoxContainer2;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.HBoxContainer4
+        /// </summary>
+        public UiNode_HBoxContainer4 L_HBoxContainer4
+        {
+            get
+            {
+                if (_L_HBoxContainer4 == null) _L_HBoxContainer4 = new UiNode_HBoxContainer4(Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer4"));
+                return _L_HBoxContainer4;
+            }
+        }
+        private UiNode_HBoxContainer4 _L_HBoxContainer4;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.HBoxContainer3
+        /// </summary>
+        public UiNode_HBoxContainer3 L_HBoxContainer3
+        {
+            get
+            {
+                if (_L_HBoxContainer3 == null) _L_HBoxContainer3 = new UiNode_HBoxContainer3(Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer3"));
+                return _L_HBoxContainer3;
+            }
+        }
+        private UiNode_HBoxContainer3 _L_HBoxContainer3;
+
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.HBoxContainer"/>, 节点路径: EditorTools.ScrollContainer.MarginContainer.HBoxContainer5
+        /// </summary>
+        public UiNode_HBoxContainer5 L_HBoxContainer5
+        {
+            get
+            {
+                if (_L_HBoxContainer5 == null) _L_HBoxContainer5 = new UiNode_HBoxContainer5(Instance.GetNodeOrNull<Godot.HBoxContainer>("HBoxContainer5"));
+                return _L_HBoxContainer5;
+            }
+        }
+        private UiNode_HBoxContainer5 _L_HBoxContainer5;
+
+        public UiNode_VBoxContainer(Godot.VBoxContainer node) : base(node) {  }
+        public override UiNode_VBoxContainer Clone() => new ((Godot.VBoxContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.MarginContainer"/>, 路径: EditorTools.ScrollContainer.MarginContainer
+    /// </summary>
+    public class UiNode_MarginContainer : IUiNode<Godot.MarginContainer, UiNode_MarginContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.VBoxContainer"/>, 节点路径: EditorTools.ScrollContainer.VBoxContainer
+        /// </summary>
+        public UiNode_VBoxContainer L_VBoxContainer
+        {
+            get
+            {
+                if (_L_VBoxContainer == null) _L_VBoxContainer = new UiNode_VBoxContainer(Instance.GetNodeOrNull<Godot.VBoxContainer>("VBoxContainer"));
+                return _L_VBoxContainer;
+            }
+        }
+        private UiNode_VBoxContainer _L_VBoxContainer;
+
+        public UiNode_MarginContainer(Godot.MarginContainer node) : base(node) {  }
+        public override UiNode_MarginContainer Clone() => new ((Godot.MarginContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.ScrollContainer"/>, 路径: EditorTools.ScrollContainer
+    /// </summary>
+    public class UiNode_ScrollContainer : IUiNode<Godot.ScrollContainer, UiNode_ScrollContainer>
+    {
+        /// <summary>
+        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.MarginContainer"/>, 节点路径: EditorTools.MarginContainer
+        /// </summary>
+        public UiNode_MarginContainer L_MarginContainer
+        {
+            get
+            {
+                if (_L_MarginContainer == null) _L_MarginContainer = new UiNode_MarginContainer(Instance.GetNodeOrNull<Godot.MarginContainer>("MarginContainer"));
+                return _L_MarginContainer;
+            }
+        }
+        private UiNode_MarginContainer _L_MarginContainer;
+
+        public UiNode_ScrollContainer(Godot.ScrollContainer node) : base(node) {  }
+        public override UiNode_ScrollContainer Clone() => new ((Godot.ScrollContainer)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.ConfirmationDialog"/>, 路径: EditorTools.Confirm
+    /// </summary>
+    public class UiNode_Confirm : IUiNode<Godot.ConfirmationDialog, UiNode_Confirm>
+    {
+        public UiNode_Confirm(Godot.ConfirmationDialog node) : base(node) {  }
+        public override UiNode_Confirm Clone() => new ((Godot.ConfirmationDialog)Instance.Duplicate());
+    }
+
+    /// <summary>
+    /// 类型: <see cref="Godot.AcceptDialog"/>, 路径: EditorTools.Tips
+    /// </summary>
+    public class UiNode_Tips : IUiNode<Godot.AcceptDialog, UiNode_Tips>
+    {
+        public UiNode_Tips(Godot.AcceptDialog node) : base(node) {  }
+        public override UiNode_Tips Clone() => new ((Godot.AcceptDialog)Instance.Duplicate());
+    }
+
+}
diff --git a/DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs b/DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs
new file mode 100644
index 0000000..8552b8b
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs
@@ -0,0 +1,289 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using Generator;
+using Godot;
+
+namespace UI.EditorTools;
+
+[Tool]
+public partial class EditorToolsPanel : EditorTools
+{
+    //Tips 关闭回调
+    private Action _onTipsClose;
+
+    //询问窗口关闭
+    private Action<bool> _onConfirmClose;
+    
+    public override void OnShowUi(params object[] args)
+    {
+        //tips
+        _onTipsClose = null;
+        L_Tips.Instance.OkButtonText = "确定";
+        L_Tips.Instance.CloseRequested += OnTipsClose;
+        L_Tips.Instance.Confirmed += OnTipsClose;
+        L_Tips.Instance.Canceled += OnTipsClose;
+
+        //confirm
+        _onConfirmClose = null;
+        L_Confirm.Instance.OkButtonText = "确定";
+        L_Confirm.Instance.CancelButtonText = "取消";
+        L_Confirm.Instance.Canceled += OnCanceled;
+        L_Confirm.Instance.CloseRequested += OnCanceled;
+        L_Confirm.Instance.Confirmed += OnConfirm;
+
+        var container = L_ScrollContainer.L_MarginContainer.L_VBoxContainer;
+        //重新生成 ResourcePath
+        container.L_HBoxContainer.L_Button.Instance.Pressed += GenerateResourcePath;
+        //重新生成 RoomPack
+        container.L_HBoxContainer2.L_Button.Instance.Pressed += GenerateRoomPack;
+        //重新生成ui代码
+        container.L_HBoxContainer4.L_Button.Instance.Pressed += OnGenerateCurrentUiCode;
+        //创建ui
+        container.L_HBoxContainer3.L_Button.Instance.Pressed += OnCreateUI;
+        //重新生成UiManagerMethods.cs代码
+        container.L_HBoxContainer5.L_Button.Instance.Pressed += GenerateUiManagerMethods;
+    }
+
+    public override void OnHideUi()
+    {
+        L_Tips.Instance.CloseRequested -= OnTipsClose;
+        L_Tips.Instance.Confirmed -= OnTipsClose;
+        L_Tips.Instance.Canceled -= OnTipsClose;
+        
+        L_Confirm.Instance.Canceled -= OnCanceled;
+        L_Confirm.Instance.CloseRequested -= OnCanceled;
+        L_Confirm.Instance.Confirmed -= OnConfirm;
+        
+        var container = L_ScrollContainer.L_MarginContainer.L_VBoxContainer;
+        container.L_HBoxContainer.L_Button.Instance.Pressed -= GenerateResourcePath;
+        container.L_HBoxContainer2.L_Button.Instance.Pressed -= GenerateRoomPack;
+        container.L_HBoxContainer4.L_Button.Instance.Pressed -= OnGenerateCurrentUiCode;
+        container.L_HBoxContainer3.L_Button.Instance.Pressed -= OnCreateUI;
+        container.L_HBoxContainer5.L_Button.Instance.Pressed -= GenerateUiManagerMethods;
+    }
+
+    /// <summary>
+    /// Tips 关闭信号回调
+    /// </summary>
+    private void OnTipsClose()
+    {
+        if (_onTipsClose != null)
+        {
+            _onTipsClose();
+            _onTipsClose = null;
+        }
+    }
+
+    /// <summary>
+    /// Confirm 确认信号回调
+    /// </summary>
+    private void OnConfirm()
+    {
+        if (_onConfirmClose != null)
+        {
+            _onConfirmClose(true);
+            _onConfirmClose = null;
+        }
+    }
+
+    /// <summary>
+    /// Confirm 取消信号回调
+    /// </summary>
+    private void OnCanceled()
+    {
+        if (_onConfirmClose != null)
+        {
+            _onConfirmClose(false);
+            _onConfirmClose = null;
+        }
+    }
+    
+    /// <summary>
+    /// 打开提示窗口, 并设置宽高
+    /// </summary>
+    /// <param name="title">窗口标题</param>
+    /// <param name="message">显示内容</param>
+    /// <param name="width">窗口宽度</param>
+    /// <param name="height">窗口高度</param>
+    /// <param name="onClose">当窗口关闭时的回调</param>
+    public void ShowTips(string title, string message, int width, int height, Action onClose = null)
+    {
+        var tips = L_Tips.Instance;
+        tips.Size = new Vector2I(width, height);
+        tips.Title = title;
+        tips.DialogText = message;
+        _onTipsClose = onClose;
+        tips.Show();
+    }
+    
+    /// <summary>
+    /// 打开提示窗口
+    /// </summary>
+    /// <param name="title">窗口标题</param>
+    /// <param name="message">显示内容</param>
+    /// <param name="onClose">当窗口关闭时的回调</param>
+    public void ShowTips(string title, string message, Action onClose = null)
+    {
+        ShowTips(title, message, 200, 124, onClose);
+    }
+
+    /// <summary>
+    /// 关闭提示窗口
+    /// </summary>
+    public void CloseTips()
+    {
+        L_Tips.Instance.Hide();
+        _onTipsClose = null;
+    }
+
+    /// <summary>
+    /// 打开询问窗口, 并设置宽高
+    /// </summary>
+    /// <param name="title">窗口标题</param>
+    /// <param name="message">显示内容</param>
+    /// <param name="width">窗口宽度</param>
+    /// <param name="height">窗口高度</param>
+    /// <param name="onClose">当窗口关闭时的回调, 参数如果为 true 表示点击了确定按钮</param>
+    public void ShowConfirm(string title, string message, int width, int height, Action<bool> onClose = null)
+    {
+        var confirm = L_Confirm.Instance;
+        confirm.Size = new Vector2I(width, height);
+        confirm.Title = title;
+        confirm.DialogText = message;
+        _onConfirmClose = onClose;
+        confirm.Show();
+    }
+    
+    /// <summary>
+    /// 打开询问窗口
+    /// </summary>
+    /// <param name="title">窗口标题</param>
+    /// <param name="message">显示内容</param>
+    /// <param name="onClose">当窗口关闭时的回调, 参数如果为 true 表示点击了确定按钮</param>
+    public void ShowConfirm(string title, string message, Action<bool> onClose = null)
+    {
+        ShowConfirm(title, message, 200, 124, onClose);
+    }
+
+    /// <summary>
+    /// 关闭询问窗口
+    /// </summary>
+    public void CloseConfirm()
+    {
+        L_Confirm.Instance.Hide();
+        _onConfirmClose = null;
+    }
+
+    /// <summary>
+    /// 重新生成当前ui的代码
+    /// </summary>
+    private void OnGenerateCurrentUiCode()
+    {
+#if TOOLS
+        if (Plugin.Plugin.Instance != null)
+        {
+            var root = Plugin.Plugin.Instance.GetEditorInterface().GetEditedSceneRoot();
+            if (Plugin.Plugin.Instance.CheckIsUi(root))
+            {
+                if (UiGenerator.GenerateUiCodeFromEditor(root))
+                {
+                    ShowTips("提示", "生成UI代码执行成功!");
+                }
+                else
+                {
+                    ShowTips("错误", "生成UI代码执行失败! 前往控制台查看错误日志!");
+                }
+            }
+            else
+            {
+                ShowTips("错误", "当前的场景不是受管束的UI场景!");
+            }
+        }
+#endif
+    }
+    
+    /// <summary>
+    /// 创建Ui
+    /// </summary>
+    private void OnCreateUI()
+    {
+        var uiName = L_ScrollContainer.L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_LineEdit.Instance.Text;
+        ShowConfirm("提示", "是否创建UI：" + uiName, (result) =>
+        {
+            if (result)
+            {
+                //检查名称是否合规
+                if (!Regex.IsMatch(uiName, "^[A-Z][a-zA-Z0-9]*$"))
+                {
+                    ShowTips("错误", "UI名称'" + uiName + "'不符合名称约束, UI名称只允许大写字母开头, 且名称中只允许出现大小字母和数字!");
+                    return;
+                }
+
+                //检查是否有同名的Ui
+                var path = GameConfig.UiPrefabDir + uiName + ".tscn";
+                if (File.Exists(path))
+                {
+                    ShowTips("错误", "已经存在相同名称'" + uiName + "'的UI了, 不能重复创建!");
+                    return;
+                }
+                
+                //执行创建操作
+                if (UiGenerator.CreateUi(uiName, true))
+                {
+                    ShowTips("提示", "创建UI成功!");
+                }
+                else
+                {
+                    ShowTips("错误", "创建UI失败! 前往控制台查看错误日志!");
+                }
+                
+            }
+        });
+    }
+
+    /// <summary>
+    /// 更新 ResourcePath
+    /// </summary>
+    private void GenerateResourcePath()
+    {
+        if (ResourcePathGenerator.Generate())
+        {
+            ShowTips("提示", "ResourcePath.cs生成完成!");
+        }
+        else
+        {
+            ShowTips("错误", "ResourcePath.cs生成失败! 前往控制台查看错误日志!");
+        }
+    }
+
+    /// <summary>
+    /// 重新打包房间配置
+    /// </summary>
+    private void GenerateRoomPack()
+    {
+        if (RoomPackGenerator.Generate())
+        {
+            ShowTips("提示", "打包地牢房间配置执行完成!");
+        }
+        else
+        {
+            ShowTips("错误", "打包地牢房间配置执行失败! 前往控制台查看错误日志!");
+        }
+    }
+
+    /// <summary>
+    /// 重新生成UiManagerMethods.cs代码
+    /// </summary>
+    private void GenerateUiManagerMethods()
+    {
+        if (UiManagerMethodsGenerator.Generate())
+        {
+            ShowTips("提示", "生成UiManagerMethods.cs代码执行完成!");
+        }
+        else
+        {
+            ShowTips("错误", "生成UiManagerMethods.cs代码执行失败! 前往控制台查看错误日志!");
+        }
+    }
+}
diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/GunBar.cs b/DungeonShooting_Godot/src/game/ui/roomUI/GunBar.cs
index 4022dd2..d20845b 100644
--- a/DungeonShooting_Godot/src/game/ui/roomUI/GunBar.cs
+++ b/DungeonShooting_Godot/src/game/ui/roomUI/GunBar.cs
@@ -4,30 +4,30 @@
 
 public class GunBar
 {
-    private RoomUI.UiNode15_GunBar _gunBar;
+    private RoomUI.UiNode_GunBar _gunBar;
     private EventBinder _binder;
 
     private int _prevAmmo = -1;
     private int _prevResidue = -1;
     
-    public GunBar(RoomUI.UiNode15_GunBar gunBar)
+    public GunBar(RoomUI.UiNode_GunBar gunBar)
     {
         _gunBar = gunBar;
     }
 
-    public void OnOpen()
+    public void OnShow()
     {
         _binder = EventManager.AddEventListener(EventEnum.OnPlayerRefreshWeaponTexture, OnPlayerRefreshWeaponTexture);
     }
 
-    public void OnClose()
+    public void OnHide()
     {
         _binder.RemoveEventListener();
     }
 
     public void Process(float delta)
     {
-        var weapon = Player.Current.Holster.ActiveWeapon;
+        var weapon = Player.Current?.Holster.ActiveWeapon;
         if (weapon != null)
         {
             SetWeaponAmmunition(weapon.CurrAmmo, weapon.ResidueAmmo);
diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/HealthBar.cs b/DungeonShooting_Godot/src/game/ui/roomUI/HealthBar.cs
index 0e387a7..0f387b1 100644
--- a/DungeonShooting_Godot/src/game/ui/roomUI/HealthBar.cs
+++ b/DungeonShooting_Godot/src/game/ui/roomUI/HealthBar.cs
@@ -5,7 +5,7 @@
 
 public class HealthBar
 {
-    private RoomUI.UiNode9_HealthBar _healthBar;
+    private RoomUI.UiNode_HealthBar _healthBar;
     // 当前血量
     private int _hp;
     // 最大血量
@@ -17,12 +17,12 @@
 
     private EventFactory _eventFactory;
     
-    public HealthBar(RoomUI.UiNode9_HealthBar healthBar)
+    public HealthBar(RoomUI.UiNode_HealthBar healthBar)
     {
         _healthBar = healthBar;
     }
 
-    public void OnOpen()
+    public void OnShow()
     {
         _eventFactory = EventManager.CreateEventFactory();
         _eventFactory.AddEventListener(EventEnum.OnPlayerHpChange, OnPlayerHpChange);
@@ -31,7 +31,7 @@
         _eventFactory.AddEventListener(EventEnum.OnPlayerMaxShieldChange, OnPlayerMaxShieldChange);
     }
 
-    public void OnClose()
+    public void OnHide()
     {
         _eventFactory.RemoveAllEventListener();
     }
diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/InteractiveTipBar.cs b/DungeonShooting_Godot/src/game/ui/roomUI/InteractiveTipBar.cs
index 9ffe5ed..b702af5 100644
--- a/DungeonShooting_Godot/src/game/ui/roomUI/InteractiveTipBar.cs
+++ b/DungeonShooting_Godot/src/game/ui/roomUI/InteractiveTipBar.cs
@@ -7,24 +7,24 @@
 /// </summary>
 public class InteractiveTipBar
 {
-    private RoomUI.UiNode1_InteractiveTipBar _interactiveTipBar;
+    private RoomUI.UiNode_InteractiveTipBar _interactiveTipBar;
     private string _currImage;
     private EventBinder _binder;
     private ActivityObject _interactiveTarget;
     
-    public InteractiveTipBar(RoomUI.UiNode1_InteractiveTipBar interactiveTipBar)
+    public InteractiveTipBar(RoomUI.UiNode_InteractiveTipBar interactiveTipBar)
     {
         interactiveTipBar.Instance.Visible = false;
         _interactiveTipBar = interactiveTipBar;
     }
 
-    public void OnOpen()
+    public void OnShow()
     {
         GameCamera.Main.OnPositionUpdateEvent += OnCameraPositionUpdate;
         _binder = EventManager.AddEventListener(EventEnum.OnPlayerChangeInteractiveItem, OnPlayerChangeInteractiveItem);
     }
 
-    public void OnClose()
+    public void OnHide()
     {
         GameCamera.Main.OnPositionUpdateEvent -= OnCameraPositionUpdate;
         _binder.RemoveEventListener();
diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/ReloadBar.cs b/DungeonShooting_Godot/src/game/ui/roomUI/ReloadBar.cs
index 85a331e..5cbaf58 100644
--- a/DungeonShooting_Godot/src/game/ui/roomUI/ReloadBar.cs
+++ b/DungeonShooting_Godot/src/game/ui/roomUI/ReloadBar.cs
@@ -7,11 +7,11 @@
 /// </summary>
 public class ReloadBar
 {
-    private RoomUI.UiNode5_ReloadBar _reloadBar;
+    private RoomUI.UiNode_ReloadBar _reloadBar;
     private int width;
     private float startX;
 
-    public ReloadBar(RoomUI.UiNode5_ReloadBar reloadBar)
+    public ReloadBar(RoomUI.UiNode_ReloadBar reloadBar)
     {
         reloadBar.Instance.Visible = false;
         _reloadBar = reloadBar;
@@ -19,12 +19,12 @@
         startX = -(width - 3) / 2f;
     }
     
-    public void OnOpen()
+    public void OnShow()
     {
         GameCamera.Main.OnPositionUpdateEvent += OnCameraPositionUpdate;
     }
 
-    public void OnClose()
+    public void OnHide()
     {
         GameCamera.Main.OnPositionUpdateEvent -= OnCameraPositionUpdate;
     }
diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs
index c296c7c..042949b 100644
--- a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs
+++ b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs
@@ -8,597 +8,380 @@
     /// <summary>
     /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Node2D"/>, 节点路径: RoomUI.InteractiveTipBar
     /// </summary>
-    public UiNode1_InteractiveTipBar L_InteractiveTipBar
+    public UiNode_InteractiveTipBar L_InteractiveTipBar
     {
         get
         {
-            if (_L_InteractiveTipBar == null) _L_InteractiveTipBar = new UiNode1_InteractiveTipBar(GetNode<Godot.Node2D>("InteractiveTipBar"));
+            if (_L_InteractiveTipBar == null) _L_InteractiveTipBar = new UiNode_InteractiveTipBar(GetNodeOrNull<Godot.Node2D>("InteractiveTipBar"));
             return _L_InteractiveTipBar;
         }
     }
-    private UiNode1_InteractiveTipBar _L_InteractiveTipBar;
+    private UiNode_InteractiveTipBar _L_InteractiveTipBar;
 
     /// <summary>
     /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Node2D"/>, 节点路径: RoomUI.ReloadBar
     /// </summary>
-    public UiNode5_ReloadBar L_ReloadBar
+    public UiNode_ReloadBar L_ReloadBar
     {
         get
         {
-            if (_L_ReloadBar == null) _L_ReloadBar = new UiNode5_ReloadBar(GetNode<Godot.Node2D>("ReloadBar"));
+            if (_L_ReloadBar == null) _L_ReloadBar = new UiNode_ReloadBar(GetNodeOrNull<Godot.Node2D>("ReloadBar"));
             return _L_ReloadBar;
         }
     }
-    private UiNode5_ReloadBar _L_ReloadBar;
+    private UiNode_ReloadBar _L_ReloadBar;
 
     /// <summary>
     /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Control"/>, 节点路径: RoomUI.Control
     /// </summary>
-    public UiNode8_Control L_Control
+    public UiNode_Control L_Control
     {
         get
         {
-            if (_L_Control == null) _L_Control = new UiNode8_Control(GetNode<Godot.Control>("Control"));
+            if (_L_Control == null) _L_Control = new UiNode_Control(GetNodeOrNull<Godot.Control>("Control"));
             return _L_Control;
         }
     }
-    private UiNode8_Control _L_Control;
+    private UiNode_Control _L_Control;
 
-    /// <summary>
-    /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Cursor"/>, 节点路径: RoomUI.Cursor
-    /// </summary>
-    public UiNode18_Cursor L_Cursor
+
+    public RoomUI() : base(nameof(RoomUI))
     {
-        get
-        {
-            if (_L_Cursor == null) _L_Cursor = new UiNode18_Cursor(GetNode<Cursor>("Cursor"));
-            return _L_Cursor;
-        }
     }
-    private UiNode18_Cursor _L_Cursor;
-
-
 
     /// <summary>
     /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.InteractiveTipBar.Icon
     /// </summary>
-    public class UiNode2_Icon
+    public class UiNode_Icon : IUiNode<Godot.Sprite2D, UiNode_Icon>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.InteractiveTipBar.Icon
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        public UiNode2_Icon(Godot.Sprite2D node) => Instance = node;
-        public UiNode2_Icon Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
+        public UiNode_Icon(Godot.Sprite2D node) : base(node) {  }
+        public override UiNode_Icon Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.InteractiveTipBar.InteractiveIcon
     /// </summary>
-    public class UiNode3_InteractiveIcon
+    public class UiNode_InteractiveIcon : IUiNode<Godot.Sprite2D, UiNode_InteractiveIcon>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.InteractiveTipBar.InteractiveIcon
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        public UiNode3_InteractiveIcon(Godot.Sprite2D node) => Instance = node;
-        public UiNode3_InteractiveIcon Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
+        public UiNode_InteractiveIcon(Godot.Sprite2D node) : base(node) {  }
+        public override UiNode_InteractiveIcon Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Line2D"/>, 路径: RoomUI.InteractiveTipBar.Line2D
     /// </summary>
-    public class UiNode4_Line2D
+    public class UiNode_Line2D : IUiNode<Godot.Line2D, UiNode_Line2D>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Line2D"/>, 节点路径: RoomUI.InteractiveTipBar.Line2D
-        /// </summary>
-        public Godot.Line2D Instance { get; }
-
-        public UiNode4_Line2D(Godot.Line2D node) => Instance = node;
-        public UiNode4_Line2D Clone() => new ((Godot.Line2D)Instance.Duplicate());
+        public UiNode_Line2D(Godot.Line2D node) : base(node) {  }
+        public override UiNode_Line2D Clone() => new ((Godot.Line2D)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Node2D"/>, 路径: RoomUI.InteractiveTipBar
     /// </summary>
-    public class UiNode1_InteractiveTipBar
+    public class UiNode_InteractiveTipBar : IUiNode<Godot.Node2D, UiNode_InteractiveTipBar>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Node2D"/>, 节点路径: RoomUI.InteractiveTipBar
-        /// </summary>
-        public Godot.Node2D Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.Icon
         /// </summary>
-        public UiNode2_Icon L_Icon
+        public UiNode_Icon L_Icon
         {
             get
             {
-                if (_L_Icon == null) _L_Icon = new UiNode2_Icon(Instance.GetNode<Godot.Sprite2D>("Icon"));
+                if (_L_Icon == null) _L_Icon = new UiNode_Icon(Instance.GetNodeOrNull<Godot.Sprite2D>("Icon"));
                 return _L_Icon;
             }
         }
-        private UiNode2_Icon _L_Icon;
+        private UiNode_Icon _L_Icon;
 
         /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.InteractiveIcon
         /// </summary>
-        public UiNode3_InteractiveIcon L_InteractiveIcon
+        public UiNode_InteractiveIcon L_InteractiveIcon
         {
             get
             {
-                if (_L_InteractiveIcon == null) _L_InteractiveIcon = new UiNode3_InteractiveIcon(Instance.GetNode<Godot.Sprite2D>("InteractiveIcon"));
+                if (_L_InteractiveIcon == null) _L_InteractiveIcon = new UiNode_InteractiveIcon(Instance.GetNodeOrNull<Godot.Sprite2D>("InteractiveIcon"));
                 return _L_InteractiveIcon;
             }
         }
-        private UiNode3_InteractiveIcon _L_InteractiveIcon;
+        private UiNode_InteractiveIcon _L_InteractiveIcon;
 
         /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Line2D"/>, 节点路径: RoomUI.Line2D
         /// </summary>
-        public UiNode4_Line2D L_Line2D
+        public UiNode_Line2D L_Line2D
         {
             get
             {
-                if (_L_Line2D == null) _L_Line2D = new UiNode4_Line2D(Instance.GetNode<Godot.Line2D>("Line2D"));
+                if (_L_Line2D == null) _L_Line2D = new UiNode_Line2D(Instance.GetNodeOrNull<Godot.Line2D>("Line2D"));
                 return _L_Line2D;
             }
         }
-        private UiNode4_Line2D _L_Line2D;
+        private UiNode_Line2D _L_Line2D;
 
-        public UiNode1_InteractiveTipBar(Godot.Node2D node) => Instance = node;
-        public UiNode1_InteractiveTipBar Clone() => new ((Godot.Node2D)Instance.Duplicate());
+        public UiNode_InteractiveTipBar(Godot.Node2D node) : base(node) {  }
+        public override UiNode_InteractiveTipBar Clone() => new ((Godot.Node2D)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.ReloadBar.Slot.Block
     /// </summary>
-    public class UiNode7_Block
+    public class UiNode_Block : IUiNode<Godot.Sprite2D, UiNode_Block>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.ReloadBar.Slot.Block
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        public UiNode7_Block(Godot.Sprite2D node) => Instance = node;
-        public UiNode7_Block Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
+        public UiNode_Block(Godot.Sprite2D node) : base(node) {  }
+        public override UiNode_Block Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.ReloadBar.Slot
     /// </summary>
-    public class UiNode6_Slot
+    public class UiNode_Slot : IUiNode<Godot.Sprite2D, UiNode_Slot>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.ReloadBar.Slot
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.ReloadBar.Block
         /// </summary>
-        public UiNode7_Block L_Block
+        public UiNode_Block L_Block
         {
             get
             {
-                if (_L_Block == null) _L_Block = new UiNode7_Block(Instance.GetNode<Godot.Sprite2D>("Block"));
+                if (_L_Block == null) _L_Block = new UiNode_Block(Instance.GetNodeOrNull<Godot.Sprite2D>("Block"));
                 return _L_Block;
             }
         }
-        private UiNode7_Block _L_Block;
+        private UiNode_Block _L_Block;
 
-        public UiNode6_Slot(Godot.Sprite2D node) => Instance = node;
-        public UiNode6_Slot Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
+        public UiNode_Slot(Godot.Sprite2D node) : base(node) {  }
+        public override UiNode_Slot Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Node2D"/>, 路径: RoomUI.ReloadBar
     /// </summary>
-    public class UiNode5_ReloadBar
+    public class UiNode_ReloadBar : IUiNode<Godot.Node2D, UiNode_ReloadBar>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Node2D"/>, 节点路径: RoomUI.ReloadBar
-        /// </summary>
-        public Godot.Node2D Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.Slot
         /// </summary>
-        public UiNode6_Slot L_Slot
+        public UiNode_Slot L_Slot
         {
             get
             {
-                if (_L_Slot == null) _L_Slot = new UiNode6_Slot(Instance.GetNode<Godot.Sprite2D>("Slot"));
+                if (_L_Slot == null) _L_Slot = new UiNode_Slot(Instance.GetNodeOrNull<Godot.Sprite2D>("Slot"));
                 return _L_Slot;
             }
         }
-        private UiNode6_Slot _L_Slot;
+        private UiNode_Slot _L_Slot;
 
-        public UiNode5_ReloadBar(Godot.Node2D node) => Instance = node;
-        public UiNode5_ReloadBar Clone() => new ((Godot.Node2D)Instance.Duplicate());
+        public UiNode_ReloadBar(Godot.Node2D node) : base(node) {  }
+        public override UiNode_ReloadBar Clone() => new ((Godot.Node2D)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.TextureRect"/>, 路径: RoomUI.Control.HealthBar.HpSlot.HpBar
     /// </summary>
-    public class UiNode11_HpBar
+    public class UiNode_HpBar : IUiNode<Godot.TextureRect, UiNode_HpBar>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.HealthBar.HpSlot.HpBar
-        /// </summary>
-        public Godot.TextureRect Instance { get; }
-
-        public UiNode11_HpBar(Godot.TextureRect node) => Instance = node;
-        public UiNode11_HpBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
+        public UiNode_HpBar(Godot.TextureRect node) : base(node) {  }
+        public override UiNode_HpBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.NinePatchRect"/>, 路径: RoomUI.Control.HealthBar.HpSlot
     /// </summary>
-    public class UiNode10_HpSlot
+    public class UiNode_HpSlot : IUiNode<Godot.NinePatchRect, UiNode_HpSlot>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: RoomUI.Control.HealthBar.HpSlot
-        /// </summary>
-        public Godot.NinePatchRect Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.HealthBar.HpBar
         /// </summary>
-        public UiNode11_HpBar L_HpBar
+        public UiNode_HpBar L_HpBar
         {
             get
             {
-                if (_L_HpBar == null) _L_HpBar = new UiNode11_HpBar(Instance.GetNode<Godot.TextureRect>("HpBar"));
+                if (_L_HpBar == null) _L_HpBar = new UiNode_HpBar(Instance.GetNodeOrNull<Godot.TextureRect>("HpBar"));
                 return _L_HpBar;
             }
         }
-        private UiNode11_HpBar _L_HpBar;
+        private UiNode_HpBar _L_HpBar;
 
-        public UiNode10_HpSlot(Godot.NinePatchRect node) => Instance = node;
-        public UiNode10_HpSlot Clone() => new ((Godot.NinePatchRect)Instance.Duplicate());
+        public UiNode_HpSlot(Godot.NinePatchRect node) : base(node) {  }
+        public override UiNode_HpSlot Clone() => new ((Godot.NinePatchRect)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.TextureRect"/>, 路径: RoomUI.Control.HealthBar.ShieldSlot.ShieldBar
     /// </summary>
-    public class UiNode13_ShieldBar
+    public class UiNode_ShieldBar : IUiNode<Godot.TextureRect, UiNode_ShieldBar>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.HealthBar.ShieldSlot.ShieldBar
-        /// </summary>
-        public Godot.TextureRect Instance { get; }
-
-        public UiNode13_ShieldBar(Godot.TextureRect node) => Instance = node;
-        public UiNode13_ShieldBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
+        public UiNode_ShieldBar(Godot.TextureRect node) : base(node) {  }
+        public override UiNode_ShieldBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.NinePatchRect"/>, 路径: RoomUI.Control.HealthBar.ShieldSlot
     /// </summary>
-    public class UiNode12_ShieldSlot
+    public class UiNode_ShieldSlot : IUiNode<Godot.NinePatchRect, UiNode_ShieldSlot>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: RoomUI.Control.HealthBar.ShieldSlot
-        /// </summary>
-        public Godot.NinePatchRect Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.HealthBar.ShieldBar
         /// </summary>
-        public UiNode13_ShieldBar L_ShieldBar
+        public UiNode_ShieldBar L_ShieldBar
         {
             get
             {
-                if (_L_ShieldBar == null) _L_ShieldBar = new UiNode13_ShieldBar(Instance.GetNode<Godot.TextureRect>("ShieldBar"));
+                if (_L_ShieldBar == null) _L_ShieldBar = new UiNode_ShieldBar(Instance.GetNodeOrNull<Godot.TextureRect>("ShieldBar"));
                 return _L_ShieldBar;
             }
         }
-        private UiNode13_ShieldBar _L_ShieldBar;
+        private UiNode_ShieldBar _L_ShieldBar;
 
-        public UiNode12_ShieldSlot(Godot.NinePatchRect node) => Instance = node;
-        public UiNode12_ShieldSlot Clone() => new ((Godot.NinePatchRect)Instance.Duplicate());
+        public UiNode_ShieldSlot(Godot.NinePatchRect node) : base(node) {  }
+        public override UiNode_ShieldSlot Clone() => new ((Godot.NinePatchRect)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.TextureRect"/>, 路径: RoomUI.Control.HealthBar
     /// </summary>
-    public class UiNode9_HealthBar
+    public class UiNode_HealthBar : IUiNode<Godot.TextureRect, UiNode_HealthBar>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.HealthBar
-        /// </summary>
-        public Godot.TextureRect Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: RoomUI.Control.HpSlot
         /// </summary>
-        public UiNode10_HpSlot L_HpSlot
+        public UiNode_HpSlot L_HpSlot
         {
             get
             {
-                if (_L_HpSlot == null) _L_HpSlot = new UiNode10_HpSlot(Instance.GetNode<Godot.NinePatchRect>("HpSlot"));
+                if (_L_HpSlot == null) _L_HpSlot = new UiNode_HpSlot(Instance.GetNodeOrNull<Godot.NinePatchRect>("HpSlot"));
                 return _L_HpSlot;
             }
         }
-        private UiNode10_HpSlot _L_HpSlot;
+        private UiNode_HpSlot _L_HpSlot;
 
         /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.NinePatchRect"/>, 节点路径: RoomUI.Control.ShieldSlot
         /// </summary>
-        public UiNode12_ShieldSlot L_ShieldSlot
+        public UiNode_ShieldSlot L_ShieldSlot
         {
             get
             {
-                if (_L_ShieldSlot == null) _L_ShieldSlot = new UiNode12_ShieldSlot(Instance.GetNode<Godot.NinePatchRect>("ShieldSlot"));
+                if (_L_ShieldSlot == null) _L_ShieldSlot = new UiNode_ShieldSlot(Instance.GetNodeOrNull<Godot.NinePatchRect>("ShieldSlot"));
                 return _L_ShieldSlot;
             }
         }
-        private UiNode12_ShieldSlot _L_ShieldSlot;
+        private UiNode_ShieldSlot _L_ShieldSlot;
 
-        public UiNode9_HealthBar(Godot.TextureRect node) => Instance = node;
-        public UiNode9_HealthBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
+        public UiNode_HealthBar(Godot.TextureRect node) : base(node) {  }
+        public override UiNode_HealthBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.TextureRect"/>, 路径: RoomUI.Control.MapBar
     /// </summary>
-    public class UiNode14_MapBar
+    public class UiNode_MapBar : IUiNode<Godot.TextureRect, UiNode_MapBar>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.MapBar
-        /// </summary>
-        public Godot.TextureRect Instance { get; }
-
-        public UiNode14_MapBar(Godot.TextureRect node) => Instance = node;
-        public UiNode14_MapBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
+        public UiNode_MapBar(Godot.TextureRect node) : base(node) {  }
+        public override UiNode_MapBar Clone() => new ((Godot.TextureRect)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.TextureRect"/>, 路径: RoomUI.Control.GunBar.GunSprite
     /// </summary>
-    public class UiNode16_GunSprite
+    public class UiNode_GunSprite : IUiNode<Godot.TextureRect, UiNode_GunSprite>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.GunBar.GunSprite
-        /// </summary>
-        public Godot.TextureRect Instance { get; }
-
-        public UiNode16_GunSprite(Godot.TextureRect node) => Instance = node;
-        public UiNode16_GunSprite Clone() => new ((Godot.TextureRect)Instance.Duplicate());
+        public UiNode_GunSprite(Godot.TextureRect node) : base(node) {  }
+        public override UiNode_GunSprite Clone() => new ((Godot.TextureRect)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Label"/>, 路径: RoomUI.Control.GunBar.BulletText
     /// </summary>
-    public class UiNode17_BulletText
+    public class UiNode_BulletText : IUiNode<Godot.Label, UiNode_BulletText>
     {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Label"/>, 节点路径: RoomUI.Control.GunBar.BulletText
-        /// </summary>
-        public Godot.Label Instance { get; }
-
-        public UiNode17_BulletText(Godot.Label node) => Instance = node;
-        public UiNode17_BulletText Clone() => new ((Godot.Label)Instance.Duplicate());
+        public UiNode_BulletText(Godot.Label node) : base(node) {  }
+        public override UiNode_BulletText Clone() => new ((Godot.Label)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Control"/>, 路径: RoomUI.Control.GunBar
     /// </summary>
-    public class UiNode15_GunBar
+    public class UiNode_GunBar : IUiNode<Godot.Control, UiNode_GunBar>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Control"/>, 节点路径: RoomUI.Control.GunBar
-        /// </summary>
-        public Godot.Control Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.Control.GunSprite
         /// </summary>
-        public UiNode16_GunSprite L_GunSprite
+        public UiNode_GunSprite L_GunSprite
         {
             get
             {
-                if (_L_GunSprite == null) _L_GunSprite = new UiNode16_GunSprite(Instance.GetNode<Godot.TextureRect>("GunSprite"));
+                if (_L_GunSprite == null) _L_GunSprite = new UiNode_GunSprite(Instance.GetNodeOrNull<Godot.TextureRect>("GunSprite"));
                 return _L_GunSprite;
             }
         }
-        private UiNode16_GunSprite _L_GunSprite;
+        private UiNode_GunSprite _L_GunSprite;
 
         /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Label"/>, 节点路径: RoomUI.Control.BulletText
         /// </summary>
-        public UiNode17_BulletText L_BulletText
+        public UiNode_BulletText L_BulletText
         {
             get
             {
-                if (_L_BulletText == null) _L_BulletText = new UiNode17_BulletText(Instance.GetNode<Godot.Label>("BulletText"));
+                if (_L_BulletText == null) _L_BulletText = new UiNode_BulletText(Instance.GetNodeOrNull<Godot.Label>("BulletText"));
                 return _L_BulletText;
             }
         }
-        private UiNode17_BulletText _L_BulletText;
+        private UiNode_BulletText _L_BulletText;
 
-        public UiNode15_GunBar(Godot.Control node) => Instance = node;
-        public UiNode15_GunBar Clone() => new ((Godot.Control)Instance.Duplicate());
+        public UiNode_GunBar(Godot.Control node) : base(node) {  }
+        public override UiNode_GunBar Clone() => new ((Godot.Control)Instance.Duplicate());
     }
 
     /// <summary>
     /// 类型: <see cref="Godot.Control"/>, 路径: RoomUI.Control
     /// </summary>
-    public class UiNode8_Control
+    public class UiNode_Control : IUiNode<Godot.Control, UiNode_Control>
     {
         /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Control"/>, 节点路径: RoomUI.Control
-        /// </summary>
-        public Godot.Control Instance { get; }
-
-        /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.HealthBar
         /// </summary>
-        public UiNode9_HealthBar L_HealthBar
+        public UiNode_HealthBar L_HealthBar
         {
             get
             {
-                if (_L_HealthBar == null) _L_HealthBar = new UiNode9_HealthBar(Instance.GetNode<Godot.TextureRect>("HealthBar"));
+                if (_L_HealthBar == null) _L_HealthBar = new UiNode_HealthBar(Instance.GetNodeOrNull<Godot.TextureRect>("HealthBar"));
                 return _L_HealthBar;
             }
         }
-        private UiNode9_HealthBar _L_HealthBar;
+        private UiNode_HealthBar _L_HealthBar;
 
         /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.TextureRect"/>, 节点路径: RoomUI.MapBar
         /// </summary>
-        public UiNode14_MapBar L_MapBar
+        public UiNode_MapBar L_MapBar
         {
             get
             {
-                if (_L_MapBar == null) _L_MapBar = new UiNode14_MapBar(Instance.GetNode<Godot.TextureRect>("MapBar"));
+                if (_L_MapBar == null) _L_MapBar = new UiNode_MapBar(Instance.GetNodeOrNull<Godot.TextureRect>("MapBar"));
                 return _L_MapBar;
             }
         }
-        private UiNode14_MapBar _L_MapBar;
+        private UiNode_MapBar _L_MapBar;
 
         /// <summary>
         /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Control"/>, 节点路径: RoomUI.GunBar
         /// </summary>
-        public UiNode15_GunBar L_GunBar
+        public UiNode_GunBar L_GunBar
         {
             get
             {
-                if (_L_GunBar == null) _L_GunBar = new UiNode15_GunBar(Instance.GetNode<Godot.Control>("GunBar"));
+                if (_L_GunBar == null) _L_GunBar = new UiNode_GunBar(Instance.GetNodeOrNull<Godot.Control>("GunBar"));
                 return _L_GunBar;
             }
         }
-        private UiNode15_GunBar _L_GunBar;
+        private UiNode_GunBar _L_GunBar;
 
-        public UiNode8_Control(Godot.Control node) => Instance = node;
-        public UiNode8_Control Clone() => new ((Godot.Control)Instance.Duplicate());
-    }
-
-    /// <summary>
-    /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.Cursor.LT
-    /// </summary>
-    public class UiNode19_LT
-    {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.Cursor.LT
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        public UiNode19_LT(Godot.Sprite2D node) => Instance = node;
-        public UiNode19_LT Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
-    }
-
-    /// <summary>
-    /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.Cursor.LB
-    /// </summary>
-    public class UiNode20_LB
-    {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.Cursor.LB
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        public UiNode20_LB(Godot.Sprite2D node) => Instance = node;
-        public UiNode20_LB Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
-    }
-
-    /// <summary>
-    /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.Cursor.RT
-    /// </summary>
-    public class UiNode21_RT
-    {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.Cursor.RT
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        public UiNode21_RT(Godot.Sprite2D node) => Instance = node;
-        public UiNode21_RT Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
-    }
-
-    /// <summary>
-    /// 类型: <see cref="Godot.Sprite2D"/>, 路径: RoomUI.Cursor.RB
-    /// </summary>
-    public class UiNode22_RB
-    {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.Cursor.RB
-        /// </summary>
-        public Godot.Sprite2D Instance { get; }
-
-        public UiNode22_RB(Godot.Sprite2D node) => Instance = node;
-        public UiNode22_RB Clone() => new ((Godot.Sprite2D)Instance.Duplicate());
-    }
-
-    /// <summary>
-    /// 类型: <see cref="Cursor"/>, 路径: RoomUI.Cursor
-    /// </summary>
-    public class UiNode18_Cursor
-    {
-        /// <summary>
-        /// Ui节点实例, 节点类型: <see cref="Cursor"/>, 节点路径: RoomUI.Cursor
-        /// </summary>
-        public Cursor Instance { get; }
-
-        /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.LT
-        /// </summary>
-        public UiNode19_LT L_LT
-        {
-            get
-            {
-                if (_L_LT == null) _L_LT = new UiNode19_LT(Instance.GetNode<Godot.Sprite2D>("LT"));
-                return _L_LT;
-            }
-        }
-        private UiNode19_LT _L_LT;
-
-        /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.LB
-        /// </summary>
-        public UiNode20_LB L_LB
-        {
-            get
-            {
-                if (_L_LB == null) _L_LB = new UiNode20_LB(Instance.GetNode<Godot.Sprite2D>("LB"));
-                return _L_LB;
-            }
-        }
-        private UiNode20_LB _L_LB;
-
-        /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.RT
-        /// </summary>
-        public UiNode21_RT L_RT
-        {
-            get
-            {
-                if (_L_RT == null) _L_RT = new UiNode21_RT(Instance.GetNode<Godot.Sprite2D>("RT"));
-                return _L_RT;
-            }
-        }
-        private UiNode21_RT _L_RT;
-
-        /// <summary>
-        /// 使用 Instance 属性获取当前节点实例对象, 节点类型: <see cref="Godot.Sprite2D"/>, 节点路径: RoomUI.RB
-        /// </summary>
-        public UiNode22_RB L_RB
-        {
-            get
-            {
-                if (_L_RB == null) _L_RB = new UiNode22_RB(Instance.GetNode<Godot.Sprite2D>("RB"));
-                return _L_RB;
-            }
-        }
-        private UiNode22_RB _L_RB;
-
-        public UiNode18_Cursor(Cursor node) => Instance = node;
-        public UiNode18_Cursor Clone() => new ((Cursor)Instance.Duplicate());
+        public UiNode_Control(Godot.Control node) : base(node) {  }
+        public override UiNode_Control Clone() => new ((Godot.Control)Instance.Duplicate());
     }
 
 }
diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs
index e0d0e6a..e1dba97 100644
--- a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs
+++ b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs
@@ -1,3 +1,5 @@
+
+using System.Collections;
 using Godot;
 
 namespace UI.RoomUI;
@@ -12,33 +14,32 @@
     private HealthBar _healthBar;
     private GunBar _gunBar;
 
-    public override void OnCreate()
+    public override void OnCreateUi()
     {
-        //Generator.UiGenerator.GenerateUi(this, "src/game/ui/roomUI/RoomUI.cs");
         _reloadBar = new ReloadBar(L_ReloadBar);
         _interactiveTipBar = new InteractiveTipBar(L_InteractiveTipBar);
         _healthBar = new HealthBar(L_Control.L_HealthBar);
         _gunBar = new GunBar(L_Control.L_GunBar);
     }
 
-    public override void OnOpen(params object[] args)
+    public override void OnShowUi(params object[] args)
     {
-        _reloadBar.OnOpen();
-        _interactiveTipBar.OnOpen();
-        _healthBar.OnOpen();
-        _gunBar.OnOpen();
+        _reloadBar.OnShow();
+        _interactiveTipBar.OnShow();
+        _healthBar.OnShow();
+        _gunBar.OnShow();
     }
 
-    public override void OnClose()
+    public override void OnHideUi()
     {
-        _reloadBar.OnClose();
-        _interactiveTipBar.OnClose();
-        _healthBar.OnClose();
-        _gunBar.OnClose();
+        _reloadBar.OnHide();
+        _interactiveTipBar.OnHide();
+        _healthBar.OnHide();
+        _gunBar.OnHide();
     }
 
-    public override void _Process(double delta)
+    public override void Process(float delta)
     {
-        _gunBar.Process((float) delta);
+        _gunBar.Process(delta);
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/test/TestActivity.cs b/DungeonShooting_Godot/src/test/TestActivity.cs
index 0a9eb8d..ef47a9e 100644
--- a/DungeonShooting_Godot/src/test/TestActivity.cs
+++ b/DungeonShooting_Godot/src/test/TestActivity.cs
@@ -1,11 +1,48 @@
 using Godot;
 
-[RegisterActivity(ActivityIdPrefix.Test + "1", ResourcePath.prefab_test_TestActivity_tscn)]
+[RegisterActivity(ActivityIdPrefix.Test + "0001", ResourcePath.prefab_test_TestActivity_tscn)]
 public partial class TestActivity : ActivityObject
 {
-	public override void _Ready()
+	public override void OnInit()
 	{
-		var externalForce = MoveController.AddConstantForce("move");
-		externalForce.Velocity = new Vector2(0, 60);
+		EnableVerticalMotion = false;
+	}
+
+	protected override void Process(float delta)
+	{
+		if (Input.IsActionJustPressed("fire"))
+		{
+			Altitude = 100;
+		}
+
+		if (Input.IsActionJustPressed("interactive"))
+		{
+			EnableVerticalMotion = !EnableVerticalMotion;
+		}
+	}
+
+	protected override void OnFallToGround()
+	{
+		GD.Print("OnFallToGround");
+	}
+
+	protected override void OnFirstFallToGround()
+	{
+		GD.Print("OnFirstFallToGround");
+	}
+
+	protected override void OnThrowStart()
+	{
+		GD.Print("OnThrowStart");
+	}
+
+	protected override void OnThrowMaxHeight(float height)
+	{
+		GD.Print("OnThrowMaxHeight: " + height);
+	}
+
+	protected override void OnThrowOver()
+	{
+		GD.Print("OnThrowOver");
 	}
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/test/TestUi/Test.cs b/DungeonShooting_Godot/src/test/TestUi/Test.cs
deleted file mode 100644
index d577cb9..0000000
--- a/DungeonShooting_Godot/src/test/TestUi/Test.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using Godot;
-
-namespace UI;
-
-/*
- Test
-    c1
-        c11
-    c2
- */
-public abstract partial class Test : UiBase
-{
-    public UiNode2_c1 c1
-    {
-        get
-        {
-            if (_c1 == null) _c1 = new UiNode2_c1(GetNode<Control>("c1"));
-            return _c1;
-        }
-    }
-    public UiNode3_c2 c2
-    {
-        get
-        {
-            if (_c2 == null) _c2 = new UiNode3_c2(GetNode<Control>("c2"));
-            return _c2;
-        }
-    }
-
-    private UiNode2_c1 _c1;
-    private UiNode3_c2 _c2;
-    
-    public class UiNode1_c11
-    {
-        public Control Instance { get; }
-
-        public UiNode1_c11(Control node)
-        {
-            Instance = node;
-        }
-
-        public UiNode1_c11 Clone()
-        {
-            return new UiNode1_c11((Control)Instance.Duplicate());
-        }
-    }
-    
-    public class UiNode2_c1
-    {
-        public Control Instance { get; }
-
-        public UiNode1_c11 c11
-        {
-            get
-            {
-                if (_c11 == null) _c11 = new UiNode1_c11(Instance.GetNode<Control>("c11"));
-                return _c11;
-            }
-        }
-
-        private UiNode1_c11 _c11;
-
-        public UiNode2_c1(Control node)
-        {
-            Instance = node;
-        }
-
-        public UiNode2_c1 Clone()
-        {
-            return new UiNode2_c1((Control)Instance.Duplicate());
-        }
-    }
-    
-    public class UiNode3_c2
-    {
-        public Control Instance { get; }
-
-        public UiNode3_c2(Control node)
-        {
-            Instance = node;
-        }
-
-        public UiNode3_c2 Clone()
-        {
-            return new UiNode3_c2((Control)Instance.Duplicate());
-        }
-    }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/test/TestUi/TestPanel.cs b/DungeonShooting_Godot/src/test/TestUi/TestPanel.cs
deleted file mode 100644
index a65c268..0000000
--- a/DungeonShooting_Godot/src/test/TestUi/TestPanel.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace UI;
-
-public partial class TestPanel : Test
-{
-    public override void OnOpen(params object[] args)
-    {
-        
-    }
-
-    public override void OnClose()
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/README.md b/README.md
index 0f95428..da6ba4b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 目前项目已经从Godot3x迁移至Godot4x<br>
-当前Godot版本: Godot_v4.0-stable, 请使用指定的Godot版打本开项目
+当前Godot版本: Godot_v4.0.1.rc1, 请使用指定的Godot版打本开项目
 
 游戏名称: 待定<br>
 美术风格: 2D像素<br>