Godot-sandbox/test-client-godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bidouille_de_scoui' into 'master'

Browse source 
ajout d'un fond blanc derriere la liste des personnage et changement du splash…

See merge request godot_sandbox/Test-client-godot!7
This commit is contained in:
osquallo 2018-10-11 17:02:39 +02:00
commit 2de2459411
7 changed files with 108 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
login_scene/character_creation_box.tscn
View file

@ -24,7 +24,7 @@ use_filter = true
font_data = ExtResource( 3 )
_sections_unfolded = [ "Extra Spacing", "Font", "Settings" ]
[node name="character_creation_box" type="MarginContainer" index="0"]
[node name="character_creation_box" type="MarginContainer"]
anchor_left = 0.0
anchor_top = 0.0
@ -41,7 +41,7 @@ size_flags_horizontal = 3
size_flags_vertical = 6
theme = ExtResource( 1 )
script = ExtResource( 2 )
_sections_unfolded = [ "Material", "Size Flags", "Theme", "custom_constants" ]
_sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme", "custom_constants" ]
[node name="nine_patch_rect" type="NinePatchRect" parent="." index="0"]
@ -64,6 +64,7 @@ _sections_unfolded = [ "Material", "Size Flags", "Theme", "Visibility" ]
[node name="margin_container" type="MarginContainer" parent="." index="1"]
editor/display_folded = true
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0

6
login_scene/character_selection_menu.gd
View file

@ -49,7 +49,7 @@ func update_character_slots():
var last_slot = 0
for section in config_file.get_sections():
useds_slot.append( int(section) )
if not self.character_box.has_node( "character_slots/slot_box_"+section ):
if not self.character_box.has_node( "character_slots/slots_box/slot_box_"+section ):
last_slot = int(section)
var character_name = config_file.get_value( section, "name" )
@ -61,7 +61,7 @@ func update_character_slots():
slot_box.size_flags_horizontal = SIZE_FILL
slot_box.size_flags_vertical = SIZE_EXPAND
slot_box.set( "custom_constants/separation", 8)
self.character_box.get_node( "character_slots" ).add_child( slot_box )
self.character_box.get_node( "character_slots/slots_box/" ).add_child( slot_box )
slot_box.connect( "mouse_entered", self, "_on_name_mouse_entered_pressed", [int(section)] )
var label_name = Label.new()
@ -93,7 +93,7 @@ func update_character_slots():
create_new_characer_button.name = "creation_button"
create_new_characer_button.text = "Créer"
create_new_characer_button.hint_tooltip = "Create a new character"
self.character_box.get_node( "character_slots" ).add_child( create_new_characer_button )
self.character_box.get_node( "character_slots/slots_box/" ).add_child( create_new_characer_button )
create_new_characer_button.connect( "pressed", self, "_on_create_pressed", [next_slot] )
func _on_create_pressed( slot ):

80
login_scene/character_selection_menu.tscn
View file

