krampus
/
gfolf2
generated from krampus/template-godot4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better organization for game setup screens

This commit is contained in:
Rob Kelly 2024-12-21 18:33:00 -07:00
parent e3b3ae5ad5
commit 7f0777a706
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ui/menus/title_screen/deathmatch_setup/deathmatch_setup.tscn
View File

@ -97,10 +97,11 @@ layout_mode = 2
theme_override_constants/margin_left = 32 theme_override_constants/margin_left = 32
theme_override_constants/margin_top = 32 theme_override_constants/margin_top = 32
theme_override_constants/margin_right = 32 theme_override_constants/margin_right = 32
theme_override_constants/margin_bottom = 92 theme_override_constants/margin_bottom = 32
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
layout_mode = 2 layout_mode = 2
theme_override_constants/separation = 16
[node name="Label" type="Label" parent="MarginContainer/VBoxContainer"] [node name="Label" type="Label" parent="MarginContainer/VBoxContainer"]
layout_mode = 2 layout_mode = 2
@ -226,36 +227,28 @@ layout_mode = 2
text = "DM_ADD_PLAYER" text = "DM_ADD_PLAYER"
horizontal_alignment = 1 horizontal_alignment = 1
[node name="SouthEast" type="MarginContainer" parent="."] [node name="Buttons" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 8
size_flags_vertical = 8
theme_override_constants/margin_left = 16
theme_override_constants/margin_top = 16
theme_override_constants/margin_right = 32
theme_override_constants/margin_bottom = 16
[node name="HBoxContainer" type="HBoxContainer" parent="SouthEast"]
layout_mode = 2 layout_mode = 2
theme_override_constants/separation = 16 theme_override_constants/separation = 16
alignment = 2
[node name="Cancel" type="Button" parent="SouthEast/HBoxContainer"] [node name="Cancel" type="Button" parent="MarginContainer/VBoxContainer/Buttons"]
layout_mode = 2 layout_mode = 2
theme_type_variation = &"CancelButton" theme_type_variation = &"CancelButton"
text = "UI_CANCEL" text = "UI_CANCEL"
[node name="Start" type="Button" parent="SouthEast/HBoxContainer"] [node name="Start" type="Button" parent="MarginContainer/VBoxContainer/Buttons"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
theme_type_variation = &"AlertButton" theme_type_variation = &"AlertButton"
text = "UI_START" text = "UI_START"
[node name="AnimationPlayer" type="AnimationPlayer" parent="SouthEast/HBoxContainer/Start"] [node name="AnimationPlayer" type="AnimationPlayer" parent="MarginContainer/VBoxContainer/Buttons/Start"]
libraries = { libraries = {
"": SubResource("AnimationLibrary_s1eyj") "": SubResource("AnimationLibrary_s1eyj")
} }
[connection signal="item_selected" from="MarginContainer/VBoxContainer/MapSelectContainer/MarginContainer/VBoxContainer/MapSelect" to="." method="check_start_conditions" unbinds=1] [connection signal="item_selected" from="MarginContainer/VBoxContainer/MapSelectContainer/MarginContainer/VBoxContainer/MapSelect" to="." method="check_start_conditions" unbinds=1]
[connection signal="pressed" from="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton" to="." method="_on_add_player_button_pressed"] [connection signal="pressed" from="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton" to="." method="_on_add_player_button_pressed"]
[connection signal="pressed" from="SouthEast/HBoxContainer/Cancel" to="." method="cancel"] [connection signal="pressed" from="MarginContainer/VBoxContainer/Buttons/Cancel" to="." method="cancel"]
[connection signal="pressed" from="SouthEast/HBoxContainer/Start" to="SouthEast/HBoxContainer/Start/AnimationPlayer" method="play" binds= ["fade_out"]] [connection signal="pressed" from="MarginContainer/VBoxContainer/Buttons/Start" to="MarginContainer/VBoxContainer/Buttons/Start/AnimationPlayer" method="play" binds= ["fade_out"]]

25
src/ui/menus/title_screen/practice_setup/practice_setup.tscn
View File

@ -116,10 +116,11 @@ layout_mode = 2
theme_override_constants/margin_left = 32 theme_override_constants/margin_left = 32
theme_override_constants/margin_top = 32 theme_override_constants/margin_top = 32
theme_override_constants/margin_right = 32 theme_override_constants/margin_right = 32
theme_override_constants/margin_bottom = 92 theme_override_constants/margin_bottom = 32
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
layout_mode = 2 layout_mode = 2
theme_override_constants/separation = 16
[node name="Label" type="Label" parent="MarginContainer/VBoxContainer"] [node name="Label" type="Label" parent="MarginContainer/VBoxContainer"]
layout_mode = 2 layout_mode = 2
@ -163,35 +164,27 @@ max_columns = 8
icon_mode = 0 icon_mode = 0
fixed_icon_size = Vector2i(64, 64) fixed_icon_size = Vector2i(64, 64)
[node name="SouthEast" type="MarginContainer" parent="."] [node name="Buttons" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 8
size_flags_vertical = 8
theme_override_constants/margin_left = 16
theme_override_constants/margin_top = 16
theme_override_constants/margin_right = 32
theme_override_constants/margin_bottom = 16
[node name="HBoxContainer" type="HBoxContainer" parent="SouthEast"]
layout_mode = 2 layout_mode = 2
theme_override_constants/separation = 16 theme_override_constants/separation = 16
alignment = 2
[node name="Cancel" type="Button" parent="SouthEast/HBoxContainer"] [node name="Cancel" type="Button" parent="MarginContainer/VBoxContainer/Buttons"]
layout_mode = 2 layout_mode = 2
theme_type_variation = &"CancelButton" theme_type_variation = &"CancelButton"
text = "UI_CANCEL" text = "UI_CANCEL"
[node name="Start" type="Button" parent="SouthEast/HBoxContainer"] [node name="Start" type="Button" parent="MarginContainer/VBoxContainer/Buttons"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
theme_type_variation = &"AlertButton" theme_type_variation = &"AlertButton"
text = "UI_START" text = "UI_START"
[node name="AnimationPlayer" type="AnimationPlayer" parent="SouthEast/HBoxContainer/Start"] [node name="AnimationPlayer" type="AnimationPlayer" parent="MarginContainer/VBoxContainer/Buttons/Start"]
libraries = { libraries = {
"": SubResource("AnimationLibrary_s1eyj") "": SubResource("AnimationLibrary_s1eyj")
} }
[connection signal="item_selected" from="MarginContainer/VBoxContainer/MapSelectContainer/MarginContainer/VBoxContainer/MapSelect" to="." method="check_start_conditions" unbinds=1] [connection signal="item_selected" from="MarginContainer/VBoxContainer/MapSelectContainer/MarginContainer/VBoxContainer/MapSelect" to="." method="check_start_conditions" unbinds=1]
[connection signal="pressed" from="SouthEast/HBoxContainer/Cancel" to="." method="cancel"] [connection signal="pressed" from="MarginContainer/VBoxContainer/Buttons/Cancel" to="." method="cancel"]
[connection signal="pressed" from="SouthEast/HBoxContainer/Start" to="SouthEast/HBoxContainer/Start/AnimationPlayer" method="play" binds= ["fade_out"]] [connection signal="pressed" from="MarginContainer/VBoxContainer/Buttons/Start" to="MarginContainer/VBoxContainer/Buttons/Start/AnimationPlayer" method="play" binds= ["fade_out"]]