diff --git a/DungeonShooting_Godot/prefab/ui/MapEditor.tscn b/DungeonShooting_Godot/prefab/ui/MapEditor.tscn index 46a135f..f283970 100644 --- a/DungeonShooting_Godot/prefab/ui/MapEditor.tscn +++ b/DungeonShooting_Godot/prefab/ui/MapEditor.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/game/ui/mapEditor/MapEditorPanel.cs" id="1_5s7a0"] [ext_resource type="Texture2D" uid="uid://cajcnlimvoxk" path="res://resource/sprite/ui/commonIcon/Back.png" id="2_gkcw7"] -[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="2_vrg60"] +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="2_vrg60"] [ext_resource type="Texture2D" uid="uid://cat35d7ueu7gu" path="res://resource/sprite/ui/commonIcon/Save.png" id="3_qq8k4"] [ext_resource type="Texture2D" uid="uid://7l7aqhsaexoh" path="res://resource/sprite/ui/commonIcon/Play.png" id="4_2imnr"] [ext_resource type="Texture2D" uid="uid://0878uloew5jo" path="res://resource/sprite/ui/mapEditor/ErrorCell.png" id="4_465u2"] diff --git a/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn b/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn index fe06a81..5855bc9 100644 --- a/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn +++ b/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn @@ -133,37 +133,11 @@ value = 16.0 custom_arrow_step = 1.0 -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer3"] +[node name="DelayContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer3"] layout_mode = 2 size_flags_horizontal = 3 -[node name="PreloadingContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer3/VBoxContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="PreloadingNameLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer3/VBoxContainer/PreloadingContainer"] -custom_minimum_size = Vector2(250, 0) -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 0 -size_flags_stretch_ratio = 30.0 -text = "提前加载：" -horizontal_alignment = 2 -vertical_alignment = 1 - -[node name="PreloadingCheck" type="CheckBox" parent="MarginContainer/VBoxContainer/HBoxContainer3/VBoxContainer/PreloadingContainer"] -custom_minimum_size = Vector2(0, 43) -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 4 -size_flags_stretch_ratio = 70.0 -flat = true - -[node name="DelayContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer3/VBoxContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="DelayNameLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer3/VBoxContainer/DelayContainer"] +[node name="DelayNameLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer3/DelayContainer"] custom_minimum_size = Vector2(250, 0) layout_mode = 2 size_flags_horizontal = 3 @@ -173,11 +147,11 @@ horizontal_alignment = 2 vertical_alignment = 1 -[node name="DelayInput" type="SpinBox" parent="MarginContainer/VBoxContainer/HBoxContainer3/VBoxContainer/DelayContainer"] +[node name="DelayInput" type="SpinBox" parent="MarginContainer/VBoxContainer/HBoxContainer3/DelayContainer"] custom_minimum_size = Vector2(0, 43) layout_mode = 2 size_flags_horizontal = 3 -size_flags_vertical = 4 +size_flags_vertical = 0 size_flags_stretch_ratio = 70.0 max_value = 30.0 step = 0.01 diff --git a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Room1/Room1_preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Room1/Room1_preinstall.json index 154b74e..e01ee7b 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Room1/Room1_preinstall.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Room1/Room1_preinstall.json @@ -1 +1 @@ -[{"Name":"test1","Weight":100,"Remark":"","WaveList":[[{"Position":{"X":23,"Y":-92},"Size":{"X":17,"Y":69},"Preloading":false,"DelayTime":0,"MarkList":[{"Id":"enemy0001","Weight":100,"Attr":{"Weapon":"weapon0002","CurrAmmon":"7","ResidueAmmo":"7"}}]},{"Position":{"X":6,"Y":-27},"Size":{"X":44,"Y":35},"Preloading":true,"DelayTime":0,"MarkList":[{"Id":"enemy0001","Weight":100,"Attr":{"Weapon":"weapon0007","CurrAmmon":"60","ResidueAmmo":"60"}}]},{"Position":{"X":73,"Y":30},"Size":{"X":75,"Y":46},"Preloading":false,"DelayTime":1,"MarkList":[{"Id":"enemy0001","Weight":100,"Attr":{"Weapon":"weapon0006","CurrAmmon":"20","ResidueAmmo":"20"}}]},{"Position":{"X":-18,"Y":-133},"Size":{"X":88,"Y":20},"Preloading":false,"DelayTime":2,"MarkList":[{"Id":"weapon0002","Weight":100,"Attr":{"CurrAmmon":"7","ResidueAmmo":"70"}}]}],[{"Position":{"X":-39,"Y":-27},"Size":{"X":39,"Y":27},"Preloading":false,"DelayTime":0.6,"MarkList":[{"Id":"prop0006","Weight":100,"Attr":null}]}]]},{"Name":"test2","Weight":100,"Remark":"","WaveList":[[{"Position":{"X":-13,"Y":-31},"Size":{"X":61,"Y":35},"Preloading":true,"DelayTime":0,"MarkList":[{"Id":"enemy0001","Weight":100,"Attr":{"Weapon":"weapon0001","CurrAmmon":"30","ResidueAmmo":"30"}}]}]]},{"Name":"test3","Weight":100,"Remark":"","WaveList":[[{"Position":{"X":-18,"Y":-33},"Size":{"X":90,"Y":27},"Preloading":false,"DelayTime":0,"MarkList":[{"Id":"weapon0001","Weight":100,"Attr":{"CurrAmmon":"30","ResidueAmmo":"210"}}]},{"Position":{"X":98,"Y":28},"Size":{"X":27,"Y":51},"Preloading":false,"DelayTime":0,"MarkList":[{"Id":"enemy0001","Weight":100,"Attr":{"Weapon":"weapon0001","CurrAmmon":"30","ResidueAmmo":"50"}}]}],[{"Position":{"X":44,"Y":28},"Size":{"X":54,"Y":44},"Preloading":false,"DelayTime":0,"MarkList":[{"Id":"enemy0001","Weight":100,"Attr":{"Weapon":"weapon0007","CurrAmmon":"60","ResidueAmmo":"50"}}]}]]}] \ No newline at end of file +[{"Name":"test1","Weight":100,"Remark":"","WaveList":[[{"Position":{"X":47,"Y":22},"Size":{"X":16,"Y":16},"DelayTime":0,"MarkList":[{"Id":"weapon0006","Weight":100,"Attr":{"CurrAmmon":"20","ResidueAmmo":"300"}}]}],[{"Position":{"X":0,"Y":0},"Size":{"X":16,"Y":16},"DelayTime":0,"MarkList":[{"Id":"weapon0007","Weight":100,"Attr":{"CurrAmmon":"60","ResidueAmmo":"300"}}]}]]},{"Name":"test2","Weight":100,"Remark":"","WaveList":[[]]}] \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png.import b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png.import index c36be94..b20c9a6 100644 --- a/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png.import +++ b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://chd2vtesap5cf" -path="res://.godot/imported/Enemy0001.png-148a38dfa95953b26d890356e8875de4.ctex" +path="res://.godot/imported/enemy0001.png-1247a3ddf8a1a163d812cad12c4340fd.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://resource/sprite/role/enemy0001/Enemy0001.png" -dest_files=["res://.godot/imported/Enemy0001.png-148a38dfa95953b26d890356e8875de4.ctex"] +source_file="res://resource/sprite/role/enemy0001/enemy0001.png" +dest_files=["res://.godot/imported/enemy0001.png-1247a3ddf8a1a163d812cad12c4340fd.ctex"] [params] diff --git a/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png.import b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png.import index d563acf..56388a2 100644 --- a/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png.import +++ b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d2f55lu60x64i" -path="res://.godot/imported/Enemy0001_Debris.png-ac416dc79cd3c1217b27e1ef1fbe0d0b.ctex" +path="res://.godot/imported/enemy0001_Debris.png-297a2fb6680cb862a9a085cf58f8268c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://resource/sprite/role/enemy0001/Enemy0001_Debris.png" -dest_files=["res://.godot/imported/Enemy0001_Debris.png-ac416dc79cd3c1217b27e1ef1fbe0d0b.ctex"] +source_file="res://resource/sprite/role/enemy0001/enemy0001_Debris.png" +dest_files=["res://.godot/imported/enemy0001_Debris.png-297a2fb6680cb862a9a085cf58f8268c.ctex"] [params] diff --git a/DungeonShooting_Godot/src/framework/map/data/MarkInfo.cs b/DungeonShooting_Godot/src/framework/map/data/MarkInfo.cs index bab594a..610f639 100644 --- a/DungeonShooting_Godot/src/framework/map/data/MarkInfo.cs +++ b/DungeonShooting_Godot/src/framework/map/data/MarkInfo.cs @@ -18,12 +18,6 @@ /// [JsonInclude] public SerializeVector2 Size; - - /// - /// 标记数据是否在玩家进入房间前加载, 如果为 true, 则 DelayTime 会失效 - /// - [JsonInclude] - public bool Preloading; /// /// 延时时间 @@ -45,7 +39,6 @@ Position = mark.Position; Size = mark.Size; DelayTime = mark.DelayTime; - Preloading = mark.Preloading; MarkList = mark.MarkList; } } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/framework/map/data/RoomPreinstall.cs b/DungeonShooting_Godot/src/framework/map/data/RoomPreinstall.cs index 905d447..221d999 100644 --- a/DungeonShooting_Godot/src/framework/map/data/RoomPreinstall.cs +++ b/DungeonShooting_Godot/src/framework/map/data/RoomPreinstall.cs @@ -41,4 +41,15 @@ Remark = preinstall.Remark; WaveList = preinstall.WaveList; } + + /// + /// 初始化波数据 + /// + public void InitWaveList() + { + WaveList = new List> + { + new List() + }; + } } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs b/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs index b28e4dd..426cd39 100644 --- a/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs +++ b/DungeonShooting_Godot/src/game/manager/EditorWindowManager.cs @@ -194,14 +194,16 @@ /// /// 打开创建标记页面 /// + /// 是否提前加载 /// 创建标记回调 /// 所属父级Ui - public static void ShowCreateMark(Action onCreateMarkInfo, UiBase parentUi = null) + public static void ShowCreateMark(bool preloading, Action onCreateMarkInfo , UiBase parentUi = null) { var window = CreateWindowInstance(parentUi); window.SetWindowTitle("创建标记"); window.SetWindowSize(new Vector2I(1400, 900)); var body = window.OpenBody(UiManager.UiName.MapEditorCreateMark); + body.InitData(preloading); window.SetButtonList( new EditorWindowPanel.ButtonData("确定", () => { @@ -223,15 +225,16 @@ /// 打开编辑标记页面 /// /// 标记数据对象 + /// 是否提前加载 /// 保存时回调 /// 所属父级Ui - public static void ShowEditMark(MarkInfo data, Action onSaveMarkInfo, UiBase parentUi = null) + public static void ShowEditMark(MarkInfo data, bool preloading, Action onSaveMarkInfo, UiBase parentUi = null) { var window = CreateWindowInstance(parentUi); window.SetWindowTitle("编辑标记"); window.SetWindowSize(new Vector2I(1400, 900)); var body = window.OpenBody(UiManager.UiName.MapEditorCreateMark); - body.InitData(data); + body.InitData(data, preloading); window.SetButtonList( new EditorWindowPanel.ButtonData("确定", () => { diff --git a/DungeonShooting_Godot/src/game/ui/loading/LoadingPanel.cs b/DungeonShooting_Godot/src/game/ui/loading/LoadingPanel.cs index 50d070e..872e5c0 100644 --- a/DungeonShooting_Godot/src/game/ui/loading/LoadingPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/loading/LoadingPanel.cs @@ -8,14 +8,4 @@ public partial class LoadingPanel : Loading { - public override void OnShowUi() - { - - } - - public override void OnHideUi() - { - - } - } diff --git a/DungeonShooting_Godot/src/game/ui/main/MainPanel.cs b/DungeonShooting_Godot/src/game/ui/main/MainPanel.cs index 77bff0c..36a7493 100644 --- a/DungeonShooting_Godot/src/game/ui/main/MainPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/main/MainPanel.cs @@ -8,19 +8,12 @@ public partial class MainPanel : Main { - public override void OnShowUi() + public override void OnCreateUi() { S_Start.Instance.Pressed += OnStartGameClick; S_Exit.Instance.Pressed += OnExitClick; S_Tools.Instance.Pressed += OnToolsClick; } - - public override void OnHideUi() - { - S_Start.Instance.Pressed -= OnStartGameClick; - S_Exit.Instance.Pressed -= OnExitClick; - S_Tools.Instance.Pressed -= OnToolsClick; - } //点击开始游戏 private void OnStartGameClick() diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs index 23377db..d23a9a4 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMark.cs @@ -12,7 +12,7 @@ { get { - if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer((MapEditorCreateMarkPanel)this, GetNodeOrNull("MarginContainer")); + if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer((MapEditorCreateMarkPanel)this, GetNode("MarginContainer")); return _L_MarginContainer; } } @@ -25,7 +25,7 @@ { get { - if (_L_ExpandPanel == null) _L_ExpandPanel = new ExpandPanel((MapEditorCreateMarkPanel)this, GetNodeOrNull("ExpandPanel")); + if (_L_ExpandPanel == null) _L_ExpandPanel = new ExpandPanel((MapEditorCreateMarkPanel)this, GetNode("ExpandPanel")); return _L_ExpandPanel; } } @@ -38,7 +38,7 @@ { get { - if (_L_NumberBar == null) _L_NumberBar = new NumberBar((MapEditorCreateMarkPanel)this, GetNodeOrNull("NumberBar")); + if (_L_NumberBar == null) _L_NumberBar = new NumberBar((MapEditorCreateMarkPanel)this, GetNode("NumberBar")); return _L_NumberBar; } } @@ -51,7 +51,7 @@ { get { - if (_L_ObjectBar == null) _L_ObjectBar = new ObjectBar((MapEditorCreateMarkPanel)this, GetNodeOrNull("ObjectBar")); + if (_L_ObjectBar == null) _L_ObjectBar = new ObjectBar((MapEditorCreateMarkPanel)this, GetNode("ObjectBar")); return _L_ObjectBar; } } @@ -108,7 +108,7 @@ { get { - if (_L_Label == null) _L_Label = new Label(UiPanel, Instance.GetNodeOrNull("Label")); + if (_L_Label == null) _L_Label = new Label(UiPanel, Instance.GetNode("Label")); return _L_Label; } } @@ -121,7 +121,7 @@ { get { - if (_L_PosX == null) _L_PosX = new PosX(UiPanel, Instance.GetNodeOrNull("PosX")); + if (_L_PosX == null) _L_PosX = new PosX(UiPanel, Instance.GetNode("PosX")); return _L_PosX; } } @@ -161,7 +161,7 @@ { get { - if (_L_Label == null) _L_Label = new Label_1(UiPanel, Instance.GetNodeOrNull("Label")); + if (_L_Label == null) _L_Label = new Label_1(UiPanel, Instance.GetNode("Label")); return _L_Label; } } @@ -174,7 +174,7 @@ { get { - if (_L_PosY == null) _L_PosY = new PosY(UiPanel, Instance.GetNodeOrNull("PosY")); + if (_L_PosY == null) _L_PosY = new PosY(UiPanel, Instance.GetNode("PosY")); return _L_PosY; } } @@ -196,7 +196,7 @@ { get { - if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer(UiPanel, Instance.GetNodeOrNull("HBoxContainer")); + if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer(UiPanel, Instance.GetNode("HBoxContainer")); return _L_HBoxContainer; } } @@ -209,7 +209,7 @@ { get { - if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new HBoxContainer2_1(UiPanel, Instance.GetNodeOrNull("HBoxContainer2")); + if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new HBoxContainer2_1(UiPanel, Instance.GetNode("HBoxContainer2")); return _L_HBoxContainer2; } } @@ -231,7 +231,7 @@ { get { - if (_L_PosLabel == null) _L_PosLabel = new PosLabel(UiPanel, Instance.GetNodeOrNull("PosLabel")); + if (_L_PosLabel == null) _L_PosLabel = new PosLabel(UiPanel, Instance.GetNode("PosLabel")); return _L_PosLabel; } } @@ -244,7 +244,7 @@ { get { - if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_1(UiPanel, Instance.GetNodeOrNull("VBoxContainer")); + if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_1(UiPanel, Instance.GetNode("VBoxContainer")); return _L_VBoxContainer; } } @@ -293,7 +293,7 @@ { get { - if (_L_Label == null) _L_Label = new Label_2(UiPanel, Instance.GetNodeOrNull("Label")); + if (_L_Label == null) _L_Label = new Label_2(UiPanel, Instance.GetNode("Label")); return _L_Label; } } @@ -306,7 +306,7 @@ { get { - if (_L_SizeX == null) _L_SizeX = new SizeX(UiPanel, Instance.GetNodeOrNull("SizeX")); + if (_L_SizeX == null) _L_SizeX = new SizeX(UiPanel, Instance.GetNode("SizeX")); return _L_SizeX; } } @@ -346,7 +346,7 @@ { get { - if (_L_Label == null) _L_Label = new Label_3(UiPanel, Instance.GetNodeOrNull("Label")); + if (_L_Label == null) _L_Label = new Label_3(UiPanel, Instance.GetNode("Label")); return _L_Label; } } @@ -359,7 +359,7 @@ { get { - if (_L_SizeY == null) _L_SizeY = new SizeY(UiPanel, Instance.GetNodeOrNull("SizeY")); + if (_L_SizeY == null) _L_SizeY = new SizeY(UiPanel, Instance.GetNode("SizeY")); return _L_SizeY; } } @@ -381,7 +381,7 @@ { get { - if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_1(UiPanel, Instance.GetNodeOrNull("HBoxContainer")); + if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_1(UiPanel, Instance.GetNode("HBoxContainer")); return _L_HBoxContainer; } } @@ -394,7 +394,7 @@ { get { - if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new HBoxContainer2_2(UiPanel, Instance.GetNodeOrNull("HBoxContainer2")); + if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new HBoxContainer2_2(UiPanel, Instance.GetNode("HBoxContainer2")); return _L_HBoxContainer2; } } @@ -416,7 +416,7 @@ { get { - if (_L_SizeLabel == null) _L_SizeLabel = new SizeLabel(UiPanel, Instance.GetNodeOrNull("SizeLabel")); + if (_L_SizeLabel == null) _L_SizeLabel = new SizeLabel(UiPanel, Instance.GetNode("SizeLabel")); return _L_SizeLabel; } } @@ -429,7 +429,7 @@ { get { - if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_2(UiPanel, Instance.GetNodeOrNull("VBoxContainer")); + if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_2(UiPanel, Instance.GetNode("VBoxContainer")); return _L_VBoxContainer; } } @@ -440,60 +440,7 @@ } /// - /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingContainer.PreloadingNameLabel - /// - public class PreloadingNameLabel : UiNode - { - public PreloadingNameLabel(MapEditorCreateMarkPanel uiPanel, Godot.Label node) : base(uiPanel, node) { } - public override PreloadingNameLabel Clone() => new (UiPanel, (Godot.Label)Instance.Duplicate()); - } - - /// - /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingContainer.PreloadingCheck - /// - public class PreloadingCheck : UiNode - { - public PreloadingCheck(MapEditorCreateMarkPanel uiPanel, Godot.CheckBox node) : base(uiPanel, node) { } - public override PreloadingCheck Clone() => new (UiPanel, (Godot.CheckBox)Instance.Duplicate()); - } - - /// - /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingContainer - /// - public class PreloadingContainer : UiNode - { - /// - /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingNameLabel - /// - public PreloadingNameLabel L_PreloadingNameLabel - { - get - { - if (_L_PreloadingNameLabel == null) _L_PreloadingNameLabel = new PreloadingNameLabel(UiPanel, Instance.GetNodeOrNull("PreloadingNameLabel")); - return _L_PreloadingNameLabel; - } - } - private PreloadingNameLabel _L_PreloadingNameLabel; - - /// - /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingCheck - /// - public PreloadingCheck L_PreloadingCheck - { - get - { - if (_L_PreloadingCheck == null) _L_PreloadingCheck = new PreloadingCheck(UiPanel, Instance.GetNodeOrNull("PreloadingCheck")); - return _L_PreloadingCheck; - } - } - private PreloadingCheck _L_PreloadingCheck; - - public PreloadingContainer(MapEditorCreateMarkPanel uiPanel, Godot.HBoxContainer node) : base(uiPanel, node) { } - public override PreloadingContainer Clone() => new (UiPanel, (Godot.HBoxContainer)Instance.Duplicate()); - } - - /// - /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayContainer.DelayNameLabel + /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayContainer.DelayNameLabel /// public class DelayNameLabel : UiNode { @@ -502,7 +449,7 @@ } /// - /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayContainer.DelayInput + /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayContainer.DelayInput /// public class DelayInput : UiNode { @@ -511,31 +458,31 @@ } /// - /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayContainer + /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayContainer /// public class DelayContainer : UiNode { /// - /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayNameLabel + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayNameLabel /// public DelayNameLabel L_DelayNameLabel { get { - if (_L_DelayNameLabel == null) _L_DelayNameLabel = new DelayNameLabel(UiPanel, Instance.GetNodeOrNull("DelayNameLabel")); + if (_L_DelayNameLabel == null) _L_DelayNameLabel = new DelayNameLabel(UiPanel, Instance.GetNode("DelayNameLabel")); return _L_DelayNameLabel; } } private DelayNameLabel _L_DelayNameLabel; /// - /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayInput + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayInput /// public DelayInput L_DelayInput { get { - if (_L_DelayInput == null) _L_DelayInput = new DelayInput(UiPanel, Instance.GetNodeOrNull("DelayInput")); + if (_L_DelayInput == null) _L_DelayInput = new DelayInput(UiPanel, Instance.GetNode("DelayInput")); return _L_DelayInput; } } @@ -546,41 +493,6 @@ } /// - /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer - /// - public class VBoxContainer_3 : UiNode - { - /// - /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.PreloadingContainer - /// - public PreloadingContainer L_PreloadingContainer - { - get - { - if (_L_PreloadingContainer == null) _L_PreloadingContainer = new PreloadingContainer(UiPanel, Instance.GetNodeOrNull("PreloadingContainer")); - return _L_PreloadingContainer; - } - } - private PreloadingContainer _L_PreloadingContainer; - - /// - /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayContainer - /// - public DelayContainer L_DelayContainer - { - get - { - if (_L_DelayContainer == null) _L_DelayContainer = new DelayContainer(UiPanel, Instance.GetNodeOrNull("DelayContainer")); - return _L_DelayContainer; - } - } - private DelayContainer _L_DelayContainer; - - public VBoxContainer_3(MapEditorCreateMarkPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) { } - public override VBoxContainer_3 Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate()); - } - - /// /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3 /// public class HBoxContainer3 : UiNode @@ -592,7 +504,7 @@ { get { - if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new HBoxContainer2(UiPanel, Instance.GetNodeOrNull("HBoxContainer2")); + if (_L_HBoxContainer2 == null) _L_HBoxContainer2 = new HBoxContainer2(UiPanel, Instance.GetNode("HBoxContainer2")); return _L_HBoxContainer2; } } @@ -605,24 +517,24 @@ { get { - if (_L_HBoxContainer3 == null) _L_HBoxContainer3 = new HBoxContainer3_1(UiPanel, Instance.GetNodeOrNull("HBoxContainer3")); + if (_L_HBoxContainer3 == null) _L_HBoxContainer3 = new HBoxContainer3_1(UiPanel, Instance.GetNode("HBoxContainer3")); return _L_HBoxContainer3; } } private HBoxContainer3_1 _L_HBoxContainer3; /// - /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.VBoxContainer + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.DelayContainer /// - public VBoxContainer_3 L_VBoxContainer + public DelayContainer L_DelayContainer { get { - if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_3(UiPanel, Instance.GetNodeOrNull("VBoxContainer")); - return _L_VBoxContainer; + if (_L_DelayContainer == null) _L_DelayContainer = new DelayContainer(UiPanel, Instance.GetNode("DelayContainer")); + return _L_DelayContainer; } } - private VBoxContainer_3 _L_VBoxContainer; + private DelayContainer _L_DelayContainer; public HBoxContainer3(MapEditorCreateMarkPanel uiPanel, Godot.HBoxContainer node) : base(uiPanel, node) { } public override HBoxContainer3 Clone() => new (UiPanel, (Godot.HBoxContainer)Instance.Duplicate()); @@ -712,7 +624,7 @@ { get { - if (_L_Control == null) _L_Control = new Control(UiPanel, Instance.GetNodeOrNull("Control")); + if (_L_Control == null) _L_Control = new Control(UiPanel, Instance.GetNode("Control")); return _L_Control; } } @@ -725,7 +637,7 @@ { get { - if (_L_IconTitle == null) _L_IconTitle = new IconTitle(UiPanel, Instance.GetNodeOrNull("IconTitle")); + if (_L_IconTitle == null) _L_IconTitle = new IconTitle(UiPanel, Instance.GetNode("IconTitle")); return _L_IconTitle; } } @@ -738,7 +650,7 @@ { get { - if (_L_IdTitle == null) _L_IdTitle = new IdTitle(UiPanel, Instance.GetNodeOrNull("IdTitle")); + if (_L_IdTitle == null) _L_IdTitle = new IdTitle(UiPanel, Instance.GetNode("IdTitle")); return _L_IdTitle; } } @@ -751,7 +663,7 @@ { get { - if (_L_NameTitle == null) _L_NameTitle = new NameTitle(UiPanel, Instance.GetNodeOrNull("NameTitle")); + if (_L_NameTitle == null) _L_NameTitle = new NameTitle(UiPanel, Instance.GetNode("NameTitle")); return _L_NameTitle; } } @@ -764,7 +676,7 @@ { get { - if (_L_TypeTitle == null) _L_TypeTitle = new TypeTitle(UiPanel, Instance.GetNodeOrNull("TypeTitle")); + if (_L_TypeTitle == null) _L_TypeTitle = new TypeTitle(UiPanel, Instance.GetNode("TypeTitle")); return _L_TypeTitle; } } @@ -777,7 +689,7 @@ { get { - if (_L_WeightTitle == null) _L_WeightTitle = new WeightTitle(UiPanel, Instance.GetNodeOrNull("WeightTitle")); + if (_L_WeightTitle == null) _L_WeightTitle = new WeightTitle(UiPanel, Instance.GetNode("WeightTitle")); return _L_WeightTitle; } } @@ -790,7 +702,7 @@ { get { - if (_L_ExtraTitle == null) _L_ExtraTitle = new ExtraTitle(UiPanel, Instance.GetNodeOrNull("ExtraTitle")); + if (_L_ExtraTitle == null) _L_ExtraTitle = new ExtraTitle(UiPanel, Instance.GetNode("ExtraTitle")); return _L_ExtraTitle; } } @@ -875,7 +787,7 @@ { get { - if (_L_DeleteButton == null) _L_DeleteButton = new DeleteButton(UiPanel, Instance.GetNodeOrNull("DeleteButton")); + if (_L_DeleteButton == null) _L_DeleteButton = new DeleteButton(UiPanel, Instance.GetNode("DeleteButton")); return _L_DeleteButton; } } @@ -897,7 +809,7 @@ { get { - if (_L_ExpandButton == null) _L_ExpandButton = new ExpandButton(UiPanel, Instance.GetNodeOrNull("ExpandButton")); + if (_L_ExpandButton == null) _L_ExpandButton = new ExpandButton(UiPanel, Instance.GetNode("ExpandButton")); return _L_ExpandButton; } } @@ -910,7 +822,7 @@ { get { - if (_L_Icon == null) _L_Icon = new Icon(UiPanel, Instance.GetNodeOrNull("Icon")); + if (_L_Icon == null) _L_Icon = new Icon(UiPanel, Instance.GetNode("Icon")); return _L_Icon; } } @@ -923,7 +835,7 @@ { get { - if (_L_IdLabel == null) _L_IdLabel = new IdLabel(UiPanel, Instance.GetNodeOrNull("IdLabel")); + if (_L_IdLabel == null) _L_IdLabel = new IdLabel(UiPanel, Instance.GetNode("IdLabel")); return _L_IdLabel; } } @@ -936,7 +848,7 @@ { get { - if (_L_NameLabel == null) _L_NameLabel = new NameLabel(UiPanel, Instance.GetNodeOrNull("NameLabel")); + if (_L_NameLabel == null) _L_NameLabel = new NameLabel(UiPanel, Instance.GetNode("NameLabel")); return _L_NameLabel; } } @@ -949,7 +861,7 @@ { get { - if (_L_TypeLabel == null) _L_TypeLabel = new TypeLabel(UiPanel, Instance.GetNodeOrNull("TypeLabel")); + if (_L_TypeLabel == null) _L_TypeLabel = new TypeLabel(UiPanel, Instance.GetNode("TypeLabel")); return _L_TypeLabel; } } @@ -962,7 +874,7 @@ { get { - if (_L_LineEdit == null) _L_LineEdit = new LineEdit(UiPanel, Instance.GetNodeOrNull("LineEdit")); + if (_L_LineEdit == null) _L_LineEdit = new LineEdit(UiPanel, Instance.GetNode("LineEdit")); return _L_LineEdit; } } @@ -975,7 +887,7 @@ { get { - if (_L_CenterContainer == null) _L_CenterContainer = new CenterContainer(UiPanel, Instance.GetNodeOrNull("CenterContainer")); + if (_L_CenterContainer == null) _L_CenterContainer = new CenterContainer(UiPanel, Instance.GetNode("CenterContainer")); return _L_CenterContainer; } } @@ -988,7 +900,7 @@ /// /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer.MarkObject.VBoxContainer /// - public class VBoxContainer_5 : UiNode + public class VBoxContainer_4 : UiNode { /// /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer.MarkObject.HBoxContainer @@ -997,14 +909,14 @@ { get { - if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_3(UiPanel, Instance.GetNodeOrNull("HBoxContainer")); + if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_3(UiPanel, Instance.GetNode("HBoxContainer")); return _L_HBoxContainer; } } private HBoxContainer_3 _L_HBoxContainer; - public VBoxContainer_5(MapEditorCreateMarkPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) { } - public override VBoxContainer_5 Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate()); + public VBoxContainer_4(MapEditorCreateMarkPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) { } + public override VBoxContainer_4 Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate()); } /// @@ -1015,15 +927,15 @@ /// /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.Panel.MarginContainer.VBoxContainer.ScrollContainer.VBoxContainer /// - public VBoxContainer_5 L_VBoxContainer + public VBoxContainer_4 L_VBoxContainer { get { - if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_5(UiPanel, Instance.GetNodeOrNull("VBoxContainer")); + if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_4(UiPanel, Instance.GetNode("VBoxContainer")); return _L_VBoxContainer; } } - private VBoxContainer_5 _L_VBoxContainer; + private VBoxContainer_4 _L_VBoxContainer; public MarkObject(MapEditorCreateMarkPanel uiPanel, Godot.PanelContainer node) : base(uiPanel, node) { } public override MarkObject Clone() => new (UiPanel, (Godot.PanelContainer)Instance.Duplicate()); @@ -1041,7 +953,7 @@ { get { - if (_L_MarkObject == null) _L_MarkObject = new MarkObject(UiPanel, Instance.GetNodeOrNull("MarkObject")); + if (_L_MarkObject == null) _L_MarkObject = new MarkObject(UiPanel, Instance.GetNode("MarkObject")); return _L_MarkObject; } } @@ -1054,7 +966,7 @@ /// /// 类型: , 路径: MapEditorCreateMark.MarginContainer.VBoxContainer.Panel.MarginContainer.VBoxContainer /// - public class VBoxContainer_4 : UiNode + public class VBoxContainer_3 : UiNode { /// /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.Panel.MarginContainer.HBoxContainer @@ -1063,7 +975,7 @@ { get { - if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_2(UiPanel, Instance.GetNodeOrNull("HBoxContainer")); + if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_2(UiPanel, Instance.GetNode("HBoxContainer")); return _L_HBoxContainer; } } @@ -1076,14 +988,14 @@ { get { - if (_L_ScrollContainer == null) _L_ScrollContainer = new ScrollContainer(UiPanel, Instance.GetNodeOrNull("ScrollContainer")); + if (_L_ScrollContainer == null) _L_ScrollContainer = new ScrollContainer(UiPanel, Instance.GetNode("ScrollContainer")); return _L_ScrollContainer; } } private ScrollContainer _L_ScrollContainer; - public VBoxContainer_4(MapEditorCreateMarkPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) { } - public override VBoxContainer_4 Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate()); + public VBoxContainer_3(MapEditorCreateMarkPanel uiPanel, Godot.VBoxContainer node) : base(uiPanel, node) { } + public override VBoxContainer_3 Clone() => new (UiPanel, (Godot.VBoxContainer)Instance.Duplicate()); } /// @@ -1094,15 +1006,15 @@ /// /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.Panel.VBoxContainer /// - public VBoxContainer_4 L_VBoxContainer + public VBoxContainer_3 L_VBoxContainer { get { - if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_4(UiPanel, Instance.GetNodeOrNull("VBoxContainer")); + if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer_3(UiPanel, Instance.GetNode("VBoxContainer")); return _L_VBoxContainer; } } - private VBoxContainer_4 _L_VBoxContainer; + private VBoxContainer_3 _L_VBoxContainer; public MarginContainer_1(MapEditorCreateMarkPanel uiPanel, Godot.MarginContainer node) : base(uiPanel, node) { } public override MarginContainer_1 Clone() => new (UiPanel, (Godot.MarginContainer)Instance.Duplicate()); @@ -1120,7 +1032,7 @@ { get { - if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer_1(UiPanel, Instance.GetNodeOrNull("MarginContainer")); + if (_L_MarginContainer == null) _L_MarginContainer = new MarginContainer_1(UiPanel, Instance.GetNode("MarginContainer")); return _L_MarginContainer; } } @@ -1142,7 +1054,7 @@ { get { - if (_L_HBoxContainer3 == null) _L_HBoxContainer3 = new HBoxContainer3(UiPanel, Instance.GetNodeOrNull("HBoxContainer3")); + if (_L_HBoxContainer3 == null) _L_HBoxContainer3 = new HBoxContainer3(UiPanel, Instance.GetNode("HBoxContainer3")); return _L_HBoxContainer3; } } @@ -1155,7 +1067,7 @@ { get { - if (_L_AddMark == null) _L_AddMark = new AddMark(UiPanel, Instance.GetNodeOrNull("AddMark")); + if (_L_AddMark == null) _L_AddMark = new AddMark(UiPanel, Instance.GetNode("AddMark")); return _L_AddMark; } } @@ -1168,7 +1080,7 @@ { get { - if (_L_Panel == null) _L_Panel = new Panel(UiPanel, Instance.GetNodeOrNull("Panel")); + if (_L_Panel == null) _L_Panel = new Panel(UiPanel, Instance.GetNode("Panel")); return _L_Panel; } } @@ -1190,7 +1102,7 @@ { get { - if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer(UiPanel, Instance.GetNodeOrNull("VBoxContainer")); + if (_L_VBoxContainer == null) _L_VBoxContainer = new VBoxContainer(UiPanel, Instance.GetNode("VBoxContainer")); return _L_VBoxContainer; } } @@ -1221,7 +1133,7 @@ { get { - if (_L_ExpandGrid == null) _L_ExpandGrid = new ExpandGrid(UiPanel, Instance.GetNodeOrNull("ExpandGrid")); + if (_L_ExpandGrid == null) _L_ExpandGrid = new ExpandGrid(UiPanel, Instance.GetNode("ExpandGrid")); return _L_ExpandGrid; } } @@ -1261,7 +1173,7 @@ { get { - if (_L_AttrName == null) _L_AttrName = new AttrName(UiPanel, Instance.GetNodeOrNull("AttrName")); + if (_L_AttrName == null) _L_AttrName = new AttrName(UiPanel, Instance.GetNode("AttrName")); return _L_AttrName; } } @@ -1274,7 +1186,7 @@ { get { - if (_L_NumInput == null) _L_NumInput = new NumInput(UiPanel, Instance.GetNodeOrNull("NumInput")); + if (_L_NumInput == null) _L_NumInput = new NumInput(UiPanel, Instance.GetNode("NumInput")); return _L_NumInput; } } @@ -1341,7 +1253,7 @@ { get { - if (_L_SelectButton == null) _L_SelectButton = new SelectButton(UiPanel, Instance.GetNodeOrNull("SelectButton")); + if (_L_SelectButton == null) _L_SelectButton = new SelectButton(UiPanel, Instance.GetNode("SelectButton")); return _L_SelectButton; } } @@ -1354,7 +1266,7 @@ { get { - if (_L_ObjectIcon == null) _L_ObjectIcon = new ObjectIcon(UiPanel, Instance.GetNodeOrNull("ObjectIcon")); + if (_L_ObjectIcon == null) _L_ObjectIcon = new ObjectIcon(UiPanel, Instance.GetNode("ObjectIcon")); return _L_ObjectIcon; } } @@ -1367,7 +1279,7 @@ { get { - if (_L_ObjectName == null) _L_ObjectName = new ObjectName(UiPanel, Instance.GetNodeOrNull("ObjectName")); + if (_L_ObjectName == null) _L_ObjectName = new ObjectName(UiPanel, Instance.GetNode("ObjectName")); return _L_ObjectName; } } @@ -1380,7 +1292,7 @@ { get { - if (_L_DeleteButton == null) _L_DeleteButton = new DeleteButton_1(UiPanel, Instance.GetNodeOrNull("DeleteButton")); + if (_L_DeleteButton == null) _L_DeleteButton = new DeleteButton_1(UiPanel, Instance.GetNode("DeleteButton")); return _L_DeleteButton; } } @@ -1402,7 +1314,7 @@ { get { - if (_L_AttrName == null) _L_AttrName = new AttrName_1(UiPanel, Instance.GetNodeOrNull("AttrName")); + if (_L_AttrName == null) _L_AttrName = new AttrName_1(UiPanel, Instance.GetNode("AttrName")); return _L_AttrName; } } @@ -1415,7 +1327,7 @@ { get { - if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_4(UiPanel, Instance.GetNodeOrNull("HBoxContainer")); + if (_L_HBoxContainer == null) _L_HBoxContainer = new HBoxContainer_4(UiPanel, Instance.GetNode("HBoxContainer")); return _L_HBoxContainer; } } @@ -1457,34 +1369,19 @@ public SizeY S_SizeY => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_HBoxContainer3.L_VBoxContainer.L_HBoxContainer2.L_SizeY; /// - /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingContainer.PreloadingNameLabel + /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayContainer.DelayNameLabel /// - public PreloadingNameLabel S_PreloadingNameLabel => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_VBoxContainer.L_PreloadingContainer.L_PreloadingNameLabel; + public DelayNameLabel S_DelayNameLabel => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_DelayContainer.L_DelayNameLabel; /// - /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingContainer.PreloadingCheck + /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayContainer.DelayInput /// - public PreloadingCheck S_PreloadingCheck => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_VBoxContainer.L_PreloadingContainer.L_PreloadingCheck; + public DelayInput S_DelayInput => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_DelayContainer.L_DelayInput; /// - /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.PreloadingContainer + /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.DelayContainer /// - public PreloadingContainer S_PreloadingContainer => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_VBoxContainer.L_PreloadingContainer; - - /// - /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayContainer.DelayNameLabel - /// - public DelayNameLabel S_DelayNameLabel => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_VBoxContainer.L_DelayContainer.L_DelayNameLabel; - - /// - /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayContainer.DelayInput - /// - public DelayInput S_DelayInput => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_VBoxContainer.L_DelayContainer.L_DelayInput; - - /// - /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.HBoxContainer3.VBoxContainer.DelayContainer - /// - public DelayContainer S_DelayContainer => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_VBoxContainer.L_DelayContainer; + public DelayContainer S_DelayContainer => L_MarginContainer.L_VBoxContainer.L_HBoxContainer3.L_DelayContainer; /// /// 场景中唯一名称的节点, 节点类型: , 节点路径: MapEditorCreateMark.MarginContainer.VBoxContainer.AddMark diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs index 6a62b84..cbcf66d 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorCreateMark/MapEditorCreateMarkPanel.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Config; using Godot; -using UI.MapEditor; namespace UI.MapEditorCreateMark; @@ -9,6 +8,8 @@ { private UiGrid _grid; + private MarkInfo _markInfo; + private bool _preloading; public override void OnCreateUi() { @@ -19,8 +20,6 @@ //添加标记按钮 S_AddMark.Instance.Pressed += OnAddMark; - //提前加载按钮 - S_PreloadingCheck.Instance.Pressed += OnPreloadingCheck; _grid = new UiGrid(S_MarkObject, typeof(MarkObjectCell)); _grid.SetColumns(1); @@ -33,20 +32,47 @@ { _grid.Destroy(); } + + /// + /// 初始化面板数据, 用于创建数据 + /// + /// 是否提前加载 + public void InitData(bool preloading) + { + _preloading = preloading; + if (preloading) + { + S_DelayContainer.Instance.Visible = false; + } + else + { + S_DelayContainer.Instance.Visible = true; + } + } /// - /// 初始化面板数据 + /// 初始化面板数据, 用于编辑数据 /// - public void InitData(MarkInfo data) + /// 标记数据 + /// 是否提前加载 + public void InitData(MarkInfo data, bool preloading) { + _markInfo = data; + _preloading = preloading; S_SizeX.Instance.Value = data.Size.X; S_SizeY.Instance.Value = data.Size.Y; S_PosX.Instance.Value = data.Position.X; S_PosY.Instance.Value = data.Position.Y; - S_DelayInput.Instance.Value = data.DelayTime; - S_PreloadingCheck.Instance.ButtonPressed = data.Preloading; + if (preloading) + { + S_DelayContainer.Instance.Visible = false; + } + else + { + S_DelayContainer.Instance.Visible = true; + S_DelayInput.Instance.Value = data.DelayTime; + } _grid.SetDataList(data.MarkList.ToArray()); - OnPreloadingCheck(); } /// @@ -63,8 +89,7 @@ var data = new MarkInfo(); data.Position = new SerializeVector2(); data.MarkList = new List(); - data.Preloading = S_PreloadingCheck.Instance.ButtonPressed; - if (!data.Preloading) + if (!_preloading) { data.DelayTime = (float)S_DelayInput.Instance.Value; } @@ -132,18 +157,4 @@ Weight = 100 }); } - - //点击提前加载 - private void OnPreloadingCheck() - { - var buttonPressed = S_PreloadingCheck.Instance.ButtonPressed; - if (buttonPressed) //启用提前加载 - { - S_DelayContainer.Instance.Visible = false; - } - else //禁用提前加载 - { - S_DelayContainer.Instance.Visible = true; - } - } } diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorCreatePreinstall/MapEditorCreatePreinstallPanel.cs b/DungeonShooting_Godot/src/game/ui/mapEditorCreatePreinstall/MapEditorCreatePreinstallPanel.cs index 527e5d4..d4194fb 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorCreatePreinstall/MapEditorCreatePreinstallPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorCreatePreinstall/MapEditorCreatePreinstallPanel.cs @@ -8,6 +8,9 @@ { private RoomPreinstall _roomPreinstall; + /// + /// 初始化房间预设数据, 用于编辑预设 + /// public void InitData(RoomPreinstall preinstall) { _roomPreinstall = preinstall; @@ -40,12 +43,17 @@ } data.Remark = S_RemarkInput.Instance.Text; - data.WaveList = new List>(); data.Weight = (int)S_WeightInput.Instance.Value; - if (_roomPreinstall != null) + if (_roomPreinstall != null) //编辑数据 { data.WaveList = _roomPreinstall.WaveList; } + else //创建数据 + { + //预加载波 + data.InitWaveList(); + } + return data; } } diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs index 547d7f8..7e70305 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs @@ -35,7 +35,7 @@ } //延时时间 - if (data.MarkInfo.Preloading) + if (data.Preloading) { text += "\n提前加载"; } @@ -73,15 +73,15 @@ public override int OnSort(UiCell other) { - if (!Data.MarkInfo.Preloading && other.Data.MarkInfo.Preloading) + if (!Data.Preloading && other.Data.Preloading) { return 0; } - else if (Data.MarkInfo.Preloading) + else if (Data.Preloading) { return -1; } - else if (other.Data.MarkInfo.Preloading) + else if (other.Data.Preloading) { return 1; } diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs index e4d0dec..2b43d60 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs @@ -27,7 +27,7 @@ var array = new MapEditorMapMarkPanel.MarkCellData[data.Count]; for (var i = 0; i < data.Count; i++) { - array[i] = new MapEditorMapMarkPanel.MarkCellData(this, data[i]); + array[i] = new MapEditorMapMarkPanel.MarkCellData(this, data[i], Index == 0); } MarkGrid.SetDataList(array); //执行排序操作 @@ -36,7 +36,14 @@ public override void OnRefreshIndex() { - CellNode.L_WaveContainer.L_WaveButton.Instance.Text = $"第{Index + 1}波"; + if (Index == 0) + { + CellNode.L_WaveContainer.L_WaveButton.Instance.Text = $"提前加载波"; + } + else + { + CellNode.L_WaveContainer.L_WaveButton.Instance.Text = $"第{Index}波"; + } } public override void OnDestroy() @@ -48,7 +55,7 @@ private void OnAddMark() { //打开添加标记页面 - EditorWindowManager.ShowCreateMark(OnCreateMarkInfo); + EditorWindowManager.ShowCreateMark(Index == 0, OnCreateMarkInfo); } //创建的标记完成 @@ -56,7 +63,7 @@ { var preinstall = CellNode.UiPanel.GetSelectPreinstall(); preinstall.WaveList[Index].Add(markInfo); - MarkGrid.Add(new MapEditorMapMarkPanel.MarkCellData(this, markInfo)); + MarkGrid.Add(new MapEditorMapMarkPanel.MarkCellData(this, markInfo, Index == 0)); //添加标记工具 EventManager.EmitEvent(EventEnum.OnCreateMark, markInfo); //选中最后一个 diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs index 4e20c3b..a988874 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs @@ -15,13 +15,24 @@ public class MarkCellData { + /// + /// 所在的父级 Cell + /// public EditorWaveCell ParentCell; + /// + /// 标记数据对象 + /// public MarkInfo MarkInfo; + /// + /// 是否提前加载 + /// + public bool Preloading; - public MarkCellData(EditorWaveCell parentCell, MarkInfo markInfo) + public MarkCellData(EditorWaveCell parentCell, MarkInfo markInfo, bool preloading) { ParentCell = parentCell; MarkInfo = markInfo; + Preloading = preloading; } } @@ -144,7 +155,7 @@ { if (item.WaveList == null) { - item.WaveList = new List>(); + item.InitWaveList(); } optionButton.AddItem($"{item.Name} ({item.Weight})"); @@ -198,8 +209,10 @@ if (toolType == SelectToolType.Wave) //不需要显示编辑波数按钮 { S_DynamicTool.L_EditButton.Instance.Visible = false; + //预加载波不能删除 + S_DynamicTool.L_DeleteButton.Instance.Visible = uiCell.Index != 0; } - else + else //显示编辑按钮 { S_DynamicTool.L_EditButton.Instance.Visible = true; } @@ -392,7 +405,7 @@ { var dataMarkInfo = markCell.Data.MarkInfo; //打开编辑面板 - EditorWindowManager.ShowEditMark(dataMarkInfo, (mark) => + EditorWindowManager.ShowEditMark(dataMarkInfo, markCell.Data.Preloading, (mark) => { //为了引用不变, 所以这里使用克隆数据 dataMarkInfo.CloneFrom(mark);