Przeglądaj źródła

trabalho na interface

galo 1 rok temu
rodzic
commit
a1dd50c790

+ 3 - 0
.import/coffeemilk.png-3b3944bab196201aececf8f03f39cb68.md5

@@ -0,0 +1,3 @@
+source_md5="9397f7c859f1a0e43a2fefb0bc9b939b"
+dest_md5="10c01e7cdc9c3a1a48640d414f8ad053"
+

BIN
.import/coffeemilk.png-3b3944bab196201aececf8f03f39cb68.stex


+ 3 - 0
.import/coffeemilk2.png-32d8ca7fd0a6555d4f281575fcbafe2d.md5

@@ -0,0 +1,3 @@
+source_md5="9397f7c859f1a0e43a2fefb0bc9b939b"
+dest_md5="873bf501bff660d8af7330a45ab69f82"
+

BIN
.import/coffeemilk2.png-32d8ca7fd0a6555d4f281575fcbafe2d.stex


+ 3 - 0
.import/logo.png-b31b2ea6758d8cc9ccd6d1a1783e6877.md5

@@ -0,0 +1,3 @@
+source_md5="f228ccbd7c3844faec58e1d0715428fe"
+dest_md5="f2517c688dc05a3072ac2cf20962aeda"
+

BIN
.import/logo.png-b31b2ea6758d8cc9ccd6d1a1783e6877.stex


+ 20 - 20
BrowseColumn.tscn

@@ -1,69 +1,69 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://BrowseColumn.gd" type="Script" id=1]
 
+[sub_resource type="StyleBoxFlat" id=1]
+bg_color = Color( 1, 1, 1, 0.188235 )
+
 [node name="BrowseColumn" type="PanelContainer"]
 anchor_right = 1.0
 margin_bottom = 14.0
+custom_styles/panel = SubResource( 1 )
 script = ExtResource( 1 )
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
-margin_left = 7.0
-margin_top = 7.0
-margin_right = 633.0
-margin_bottom = 27.0
+margin_right = 640.0
+margin_bottom = 20.0
 size_flags_horizontal = 3
 
 [node name="Name" type="Label" parent="HBoxContainer"]
 margin_top = 3.0
-margin_right = 101.0
+margin_right = 103.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "Name"
 
 [node name="IP" type="Label" parent="HBoxContainer"]
-margin_left = 105.0
+margin_left = 107.0
 margin_top = 3.0
-margin_right = 206.0
+margin_right = 210.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "IP"
 
 [node name="Port" type="Label" parent="HBoxContainer"]
-margin_left = 210.0
+margin_left = 214.0
 margin_top = 3.0
-margin_right = 311.0
+margin_right = 318.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "Port"
 
 [node name="Gamemode" type="Label" parent="HBoxContainer"]
-margin_left = 315.0
+margin_left = 322.0
 margin_top = 3.0
-margin_right = 416.0
+margin_right = 425.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "Gamemode"
 
 [node name="Map" type="Label" parent="HBoxContainer"]
-margin_left = 420.0
+margin_left = 429.0
 margin_top = 3.0
-margin_right = 521.0
+margin_right = 532.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "Map"
 
 [node name="Ping" type="Label" parent="HBoxContainer"]
-margin_left = 525.0
+margin_left = 536.0
 margin_top = 3.0
-margin_right = 626.0
+margin_right = 640.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "Ping"
 
 [node name="Button" type="Button" parent="."]
-margin_left = 7.0
-margin_top = 7.0
-margin_right = 633.0
-margin_bottom = 27.0
+margin_right = 640.0
+margin_bottom = 20.0
 flat = true

+ 1 - 0
Login.gd

@@ -32,6 +32,7 @@ func _on_Button_button_down():
 		client2.port = int($directconnect/VBoxContainer/HBoxContainer/LineEdit.get_text())
 	
 	get_parent().get_node("BrowserListClient/PanelContainer").hide()
+	get_node('../Uibackground').hide()
 	get_parent().add_child(client2)
 	pass # Replace with function body.
 

BIN
art/.coffeemilk.png-autosave.kra


BIN
art/coffeemilk.png