@ -21,7 +21,7 @@ resource_local_to_scene = true
flags = 0
viewport_path = NodePath("viewport")
[node name="character_selection_menu" type="Control"]
[node name="character_selection_menu" type="Control" index="0"]
anchor_left = 0.0
anchor_top = 0.0
@ -179,8 +179,8 @@ anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 8.0
margin_top = 8.0
margin_right = 1016.0
margin_bottom = 592.0
margin_right = 1272.0
margin_bottom = 712.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -192,32 +192,29 @@ _sections_unfolded = [ "Mouse", "Size Flags", "custom_constants" ]
[node name="character_slots" parent="margin_container/character_box" index="0" instance=ExtResource( 5 )]
margin_top = 275.0
margin_top = 335.0
margin_right = 64.0
margin_bottom = 308.0
size_flags_vertical = 6
custom_constants/separation = 8
_sections_unfolded = [ "Size Flags", "custom_constants" ]
margin_bottom = 368.0
[node name="character_creation_box" parent="margin_container/character_box" index="1" instance=ExtResource( 6 )]
visible = false
margin_left = 196.0
margin_top = 0.0
margin_right = 1008.0
margin_bottom = 584.0
margin_right = 748.0
margin_bottom = 704.0
size_flags_horizontal = 7
size_flags_vertical = 7
[node name="v_box_container" type="VBoxContainer" parent="margin_container/character_box" index="2"]
editor/display_folded = true
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 68.0
margin_right = 1008.0
margin_bottom = 584.0
margin_left = 634.0
margin_right = 1264.0
margin_bottom = 704.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -227,15 +224,37 @@ size_flags_vertical = 3
alignment = 0
_sections_unfolded = [ "Mouse", "Size Flags" ]
[node name="h_box_container" type="HBoxContainer" parent="margin_container/character_box/v_box_container" index="0"]
[node name="character_preview_image" type="TextureRect" parent="margin_container/character_box/v_box_container" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 382.0
margin_right = 558.0
margin_bottom = 32.0
margin_right = 630.0
margin_bottom = 668.0
rect_min_size = Vector2( 512, 512 )
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
mouse_default_cursor_shape = 0
size_flags_horizontal = 7
size_flags_vertical = 7
texture = SubResource( 1 )
expand = true
stretch_mode = 6
_sections_unfolded = [ "Axis Stretch", "Grow Direction", "Margin", "Mouse", "Rect", "Size Flags" ]
[node name="h_box_container" type="HBoxContainer" parent="margin_container/character_box/v_box_container" index="1"]
editor/display_folded = true
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 227.0
margin_top = 672.0
margin_right = 403.0
margin_bottom = 704.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -370,27 +389,6 @@ texture_normal = ExtResource( 13 )
texture_pressed = ExtResource( 14 )
_sections_unfolded = [ "Hint", "Textures" ]
[node name="character_preview_image" type="TextureRect" parent="margin_container/character_box/v_box_container" index="1"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 36.0
margin_right = 940.0
margin_bottom = 584.0
rect_min_size = Vector2( 512, 512 )
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
mouse_default_cursor_shape = 0
size_flags_horizontal = 7
size_flags_vertical = 7
texture = SubResource( 1 )
expand = true
stretch_mode = 6
_sections_unfolded = [ "Axis Stretch", "Grow Direction", "Margin", "Mouse", "Rect", "Size Flags" ]
[connection signal="return_button_pressed" from="margin_container/character_box/character_slots" to="." method="_on_character_slots_return_button_pressed"]
[connection signal="character_preview_need_update" from="margin_container/character_box/character_creation_box" to="." method="_on_character_creation_box_character_preview_need_update"]
@ -407,6 +405,8 @@ _sections_unfolded = [ "Axis Stretch", "Grow Direction", "Margin", "Mouse", "Rec
[connection signal="size_bar_changed" from="margin_container/character_box/character_creation_box" to="." method="_on_character_creation_box_size_bar_changed"]
[connection signal="resized" from="margin_container/character_box/v_box_container/character_preview_image" to="." method="_on_character_preview_image_resized"]
[connection signal="button_down" from="margin_container/character_box/v_box_container/h_box_container/turn_left" to="." method="_on_turn_left_button_down"]
[connection signal="button_up" from="margin_container/character_box/v_box_container/h_box_container/turn_left" to="." method="_on_turn_left_button_up"]
@ -425,6 +425,4 @@ _sections_unfolded = [ "Axis Stretch", "Grow Direction", "Margin", "Mouse", "Rec
[connection signal="toggled" from="margin_container/character_box/v_box_container/h_box_container/lights" to="." method="_on_lights_toggled"]
[connection signal="resized" from="margin_container/character_box/v_box_container/character_preview_image" to="." method="_on_character_preview_image_resized"]

2
login_scene/character_slots.gd
View file

@ -1,4 +1,4 @@
extends VBoxContainer
extends MarginContainer
signal return_button_pressed

63
login_scene/character_slots.tscn
View file

@ -1,9 +1,62 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=4 format=2]
[ext_resource path="res://login_scene/character_slots.gd" type="Script" id=1]
[node name="character_slots" type="VBoxContainer"]
[sub_resource type="Gradient" id=1]
offsets = PoolRealArray( 0 )
colors = PoolColorArray( 1, 1, 1, 0.5 )
[sub_resource type="GradientTexture" id=2]
flags = 4
gradient = SubResource( 1 )
width = 2048
[node name="character_slots" type="MarginContainer" index="0"]
self_modulate = Color( 1, 0, 0, 1 )
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 54.0
margin_bottom = 600.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 6
custom_constants/margin_right = 0
custom_constants/margin_top = 0
custom_constants/margin_left = 0
custom_constants/margin_bottom = 0
script = ExtResource( 1 )
_sections_unfolded = [ "Rect", "Size Flags", "Visibility", "custom_constants" ]
[node name="texture_rect" type="TextureRect" parent="." index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 54.0
margin_bottom = 600.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
mouse_default_cursor_shape = 0
size_flags_horizontal = 3
size_flags_vertical = 3
texture = SubResource( 2 )
expand = true
stretch_mode = 0
_sections_unfolded = [ "Size Flags" ]
[node name="slots_box" type="VBoxContainer" parent="." index="1"]
editor/display_folded = true
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
@ -17,9 +70,9 @@ mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
alignment = 0
script = ExtResource( 1 )
_sections_unfolded = [ "Size Flags" ]
[node name="return_button" type="Button" parent="." index="0"]
[node name="return_button" type="Button" parent="slots_box" index="0"]
anchor_left = 0.0
anchor_top = 0.0
@ -43,6 +96,6 @@ flat = false
align = 1
_sections_unfolded = [ "Mouse", "Size Flags" ]
[connection signal="pressed" from="return_button" to="." method="_on_return_button_pressed"]
[connection signal="pressed" from="slots_box/return_button" to="." method="_on_return_button_pressed"]

5
login_scene/login_scene.tscn
View file

@ -12,7 +12,7 @@
[ext_resource path="res://assets/GUI/images/Login-Khanat-settings-button.png" type="Texture" id=10]
[ext_resource path="res://assets/GUI/images/Login-Khanat-quit-button.png" type="Texture" id=11]
[node name="login_scene" type="Node" index="0"]
[node name="login_scene" type="Node"]
script = ExtResource( 1 )
@ -58,6 +58,7 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 0.0
margin_bottom = 61.0
rect_min_size = Vector2( 0, 61 )
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
@ -66,7 +67,7 @@ mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
alignment = 2
_sections_unfolded = [ "Rect", "Size Flags" ]
_sections_unfolded = [ "Mouse", "Rect", "Size Flags" ]
[node name="sound_button" type="TextureButton" parent="buttons" index="0"]

2
project.godot
View file

@ -12,7 +12,7 @@ config_version=3
config/name="Khanat"
run/main_scene="res://login_scene/login_scene.tscn"
boot_splash/image="res://assets/GUI/images/new_launcher_bg_0-1.png"
boot_splash/image="res://assets/GUI/images/Login-Khanat-background.png"
config/icon="res://icon.png"
[autoload]