diff --git a/DungeonShooting_Godot/.gitignore b/DungeonShooting_Godot/.gitignore index 5459f07..407c74e 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 dd65ab8..e069a75 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 0776df9..dec7e9c 100644 --- a/DungeonShooting_Godot/export_presets.cfg +++ b/DungeonShooting_Godot/export_presets.cfg @@ -7,8 +7,8 @@ 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 diff --git a/DungeonShooting_Godot/prefab/ui/Main.tscn b/DungeonShooting_Godot/prefab/ui/Main.tscn index 9d9742f..adb11ae 100644 --- a/DungeonShooting_Godot/prefab/ui/Main.tscn +++ b/DungeonShooting_Godot/prefab/ui/Main.tscn @@ -45,17 +45,13 @@ [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 @@ [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 @@ [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/prefab/weapon/Weapon0009.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn index b636c80..70a21c3 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn @@ -118,7 +118,7 @@ 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] diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs index 85232f3..f03c09a 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorWaveCell.cs @@ -20,6 +20,8 @@ MarkGrid.SetColumns(1); MarkGrid.SetHorizontalExpand(true); MarkGrid.SetCellOffset(new Vector2I(0, 5)); + + CellNode.Instance.CustomMinimumSize = Vector2.Zero; } public override void OnSetData(List data)