+ 35 - 0
art/coffeemilk.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/coffeemilk.png-3b3944bab196201aececf8f03f39cb68.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/coffeemilk.png"
+dest_files=[ "res://.import/coffeemilk.png-3b3944bab196201aececf8f03f39cb68.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

BIN
art/coffeemilk.png~


BIN
art/coffeemilk2.png


+ 35 - 0
art/coffeemilk2.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/coffeemilk2.png-32d8ca7fd0a6555d4f281575fcbafe2d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/coffeemilk2.png"
+dest_files=[ "res://.import/coffeemilk2.png-32d8ca7fd0a6555d4f281575fcbafe2d.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

BIN
art/logo.png


+ 35 - 0
art/logo.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/logo.png-b31b2ea6758d8cc9ccd6d1a1783e6877.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/logo.png"
+dest_files=[ "res://.import/logo.png-b31b2ea6758d8cc9ccd6d1a1783e6877.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

+ 129 - 28
main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=32 format=2]
+[gd_scene load_steps=39 format=2]
 
 [ext_resource path="res://Login.gd" type="Script" id=1]
 [ext_resource path="res://envarg.gd" type="Script" id=2]
@@ -17,6 +17,9 @@
 [ext_resource path="res://art/Medieval_Castle_Asset_Pack/Background/layers71.png" type="Texture" id=15]
 [ext_resource path="res://art/Medieval_Castle_Asset_Pack/Background/layers3.png" type="Texture" id=16]
 [ext_resource path="res://NPC/soldier/soldieranim.tscn" type="PackedScene" id=17]
+[ext_resource path="res://art/logo.png" type="Texture" id=18]
+[ext_resource path="res://art/coffeemilk.png" type="Texture" id=19]
+[ext_resource path="res://font/8bit.tres" type="DynamicFont" id=20]
 
 [sub_resource type="AtlasTexture" id=1]
 atlas = ExtResource( 10 )
@@ -64,6 +67,18 @@ shader = SubResource( 12 )
 shader_param/color1 = Color( 0, 0.835294, 1, 1 )
 shader_param/color2 = Color( 1, 0.678431, 0, 1 )
 
+[sub_resource type="StyleBoxFlat" id=15]
+bg_color = Color( 0, 0, 0, 0.501961 )
+
+[sub_resource type="StyleBoxFlat" id=16]
+bg_color = Color( 0, 0, 0, 0.741176 )
+
+[sub_resource type="StyleBoxFlat" id=17]
+bg_color = Color( 0, 0, 0, 1 )
+
+[sub_resource type="StyleBoxFlat" id=18]
+bg_color = Color( 0.14902, 0.14902, 0.14902, 1 )
+
 [sub_resource type="GDScript" id=14]
 script/source = "extends Node2D
 
@@ -180,6 +195,7 @@ render_target_v_flip = true
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin4"]
 modulate = Color( 1, 0, 0.984314, 1 )
 frames = SubResource( 5 )
+frame = 1
 speed_scale = 0.9
 playing = true
 offset = Vector2( 32, 32 )
@@ -202,11 +218,31 @@ script = ExtResource( 3 )
 [node name="Loginetcode" type="Node" parent="."]
 script = ExtResource( 6 )
 
+[node name="Uibackground" type="Node2D" parent="."]
+
+[node name="ColorRect2" type="TextureRect" parent="Uibackground"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_right = 640.0
+margin_bottom = 360.0
+texture = ExtResource( 19 )
+stretch_mode = 2
+
+[node name="TextureRect2" type="TextureRect" parent="Uibackground"]
+margin_left = 180.0
+margin_top = -60.0
+margin_right = 467.0
+margin_bottom = 202.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+texture = ExtResource( 18 )
+expand = true
+stretch_mode = 4
+
 [node name="LoginUI" type="Node" parent="."]
 script = ExtResource( 1 )
 
 [node name="directconnect" type="Control" parent="LoginUI"]
-visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 180.0
@@ -218,9 +254,10 @@ anchor_bottom = 1.0
 alignment = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="LoginUI/directconnect/VBoxContainer"]
-margin_top = 110.0
+visible = false
+margin_top = 156.0
 margin_right = 280.0
-margin_bottom = 134.0
+margin_bottom = 180.0
 alignment = 1
 
 [node name="LineEdit2" type="LineEdit" parent="LoginUI/directconnect/VBoxContainer/HBoxContainer"]
@@ -228,7 +265,9 @@ margin_right = 218.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-text = "127.0.0.1"
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
+text = "207.148.21.135"
 align = 1
 expand_to_text_length = true
 placeholder_text = "IP Adress"
@@ -237,32 +276,51 @@ placeholder_text = "IP Adress"
 margin_left = 222.0
 margin_right = 280.0
 margin_bottom = 24.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 text = "8081"
 align = 1
 placeholder_text = "Port"
 
 [node name="Button" type="Button" parent="LoginUI/directconnect/VBoxContainer"]
-margin_top = 138.0
+margin_top = 174.0
 margin_right = 280.0
-margin_bottom = 158.0
+margin_bottom = 186.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
 text = "connnect"
 
 [node name="Button2" type="Button" parent="LoginUI/directconnect/VBoxContainer"]
-margin_top = 162.0
+visible = false
+margin_top = 160.0
 margin_right = 280.0
-margin_bottom = 182.0
+margin_bottom = 180.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
 text = "create server"
 
 [node name="x509" type="Button" parent="LoginUI/directconnect/VBoxContainer"]
+visible = false
 margin_top = 186.0
 margin_right = 280.0
 margin_bottom = 206.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
 text = "x509 generate"
 
 [node name="CheckButton" type="CheckButton" parent="LoginUI/directconnect/VBoxContainer"]
-margin_top = 210.0
+visible = false
+margin_top = 172.0
 margin_right = 280.0
-margin_bottom = 250.0
+margin_bottom = 212.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 pressed = true
 text = "login"
 
@@ -276,6 +334,7 @@ margin_right = -180.0
 [node name="VBoxContainer" type="VBoxContainer" parent="LoginUI/loginscreen"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_right = 7.0
 alignment = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="LoginUI/loginscreen/VBoxContainer"]
@@ -289,6 +348,8 @@ margin_right = 287.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 align = 1
 expand_to_text_length = true
 placeholder_text = "username"
@@ -304,6 +365,8 @@ margin_right = 287.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 align = 1
 expand_to_text_length = true
 placeholder_text = "password"
@@ -315,32 +378,53 @@ margin_bottom = 209.0
 alignment = 1
 
 [node name="login" type="Button" parent="LoginUI/loginscreen/VBoxContainer/HBoxContainer3"]
-margin_right = 43.0
+margin_left = 88.0
+margin_right = 131.0
 margin_bottom = 20.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
 text = "login"
 
 [node name="register" type="Button" parent="LoginUI/loginscreen/VBoxContainer/HBoxContainer3"]
-margin_left = 47.0
-margin_right = 111.0
+margin_left = 135.0
+margin_right = 199.0
 margin_bottom = 20.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
 text = "Register"
 
 [node name="recover" type="Button" parent="LoginUI/loginscreen/VBoxContainer/HBoxContainer3"]
-margin_left = 115.0
-margin_right = 242.0
+visible = false
+margin_left = 137.0
+margin_right = 264.0
 margin_bottom = 20.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
 text = "Recover Password"
 
 [node name="back" type="Button" parent="LoginUI/loginscreen/VBoxContainer/HBoxContainer3"]
+visible = false
 margin_left = 246.0
 margin_right = 287.0
 margin_bottom = 20.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
 text = "back"
 
 [node name="Label2" type="Label" parent="LoginUI/loginscreen/VBoxContainer"]
 margin_top = 213.0
 margin_right = 287.0
 margin_bottom = 227.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 text = "status"
 
 [node name="register" type="Control" parent="LoginUI"]
@@ -366,6 +450,8 @@ margin_right = 280.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 align = 1
 expand_to_text_length = true
 placeholder_text = "username"
@@ -381,6 +467,8 @@ margin_right = 280.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 align = 1
 expand_to_text_length = true
 placeholder_text = "password"
@@ -396,6 +484,8 @@ margin_right = 280.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 align = 1
 expand_to_text_length = true
 placeholder_text = "comfirm password"
@@ -411,6 +501,8 @@ margin_right = 280.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 align = 1
 expand_to_text_length = true
 placeholder_text = "email"
@@ -422,21 +514,31 @@ margin_bottom = 237.0
 alignment = 1
 
 [node name="login2" type="Button" parent="LoginUI/register/VBoxContainer/HBoxContainer6"]
-margin_left = 83.0
-margin_right = 129.0
+margin_left = 88.0
+margin_right = 130.0
 margin_bottom = 20.0
-text = "Login"
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
+text = "Back"
 
 [node name="Register2" type="Button" parent="LoginUI/register/VBoxContainer/HBoxContainer6"]
-margin_left = 133.0
-margin_right = 197.0
+margin_left = 134.0
+margin_right = 191.0
 margin_bottom = 20.0
-text = "Register"
+custom_fonts/font = ExtResource( 20 )
+custom_styles/hover = SubResource( 16 )
+custom_styles/pressed = SubResource( 17 )
+custom_styles/normal = SubResource( 15 )
+text = "Submit"
 
 [node name="Label" type="Label" parent="LoginUI/register/VBoxContainer"]
 margin_top = 241.0
 margin_right = 280.0
 margin_bottom = 255.0
+custom_fonts/font = ExtResource( 20 )
+custom_styles/normal = SubResource( 15 )
 text = "status"
 
 [node name="envarg" type="Node" parent="."]
@@ -456,17 +558,16 @@ margin_left = 64.0
 margin_top = 36.0
 margin_right = -64.0
 margin_bottom = -36.0
+custom_styles/panel = SubResource( 18 )
 
 [node name="Table" type="VBoxContainer" parent="BrowserListClient/PanelContainer"]
-margin_left = 7.0
-margin_top = 7.0
-margin_right = 505.0
-margin_bottom = 281.0
+margin_right = 512.0
+margin_bottom = 288.0
 
 [node name="BrowseColumn" parent="BrowserListClient/PanelContainer/Table" instance=ExtResource( 7 )]
 anchor_right = 0.0
-margin_right = 498.0
-margin_bottom = 34.0
+margin_right = 512.0
+margin_bottom = 20.0
 clickable = false
 
 [node name="Timer" type="Timer" parent="BrowserListClient"]