next commit

1 files changed, 25 insertions, 12 deletions

diff --git a/ui/login.tscn b/ui/login.tscn
index 9cba3ca..4842c26 100644
--- a/ui/login.tscn
+++ b/ui/login.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=20 format=4 uid="uid://dser74lcd3a4g"]
 
 [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/login/backround.jpg" id="2_elmti"]
+[ext_resource type="Texture2D" uid="uid://cxd6dnc7s17vg" path="res://client_data/skin/login_background.jpg" id="2_elmti"]
 [ext_resource type="AudioStream" uid="uid://br8ujl4uxv14a" path="res://client_data/BGM/01.mp3" id="3_2nukd"]
 [ext_resource type="Theme" uid="uid://c5sm3yvuakj3b" path="res://ui/theme.tres" id="3_7ogdv"]
 [ext_resource type="PackedScene" uid="uid://cjcm2mai50thr" path="res://ui/bmp_texture_button.tscn" id="3_qemc0"]
@@ -16,7 +16,7 @@
 [ext_resource type="Texture2D" uid="uid://b13jh48hyjyrt" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/btn_next.bmp" id="14_pfdi0"]
 [ext_resource type="Texture2D" uid="uid://bo277gh8uyw1w" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/btn_next_b.bmp" id="15_38pxr"]
 [ext_resource type="Texture2D" uid="uid://qvmuk8xa3yej" path="res://client_data/data/texture/À¯ÀúÀÎÅÍÆäÀ̽º/btn_next_a.bmp" id="16_hqeko"]
-[ext_resource type="PackedScene" uid="uid://uo7qgv3ydh0q" path="res://ui/login/character_selection_status.tscn" id="16_tihdy"]
+[ext_resource type="PackedScene" uid="uid://bxbprntny8duj" path="res://ui/login/login_character_selection_list.tscn" id="16_tihdy"]
 [ext_resource type="PackedScene" uid="uid://swtqlba1wi3o" path="res://ui/window.tscn" id="17_mma3j"]
 
 [sub_resource type="AudioStreamWAV" id="AudioStreamWAV_f4kp2"]
@@ -72,6 +72,7 @@ theme_override_constants/margin_bottom = 15
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer"]
 layout_mode = 2
+theme_override_constants/separation = 6
 
 [node name="Username" type="HBoxContainer" parent="Login/Window/VBoxContainer/Body/MarginContainer/VBoxContainer"]
 layout_mode = 2
@@ -249,23 +250,35 @@ text = "Cancel"
 [node name="Window" parent="CharacterSelection" instance=ExtResource("17_mma3j")]
 layout_mode = 2
 
-[node name="MarginContainer" type="MarginContainer" parent="CharacterSelection/Window/VBoxContainer/Body" index="0"]
+[node name="HBoxContainer" type="HBoxContainer" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements" index="0"]
 layout_mode = 2
-theme_override_constants/margin_left = 64
-theme_override_constants/margin_top = 16
-theme_override_constants/margin_right = 64
-theme_override_constants/margin_bottom = 16
 
-[node name="VBoxContainer" type="VBoxContainer" parent="CharacterSelection/Window/VBoxContainer/Body/MarginContainer"]
+[node name="Label" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer"]
+texture_filter = 1
+layout_mode = 2
+theme = ExtResource("9_toei2")
+text = "Character Select"
+
+[node name="-" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer"]
+texture_filter = 1
 layout_mode = 2
-theme_override_constants/separation = 32
+theme = ExtResource("9_toei2")
+text = "-"
 
-[node name="CharacterList" type="HBoxContainer" parent="CharacterSelection/Window/VBoxContainer/Body/MarginContainer/VBoxContainer"]
+[node name="CharacterSelectionSlotLabel" type="Label" parent="CharacterSelection/Window/VBoxContainer/TitleBar/TitleBarElements/HBoxContainer"]
 unique_name_in_owner = true
+texture_filter = 1
+layout_mode = 2
+theme = ExtResource("9_toei2")
+
+[node name="MarginContainer" type="MarginContainer" parent="CharacterSelection/Window/VBoxContainer/Body" index="0"]
 layout_mode = 2
-theme_override_constants/separation = 32
+theme_override_constants/margin_left = 64
+theme_override_constants/margin_top = 16
+theme_override_constants/margin_right = 64
+theme_override_constants/margin_bottom = 16
 
-[node name="CharacterSelectionStatus" parent="CharacterSelection/Window/VBoxContainer/Body/MarginContainer/VBoxContainer" instance=ExtResource("16_tihdy")]
+[node name="CharacterSelectionList" parent="CharacterSelection/Window/VBoxContainer/Body/MarginContainer" instance=ExtResource("16_tihdy")]
 unique_name_in_owner = true
 layout_mode = 2