From 4ab2591e79c2ff548380b0962ccc512561711e6c Mon Sep 17 00:00:00 2001 From: dise Date: Thu, 29 Feb 2024 19:49:33 +0300 Subject: [PATCH] Update UI --- scenes/HUD/choose_team.tscn | 154 +++++++++++++++++++++------------ scenes/HUD/hud.tscn | 2 +- scenes/HUD/menu.tscn | 165 ++++++++++++++++++------------------ 3 files changed, 187 insertions(+), 134 deletions(-) diff --git a/scenes/HUD/choose_team.tscn b/scenes/HUD/choose_team.tscn index 3f30abd..fe8deeb 100644 --- a/scenes/HUD/choose_team.tscn +++ b/scenes/HUD/choose_team.tscn @@ -4,13 +4,41 @@ [node name="ChooseTeam" type="Control"] layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="wallpaper" type="ColorRect" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0.0392157, 0.360784, 0.419608, 1) + +[node name="box" type="ColorRect" parent="."] +custom_minimum_size = Vector2(100, 200) +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 +offset_left = -250.0 +offset_top = -199.0 +offset_right = 250.0 +offset_bottom = 201.0 grow_horizontal = 2 grow_vertical = 2 +color = Color(0.117647, 0.117647, 0.117647, 1) + +[node name="background" type="Control" parent="."] +anchors_preset = 0 +offset_right = 1152.0 +offset_bottom = 650.0 [node name="Choose_team" type="Control" parent="."] layout_mode = 1 @@ -19,92 +47,106 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -20.0 -offset_top = -20.0 -offset_right = 20.0 -offset_bottom = 20.0 +offset_left = 13.0 +offset_top = -62.0 +offset_right = 53.0 +offset_bottom = -22.0 grow_horizontal = 2 grow_vertical = 2 +[node name="TextEdit" type="TextEdit" parent="Choose_team"] +layout_mode = 0 +offset_left = -203.0 +offset_top = -118.0 +offset_right = -143.0 +offset_bottom = -73.0 +theme_override_colors/background_color = Color(0.117647, 0.117647, 0.117647, 1) +text = "Teams" + [node name="CS" type="Control" parent="Choose_team"] layout_mode = 1 anchors_preset = 11 anchor_left = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = 37.0 -offset_right = 37.0 +offset_left = -268.0 +offset_top = -46.0 +offset_right = -103.0 +offset_bottom = -56.0 grow_horizontal = 0 grow_vertical = 2 [node name="Closed source" type="Label" parent="Choose_team/CS"] layout_mode = 0 -offset_left = 100.0 -offset_top = -100.0 -offset_right = 208.0 -offset_bottom = -77.0 +offset_top = 4.0 +offset_right = 108.0 +offset_bottom = 27.0 text = "Closed source " [node name="Select_CS" type="Button" parent="Choose_team/CS"] layout_mode = 0 -offset_left = 129.0 -offset_top = -77.0 -offset_right = 183.0 -offset_bottom = -46.0 +offset_left = 110.0 +offset_right = 164.0 +offset_bottom = 31.0 text = "Select " script = ExtResource("1_nua8c") [node name="OS" type="Control" parent="Choose_team"] layout_mode = 1 -anchors_preset = 9 +anchors_preset = 11 +anchor_left = 1.0 +anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = -130.0 -offset_right = -130.0 +offset_left = -268.0 +offset_top = -82.0 +offset_right = -98.0 +offset_bottom = -92.0 +grow_horizontal = 0 grow_vertical = 2 [node name="Open source" type="Label" parent="Choose_team/OS"] layout_mode = 0 -offset_left = -150.0 -offset_top = -100.0 -offset_right = -52.0 -offset_bottom = -77.0 -text = "Open source -" +offset_top = 4.0 +offset_right = 108.0 +offset_bottom = 27.0 +text = "Open source" [node name="Select_OS" type="Button" parent="Choose_team/OS"] layout_mode = 0 -offset_left = -129.0 -offset_top = -77.0 -offset_right = -75.0 -offset_bottom = -46.0 +offset_left = 110.0 +offset_right = 164.0 +offset_bottom = 31.0 text = "Select " script = ExtResource("1_nua8c") -[node name="Spectator" type="Control" parent="Choose_team"] +[node name="SP" type="Control" parent="Choose_team"] layout_mode = 1 -anchors_preset = 12 -anchor_top = 1.0 +anchors_preset = 11 +anchor_left = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 0 +offset_left = -268.0 +offset_top = -11.0 +offset_right = -98.0 +offset_bottom = -21.0 +grow_horizontal = 0 +grow_vertical = 2 -[node name="Spectator" type="Label" parent="Choose_team/Spectator"] +[node name="Spectator" type="Label" parent="Choose_team/SP"] layout_mode = 0 -offset_left = -33.0 -offset_right = 42.0 -offset_bottom = 23.0 +offset_top = 4.0 +offset_right = 108.0 +offset_bottom = 27.0 text = "Spectator" -[node name="Select_SP" type="Button" parent="Choose_team/Spectator"] +[node name="Select_SP" type="Button" parent="Choose_team/SP"] layout_mode = 0 -offset_left = -21.0 -offset_top = 23.0 -offset_right = 33.0 -offset_bottom = 54.0 +offset_left = 110.0 +offset_right = 164.0 +offset_bottom = 31.0 text = "Select " script = ExtResource("1_nua8c") @@ -112,11 +154,17 @@ script = ExtResource("1_nua8c") [node name="Choose_class_OS" type="Control" parent="."] visible = false layout_mode = 1 -anchors_preset = 0 -offset_left = -41.0 -offset_top = -139.0 -offset_right = -41.0 -offset_bottom = -139.0 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -215.0 +offset_top = -135.0 +offset_right = -215.0 +offset_bottom = -135.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="Class 1" type="Control" parent="Choose_class_OS"] layout_mode = 3 @@ -221,16 +269,18 @@ script = ExtResource("1_nua8c") [node name="Choose_class_CS" type="Control" parent="."] visible = false layout_mode = 1 -anchors_preset = 14 +anchors_preset = 8 +anchor_left = 0.5 anchor_top = 0.5 -anchor_right = 1.0 +anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -41.0 -offset_top = -139.0 -offset_right = -41.0 -offset_bottom = -139.0 +offset_left = -215.0 +offset_top = -135.0 +offset_right = -215.0 +offset_bottom = -135.0 grow_horizontal = 2 grow_vertical = 2 +metadata/_edit_use_anchors_ = true [node name="Class -1" type="Control" parent="Choose_class_CS"] layout_mode = 3 diff --git a/scenes/HUD/hud.tscn b/scenes/HUD/hud.tscn index 18e580d..713686b 100644 --- a/scenes/HUD/hud.tscn +++ b/scenes/HUD/hud.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://gxfhitfre2fj"] -[ext_resource type="Texture2D" uid="uid://c4pah1vj0aa4x" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="1_g1v70"] +[ext_resource type="Texture2D" uid="uid://vnk3r1p4ao3n" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="1_g1v70"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_mhtpk"] diff --git a/scenes/HUD/menu.tscn b/scenes/HUD/menu.tscn index 7cb2a85..5453c64 100644 --- a/scenes/HUD/menu.tscn +++ b/scenes/HUD/menu.tscn @@ -3,10 +3,10 @@ [ext_resource type="Script" path="res://scripts/ConnectButton.gd" id="1_nhpm2"] [ext_resource type="Script" path="res://scripts/TaskPanelButton.gd" id="1_yn6yn"] [ext_resource type="Script" path="res://scripts/Nickname.gd" id="2_5xejq"] -[ext_resource type="Texture2D" uid="uid://c4pah1vj0aa4x" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="2_mk5ih"] +[ext_resource type="Texture2D" uid="uid://dc6j05jqjwuo6" path="res://icon.png" id="4_ps4pi"] -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_eqsfo"] -texture = ExtResource("2_mk5ih") +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8m8o7"] +bg_color = Color(0.541176, 0.0352941, 0.627451, 1) [node name="Menu" type="Control"] layout_mode = 3 @@ -36,6 +36,7 @@ offset_top = -28.0 offset_bottom = 2.0 grow_horizontal = 2 grow_vertical = 0 +color = Color(0.117647, 0.117647, 0.117647, 1) [node name="buttons" type="Control" parent="ColorRect"] layout_mode = 1 @@ -94,10 +95,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -88.0 -offset_top = -72.0 -offset_right = 88.0 -offset_bottom = 72.0 +offset_left = -60.0 +offset_top = -40.0 +offset_right = 60.0 +offset_bottom = 40.0 grow_horizontal = 2 grow_vertical = 2 @@ -108,54 +109,20 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -125.0 -offset_top = -73.0 -offset_right = 75.0 -offset_bottom = 7.0 +offset_left = -60.0 +offset_top = -40.0 +offset_right = 60.0 +offset_bottom = 40.0 grow_horizontal = 2 grow_vertical = 2 -color = Color(0.509804, 0.509804, 0.509804, 1) - -[node name="ColorRect2" type="ColorRect" parent="DirectMenu"] -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -125.0 -offset_top = -102.0 -offset_right = 75.0 -offset_bottom = -72.0 -grow_horizontal = 2 -grow_vertical = 2 -color = Color(0.439216, 0.439216, 0.439216, 1) - -[node name="https" type="TextEdit" parent="DirectMenu"] -custom_minimum_size = Vector2(10, 0) -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -123.0 -offset_top = -100.0 -offset_right = -82.0 -offset_bottom = -75.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_colors/background_color = Color(0.231373, 0.231373, 0.231373, 1) -theme_override_colors/font_selected_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 9 -text = "https://" +color = Color(0.117647, 0.117647, 0.117647, 1) [node name="IP" type="TextEdit" parent="DirectMenu"] layout_mode = 2 -offset_left = 2.0 -offset_top = -28.0 -offset_right = 77.0 -offset_bottom = -3.0 +offset_left = 3.0 +offset_top = 10.0 +offset_right = 63.0 +offset_bottom = 35.0 pivot_offset = Vector2(1, 0) theme_override_colors/background_color = Color(0.231373, 0.231373, 0.231373, 1) theme_override_colors/font_selected_color = Color(0, 0, 0, 1) @@ -165,10 +132,10 @@ placeholder_text = "IP Address" [node name="Port" type="TextEdit" parent="DirectMenu"] layout_mode = 2 -offset_left = 95.0 -offset_top = -28.0 -offset_right = 145.0 -offset_bottom = -3.0 +offset_left = 66.0 +offset_top = 10.0 +offset_right = 116.0 +offset_bottom = 35.0 theme_override_colors/background_color = Color(0.231373, 0.231373, 0.231373, 1) theme_override_font_sizes/font_size = 9 text = "2390" @@ -177,48 +144,84 @@ placeholder_text = "Port [node name="Connect" type="Button" parent="DirectMenu"] layout_mode = 2 -offset_left = -25.0 -offset_top = 12.0 -offset_right = 147.0 -offset_bottom = 62.0 +offset_left = 10.0 +offset_top = 40.0 +offset_right = 110.0 +offset_bottom = 71.0 pivot_offset = Vector2(88, 24) text = "Connect" script = ExtResource("1_nhpm2") -[node name="Panel" type="Panel" parent="DirectMenu"] -layout_mode = 0 -offset_left = 146.0 -offset_top = -27.0 -offset_right = 161.0 -offset_bottom = -12.0 -theme_override_styles/panel = SubResource("StyleBoxTexture_eqsfo") - [node name="SettingsMenu" type="Control" parent="."] -anchors_preset = 0 -offset_right = 256.0 -offset_bottom = 128.0 +visible = false +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -100.0 +offset_top = -50.0 +offset_right = 100.0 +offset_bottom = 50.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="ColorRect2" type="ColorRect" parent="SettingsMenu"] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -100.0 +offset_top = -50.0 +offset_right = 100.0 +offset_bottom = 50.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0.117647, 0.117647, 0.117647, 1) [node name="Nickname" type="TextEdit" parent="SettingsMenu"] layout_mode = 0 -offset_left = 24.0 -offset_top = 56.0 -offset_right = 224.0 -offset_bottom = 96.0 +offset_left = 3.0 +offset_top = 58.0 +offset_right = 153.0 +offset_bottom = 98.0 placeholder_text = "Unnamed" [node name="Label" type="Label" parent="SettingsMenu"] layout_mode = 0 -offset_left = 48.0 -offset_top = 24.0 -offset_right = 205.0 -offset_bottom = 47.0 +offset_left = 24.0 +offset_top = 17.0 +offset_right = 181.0 +offset_bottom = 40.0 text = "Set player nickname" [node name="Set" type="Button" parent="SettingsMenu"] layout_mode = 0 -offset_left = 104.0 -offset_top = 104.0 -offset_right = 152.0 -offset_bottom = 120.0 +offset_left = 154.0 +offset_top = 57.0 +offset_right = 199.0 +offset_bottom = 97.0 text = "Set" script = ExtResource("2_5xejq") + +[node name="Panel" type="Panel" parent="."] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -50.0 +offset_top = -119.0 +offset_right = 50.0 +offset_bottom = -79.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_8m8o7") + +[node name="Icon" type="Sprite2D" parent="Panel"] +position = Vector2(45, 20) +texture = ExtResource("4_ps4pi")