next commit

1 files changed, 104 insertions, 10 deletions

diff --git a/ui/login.tscn b/ui/login.tscn
index cc02910..c38df26 100644
--- a/ui/login.tscn
+++ b/ui/login.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=6 format=4 uid="uid://dser74lcd3a4g"]
 
-[ext_resource type="Script" uid="uid://br01f7npuosll" path="res://ui/login.gd" id="1_1m5cv"]
+[ext_resource type="Script" uid="uid://dqswsdaamfhbq" path="res://ui/login.gd" id="1_1m5cv"]
 [ext_resource type="Texture2D" uid="uid://cxd6dnc7s17vg" path="res://ui/backround.jpg" id="2_elmti"]
-[ext_resource type="AudioStream" uid="uid://br8ujl4uxv14a" path="res://data/BGM/01.mp3" id="3_2nukd"]
+[ext_resource type="AudioStream" uid="uid://br8ujl4uxv14a" path="res://client_data/BGM/01.mp3" id="3_2nukd"]
 [ext_resource type="PackedScene" uid="uid://c8uqw08hxfqlu" path="res://ui/chat_window.tscn" id="4_ah2a1"]
 
 [sub_resource type="AudioStreamWAV" id="AudioStreamWAV_f4kp2"]
@@ -40,30 +40,41 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="Login"]
+[node name="PanelContainer" type="PanelContainer" parent="Login"]
 layout_mode = 2
 
-[node name="Username" type="LineEdit" parent="Login/VBoxContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="Login/PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 8
+theme_override_constants/margin_top = 8
+theme_override_constants/margin_right = 8
+theme_override_constants/margin_bottom = 8
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Login/PanelContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="Username" type="LineEdit" parent="Login/PanelContainer/MarginContainer/VBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(100, 0)
 layout_mode = 2
 text = "dweipert"
 placeholder_text = "Username"
 
-[node name="Password" type="LineEdit" parent="Login/VBoxContainer"]
+[node name="Password" type="LineEdit" parent="Login/PanelContainer/MarginContainer/VBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(100, 0)
 layout_mode = 2
 text = "ragnarok"
 placeholder_text = "Password"
 
-[node name="Login" type="Button" parent="Login/VBoxContainer"]
+[node name="Login" type="Button" parent="Login/PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
 mouse_default_cursor_shape = 2
 text = "Login"
 
 [node name="CharacterServer" type="CenterContainer" parent="."]
 unique_name_in_owner = true
+visible = false
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -71,9 +82,30 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="CharacterServerList" type="VBoxContainer" parent="CharacterServer"]
+[node name="PanelContainer" type="PanelContainer" parent="CharacterServer"]
+custom_minimum_size = Vector2(100, 150)
+layout_mode = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="CharacterServer/PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 8
+theme_override_constants/margin_top = 8
+theme_override_constants/margin_right = 8
+theme_override_constants/margin_bottom = 8
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CharacterServer/PanelContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="CharacterServerList" type="VBoxContainer" parent="CharacterServer/PanelContainer/MarginContainer/VBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
+size_flags_vertical = 3
+
+[node name="CharacterServerBackButton" type="Button" parent="CharacterServer/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 8
+mouse_default_cursor_shape = 2
+text = "Cancel"
 
 [node name="CharacterSelection" type="CenterContainer" parent="."]
 unique_name_in_owner = true
@@ -85,11 +117,72 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="CharacterList" type="GridContainer" parent="CharacterSelection"]
+[node name="VBoxContainer" type="VBoxContainer" parent="CharacterSelection"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/VBoxContainer"]
+layout_mode = 2
+
+[node name="CharacterList" type="GridContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
 columns = 5
 
+[node name="CharacterInfo" type="VBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer"]
+custom_minimum_size = Vector2(75, 0)
+layout_mode = 2
+
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+layout_mode = 2
+text = "Info"
+horizontal_alignment = 1
+
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer"]
+layout_mode = 2
+text = "Base Level:"
+
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer"]
+layout_mode = 2
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer2"]
+layout_mode = 2
+text = "Job Level:"
+
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer2"]
+layout_mode = 2
+
+[node name="HBoxContainer4" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer4"]
+layout_mode = 2
+text = "Job:"
+
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer4"]
+layout_mode = 2
+
+[node name="HBoxContainer3" type="HBoxContainer" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer3"]
+layout_mode = 2
+text = "Str:"
+
+[node name="Label2" type="Label" parent="CharacterSelection/VBoxContainer/HBoxContainer/CharacterInfo/HBoxContainer3"]
+layout_mode = 2
+
+[node name="CharacterSelectionBackButton" type="Button" parent="CharacterSelection/VBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 8
+mouse_default_cursor_shape = 2
+text = "Cancel"
+
 [node name="ButtonClickSound" type="AudioStreamPlayer" parent="."]
 stream = SubResource("AudioStreamWAV_f4kp2")
 
@@ -98,7 +191,6 @@ stream = ExtResource("3_2nukd")
 
 [node name="ChatWindow" parent="." instance=ExtResource("4_ah2a1")]
 unique_name_in_owner = true
-visible = false
 layout_mode = 1
 anchors_preset = -1
 anchor_top = 0.829
@@ -109,4 +201,6 @@ offset_right = -31.0
 offset_bottom = 0.0
 grow_vertical = 0
 
-[connection signal="pressed" from="Login/VBoxContainer/Login" to="." method="_on_login_pressed"]
+[connection signal="pressed" from="Login/PanelContainer/MarginContainer/VBoxContainer/Login" to="." method="_on_login_pressed"]
+[connection signal="pressed" from="CharacterServer/PanelContainer/MarginContainer/VBoxContainer/CharacterServerBackButton" to="." method="_on_character_server_back_button_pressed"]
+[connection signal="pressed" from="CharacterSelection/VBoxContainer/CharacterSelectionBackButton" to="." method="_on_character_selection_back_button_pressed"]