diff --git a/DungeonShooting_Godot/DungeonShooting.csproj b/DungeonShooting_Godot/DungeonShooting.csproj index 86e12fb..4d20267 100644 --- a/DungeonShooting_Godot/DungeonShooting.csproj +++ b/DungeonShooting_Godot/DungeonShooting.csproj @@ -3,4 +3,7 @@ net6.0 true + + + \ No newline at end of file diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/EditorTools.tscn b/DungeonShooting_Godot/addons/dungeonShooting_plugin/EditorTools.tscn deleted file mode 100644 index 02e3496..0000000 --- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/EditorTools.tscn +++ /dev/null @@ -1,57 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://doyyiro45hwb6"] - -[ext_resource type="Script" path="res://addons/dungeonShooting_plugin/Tools.cs" id="1_y0p44"] - -[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_y0p44") - -[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 - -[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/MarginContainer/VBoxContainer"] -layout_mode = 2 - -[node name="Label" type="Label" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer"] -layout_mode = 2 -text = "ResourcePath.cs" - -[node name="Button" type="Button" parent="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer"] -layout_mode = 2 -text = "重新生成" - -[node name="HBoxContainer2" type="HBoxContainer" parent="ScrollContainer/MarginContainer/VBoxContainer"] -layout_mode = 2 - -[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 = "重新打包" - -[connection signal="pressed" from="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer/Button" to="." method="_on_Button_pressed"] -[connection signal="pressed" from="ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer2/Button" to="." method="_on_Button2_pressed"] diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs index 84f3070..01d52c7 100644 --- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs +++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs @@ -2,6 +2,7 @@ using System; using Generator; using Godot; +using UI.EditorTools; namespace Plugin { @@ -11,7 +12,7 @@ public static Plugin Instance => _instance; private static Plugin _instance; - private Control _dock; + private EditorToolsPanel _dock; //ui监听器 private NodeMonitor _uiMonitor; @@ -46,14 +47,32 @@ var script5 = GD.Load