From 98ff79ac1b61104486c87801d9a2e5ca2459bc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9D=8Exl?= <1911159016@qq.com> Date: Sat, 9 Dec 2023 20:06:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn index b636c80a..70a21c3c 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn @@ -118,7 +118,7 @@ tracks/2/path = NodePath("AnimatedSprite:rotation") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(-0.02, 0.14, 0.2, 1.14, 1.2, 1.36, 1.5), +"times": PackedFloat32Array(0, 0.14, 0.2, 1.14, 1.2, 1.36, 1.5), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1), "update": 0, "values": [0.0, -0.523599, 0.0, 0.0, -0.349066, -0.349066, 0.0] -- Gitee From 5b8d477c2e41a51aba3cb9063a459cb381cbc8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9D=8Exl?= <1911159016@qq.com> Date: Sat, 9 Dec 2023 23:05:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86Ui?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DungeonShooting_Godot/prefab/ui/Main.tscn | 12 ++---------- .../src/game/ui/mapEditorMapMark/EditorWaveCell.cs | 2 ++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/DungeonShooting_Godot/prefab/ui/Main.tscn b/DungeonShooting_Godot/prefab/ui/Main.tscn index 9d9742f8..adb11ae2 100644 --- a/DungeonShooting_Godot/prefab/ui/Main.tscn +++ b/DungeonShooting_Godot/prefab/ui/Main.tscn @@ -45,17 +45,13 @@ alignment = 1 [node name="Start" type="Button" parent="VBoxContainer/ButtonList"] custom_minimum_size = Vector2(0, 50) layout_mode = 2 -focus_neighbor_top = NodePath("../Exit") -focus_neighbor_bottom = NodePath("../Setting") theme = ExtResource("2_bbd6i") -text = "开始游戏 -" +theme_override_font_sizes/font_size = 32 +text = "开始游戏" [node name="Tools" type="Button" parent="VBoxContainer/ButtonList"] custom_minimum_size = Vector2(0, 50) layout_mode = 2 -focus_neighbor_top = NodePath("../Start") -focus_neighbor_bottom = NodePath("../Exit") theme = ExtResource("2_bbd6i") theme_override_font_sizes/font_size = 32 text = "开发者工具" @@ -63,8 +59,6 @@ text = "开发者工具" [node name="Setting" type="Button" parent="VBoxContainer/ButtonList"] custom_minimum_size = Vector2(0, 50) layout_mode = 2 -focus_neighbor_top = NodePath("../Start") -focus_neighbor_bottom = NodePath("../Exit") theme = ExtResource("2_bbd6i") theme_override_font_sizes/font_size = 32 text = "设置" @@ -72,8 +66,6 @@ text = "设置" [node name="Exit" type="Button" parent="VBoxContainer/ButtonList"] custom_minimum_size = Vector2(0, 50) layout_mode = 2 -focus_neighbor_top = NodePath("../Setting") -focus_neighbor_bottom = NodePath("../Start") theme = ExtResource("2_bbd6i") text = "退出" diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs index 85232f39..f03c09a4 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs @@ -20,6 +20,8 @@ public class EditorWaveCell : UiCell> MarkGrid.SetColumns(1); MarkGrid.SetHorizontalExpand(true); MarkGrid.SetCellOffset(new Vector2I(0, 5)); + + CellNode.Instance.CustomMinimumSize = Vector2.Zero; } public override void OnSetData(List data) -- Gitee From 70e2d40f6ab493200891c4f242e88d1d8ec33f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9D=8Exl?= <1911159016@qq.com> Date: Sun, 10 Dec 2023 13:47:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DungeonShooting_Godot/.gitignore | 3 ++- DungeonShooting_Godot/DungeonShooting.csproj | 2 +- DungeonShooting_Godot/export_presets.cfg | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DungeonShooting_Godot/.gitignore b/DungeonShooting_Godot/.gitignore index 5459f07c..407c74e4 100644 --- a/DungeonShooting_Godot/.gitignore +++ b/DungeonShooting_Godot/.gitignore @@ -2,4 +2,5 @@ /.import /.mono /.vs -/.godot \ No newline at end of file +/.godot +/build \ No newline at end of file diff --git a/DungeonShooting_Godot/DungeonShooting.csproj b/DungeonShooting_Godot/DungeonShooting.csproj index dd65ab8e..e069a755 100644 --- a/DungeonShooting_Godot/DungeonShooting.csproj +++ b/DungeonShooting_Godot/DungeonShooting.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 true diff --git a/DungeonShooting_Godot/export_presets.cfg b/DungeonShooting_Godot/export_presets.cfg index 0776df9a..dec7e9c6 100644 --- a/DungeonShooting_Godot/export_presets.cfg +++ b/DungeonShooting_Godot/export_presets.cfg @@ -7,8 +7,8 @@ dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" -exclude_filter="" -export_path="../../DungeonShooting_Export/android/DungeonShooting.apk" +exclude_filter="build/*" +export_path="build/android/build.apk" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false -- Gitee