darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix interaction menu

Browse Source
This commit is contained in:
Vaillant Jeremy
2021-05-15 00:35:15 +02:00
parent 2ce155385c
commit e5110d8d4f
7 changed files with 103 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/UI/UI_summary.tscn
+52 -51
View File
@@ -7,52 +7,52 @@
[ext_resource path="res://assets/ui/themes/button-summary-hover.jpg" type="Texture" id=5]
[ext_resource path="res://assets/fonts/kirsty/kirsty.tres" type="DynamicFont" id=7]
[sub_resource type="VisualShaderNodeVectorOp" id=12]
[sub_resource type="VisualShaderNodeVectorOp" id=1]
operator = 3
[sub_resource type="VisualShaderNodeInput" id=14]
input_name = "screen_uv"
[sub_resource type="VisualShaderNodeVectorDecompose" id=15]
output_port_for_preview = 1
[sub_resource type="VisualShaderNodeVectorScalarMix" id=16]
[sub_resource type="VisualShaderNodeColorConstant" id=17]
constant = Color( 0.2, 0.155, 0.11, 1 )
[sub_resource type="VisualShaderNodeColorOp" id=18]
[sub_resource type="VisualShaderNodeVectorScalarMix" id=19]
[sub_resource type="VisualShaderNodeScalarOp" id=20]
default_input_values = [ 0, 0.0, 1, 0.2 ]
operator = 2
[sub_resource type="VisualShaderNodeScalarOp" id=21]
default_input_values = [ 0, 0.0, 1, -1.0 ]
operator = 2
[sub_resource type="VisualShaderNodeInput" id=2]
input_name = "screen_uv"
[sub_resource type="VisualShaderNodeTexture" id=3]
[sub_resource type="VisualShaderNodeVectorDecompose" id=3]
output_port_for_preview = 1
[sub_resource type="VisualShaderNodeVectorScalarMix" id=4]
[sub_resource type="VisualShaderNodeColorConstant" id=5]
constant = Color( 0.2, 0.155, 0.11, 1 )
[sub_resource type="VisualShaderNodeColorOp" id=6]
[sub_resource type="VisualShaderNodeVectorScalarMix" id=7]
[sub_resource type="VisualShaderNodeScalarOp" id=8]
default_input_values = [ 0, 0.0, 1, 0.2 ]
operator = 2
[sub_resource type="VisualShaderNodeScalarOp" id=9]
default_input_values = [ 0, 0.0, 1, -1.0 ]
operator = 2
[sub_resource type="VisualShaderNodeInput" id=10]
input_name = "screen_uv"
[sub_resource type="VisualShaderNodeTexture" id=11]
texture = ExtResource( 4 )
texture_type = 1
[sub_resource type="VisualShaderNodeVectorCompose" id=6]
[sub_resource type="VisualShaderNodeVectorCompose" id=12]
default_input_values = [ 0, 0.0, 1, 0.0, 2, 1.0 ]
[sub_resource type="VisualShaderNodeScalarConstant" id=7]
[sub_resource type="VisualShaderNodeScalarConstant" id=13]
constant = 0.4
[sub_resource type="VisualShaderNodeVectorDecompose" id=8]
[sub_resource type="VisualShaderNodeVectorDecompose" id=14]
[sub_resource type="VisualShaderNodeScalarOp" id=9]
[sub_resource type="VisualShaderNodeScalarOp" id=15]
default_input_values = [ 0, 0.0, 1, 1.6 ]
operator = 3
[sub_resource type="VisualShader" id=4]
[sub_resource type="VisualShader" id=16]
code = "shader_type canvas_item;
uniform sampler2D tex_frg_4 : hint_albedo;
@@ -130,40 +130,40 @@ graph_offset = Vector2( -1049.92, -110.97 )
mode = 1
flags/light_only = false
nodes/fragment/0/position = Vector2( 2300, 540 )
nodes/fragment/3/node = SubResource( 2 )
nodes/fragment/3/node = SubResource( 10 )
nodes/fragment/3/position = Vector2( -2320, 660 )
nodes/fragment/4/node = SubResource( 3 )
nodes/fragment/4/node = SubResource( 11 )
nodes/fragment/4/position = Vector2( 60, 160 )
nodes/fragment/5/node = SubResource( 6 )
nodes/fragment/5/node = SubResource( 12 )
nodes/fragment/5/position = Vector2( -580, 720 )
nodes/fragment/6/node = SubResource( 7 )
nodes/fragment/6/node = SubResource( 13 )
nodes/fragment/6/position = Vector2( -2300, 800 )
nodes/fragment/7/node = SubResource( 8 )
nodes/fragment/7/node = SubResource( 14 )
nodes/fragment/7/position = Vector2( -1480, 700 )
nodes/fragment/8/node = SubResource( 9 )
nodes/fragment/8/node = SubResource( 15 )
nodes/fragment/8/position = Vector2( -960, 820 )
nodes/fragment/11/node = SubResource( 12 )
nodes/fragment/11/node = SubResource( 1 )
nodes/fragment/11/position = Vector2( -1860, 700 )
nodes/fragment/14/node = SubResource( 14 )
nodes/fragment/14/node = SubResource( 2 )
nodes/fragment/14/position = Vector2( 140, 980 )
nodes/fragment/15/node = SubResource( 15 )
nodes/fragment/15/node = SubResource( 3 )
nodes/fragment/15/position = Vector2( 580, 960 )
nodes/fragment/17/node = SubResource( 16 )
nodes/fragment/17/node = SubResource( 4 )
nodes/fragment/17/position = Vector2( 1240, 560 )
nodes/fragment/18/node = SubResource( 17 )
nodes/fragment/18/node = SubResource( 5 )
nodes/fragment/18/position = Vector2( 520, 620 )
nodes/fragment/19/node = SubResource( 18 )
nodes/fragment/19/node = SubResource( 6 )
nodes/fragment/19/position = Vector2( 840, 580 )
nodes/fragment/20/node = SubResource( 19 )
nodes/fragment/20/node = SubResource( 7 )
nodes/fragment/20/position = Vector2( 1780, 660 )
nodes/fragment/22/node = SubResource( 20 )
nodes/fragment/22/node = SubResource( 8 )
nodes/fragment/22/position = Vector2( 1260, 780 )
nodes/fragment/23/node = SubResource( 21 )
nodes/fragment/23/node = SubResource( 9 )
nodes/fragment/23/position = Vector2( 1080, 1080 )
nodes/fragment/connections = PoolIntArray( 8, 0, 5, 1, 7, 1, 8, 0, 7, 0, 5, 0, 5, 0, 4, 0, 3, 0, 11, 0, 6, 0, 11, 1, 11, 0, 7, 0, 14, 0, 15, 0, 4, 0, 17, 0, 15, 1, 17, 2, 4, 0, 19, 1, 18, 0, 19, 0, 19, 0, 17, 1, 4, 0, 22, 0, 20, 0, 0, 0, 15, 1, 23, 0, 22, 0, 20, 0, 15, 1, 20, 2, 17, 0, 20, 1 )
[sub_resource type="ShaderMaterial" id=5]
shader = SubResource( 4 )
[sub_resource type="ShaderMaterial" id=17]
shader = SubResource( 16 )
[node name="Summary" type="HBoxContainer"]
anchor_bottom = 1.0
@@ -174,7 +174,7 @@ __meta__ = {
}
[node name="PanelWood" type="Panel" parent="."]
material = SubResource( 5 )
material = SubResource( 17 )
margin_right = 350.0
margin_bottom = 900.0
rect_min_size = Vector2( 350, 0 )
@@ -197,16 +197,15 @@ margin_bottom = 237.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="TextureRect" type="TextureRect" parent="PanelWood/VBoxContainer/CenterContainer"]
[node name="TextureRect" type="TextureButton" parent="PanelWood/VBoxContainer/CenterContainer"]
margin_left = 111.0
margin_top = 54.0
margin_right = 239.0
margin_bottom = 182.0
size_flags_horizontal = 4
size_flags_vertical = 4
texture = ExtResource( 3 )
texture_normal = ExtResource( 3 )
stretch_mode = 3
flip_h = true
[node name="ButtonPuzzle" type="TextureButton" parent="PanelWood/VBoxContainer"]
margin_top = 267.0
@@ -216,6 +215,7 @@ size_flags_horizontal = 0
size_flags_vertical = 0
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 5 )
texture_focused = ExtResource( 5 )
__meta__ = {
"_editor_description_": ""
}
@@ -243,6 +243,7 @@ size_flags_horizontal = 0
size_flags_vertical = 0
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 5 )
texture_focused = ExtResource( 5 )
__meta__ = {
"_edit_use_anchors_": false
}
scenes/UI/choose_scenes/ChooseScene.gd
+3 -3
View File
@@ -56,9 +56,9 @@ func _get_resource(index, table, datas):
return datas[index].get_data()
func _apply_scene(name, thumb, resource):
$games/Container/HBoxContainer.add_child(_configure_vbox())
$Container/HBoxContainer.add_child(_configure_vbox())
_configure_button(thumb, resource, name)
$games/Container/HBoxContainer/VBoxContainer.add_child(_configure_label(name))
$Container/HBoxContainer/VBoxContainer.add_child(_configure_label(name))
func _configure_vbox():
var vbox = VBoxContainer.new()
@@ -74,7 +74,7 @@ func _configure_label(name):
func _configure_button(thumb, _resource, name):
var thumbnail = TextureButton.new()
$games/Container/HBoxContainer/VBoxContainer.add_child(thumbnail)
$Container/HBoxContainer/VBoxContainer.add_child(thumbnail)
thumbnail.set_normal_texture(load(thumb))
thumbnail.connect("pressed", self, "_on_"+name.to_lower()+"_pressed")
scenes/UI/choose_scenes/ChooseScene.tscn
+4 -2
View File
@@ -12,6 +12,7 @@ __meta__ = {
}
[node name="GridContainer" type="GridContainer" parent="."]
visible = false
margin_left = 645.0
margin_top = 298.0
margin_right = 795.0
@@ -48,8 +49,9 @@ margin_right = 720.0
margin_bottom = 450.0
[node name="HBoxContainer" type="VBoxContainer" parent="Container"]
margin_right = 824.0
margin_bottom = 300.0
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="pressed" from="GridContainer/WarCraft" to="." method="_on_WarCraft_pressed"]
[connection signal="pressed" from="GridContainer/Lightmap" to="." method="_on_Lightmap_pressed"]
scenes/UI/settings/Settings.gd
+2 -2
View File
@@ -20,8 +20,8 @@ func _apply_settings():
var lang = _get_settings_data("langue", Global.table_settings, Global.data_settings)
var gyro = _get_settings_data("gyroscope", Global.table_settings, Global.data_settings)
$CenterContainer/VBoxContainer/Langue/HBoxContainer/data.set_text(lang)
$CenterContainer/VBoxContainer/gyroscope/HBoxContainer/data.set_pressed(int(gyro) as bool)
#$CenterContainer/VBoxContainer/Langue/HBoxContainer/data.set_text(lang)
#$CenterContainer/VBoxContainer/gyroscope/HBoxContainer/data.set_pressed(int(gyro) as bool)
func _get_settings_data(name, table, datas):
for index in range(0, Global.table_settings.get_props_count()):