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

feature/update-main-ui (#66)

Browse Source 
Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#66
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
This commit is contained in:
darknight
2021-06-03 22:18:50 +02:00
parent 1c45fac8cb
commit 0debe0d2d3
38 changed files with 676 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/UI/loading/Loading.gd
+1 -1
View File
@@ -1,4 +1,4 @@
extends Control
func _ready():
$VBoxContainer/Label.text = tr("LOADING")
get_node("LabelLoading").text = tr("LOADING")
scenes/UI/loading/Loading.tscn
+47 -43
View File
@@ -1,54 +1,58 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=5 format=2]
[ext_resource path="res://scenes/UI/loading/Loading.gd" type="Script" id=1]
[ext_resource path="res://scenes/UI/loading/parts/LoadingBare.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/UI/loading/parts/TopPart.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/UI/Background.tscn" type="PackedScene" id=3]
[node name="Control" type="CenterContainer"]
[sub_resource type="Animation" id=1]
resource_name = "BorderAnim"
tracks/0/type = "bezier"
tracks/0/path = NodePath("LoadingTopBorder:rect_position:x")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"points": PoolRealArray( ),
"times": PoolRealArray( )
}
tracks/1/type = "bezier"
tracks/1/path = NodePath("LoadingTopBorder:rect_position:y")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"points": PoolRealArray( -768, -0.25, 0, 1.01154, 306.838, -160.174, -1.02203, -283.071, 0.439946, 60.9141, -27.6065, -0.45336, -19.562, 0.536352, 17.1993, 0.362091, -0.538766, -0.968613, 0.25, 0 ),
"times": PoolRealArray( 0.1, 0.3, 0.6, 0.9 )
}
tracks/2/type = "bezier"
tracks/2/path = NodePath("LoadingBare:modulate:a")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"points": PoolRealArray( 0, -0.25, 0, 1.10651, 0.716757, 1, -1.59408, -0.0328361, 0.25, 0 ),
"times": PoolRealArray( 0, 0.4 )
}
[node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="."]
margin_left = 687.0
margin_top = 432.0
margin_right = 752.0
margin_bottom = 468.0
size_flags_horizontal = 3
size_flags_vertical = 3
alignment = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="BackgroundPicture" parent="." instance=ExtResource( 3 )]
[node name="Label" type="Label" parent="VBoxContainer"]
margin_right = 65.0
margin_bottom = 14.0
text = "Loading ..."
align = 1
[node name="LoadingTopBorder" parent="." instance=ExtResource( 2 )]
margin_top = 0.362091
margin_bottom = 0.362061
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
margin_top = 18.0
margin_right = 65.0
margin_bottom = 18.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="LoadingBare" parent="." instance=ExtResource( 1 )]
margin_top = 360.0
[node name="ProgressBar" type="ProgressBar" parent="VBoxContainer"]
margin_top = 22.0
margin_right = 65.0
margin_bottom = 36.0
max_value = 1.0
step = 0.1
rounded = true
[node name="ColorRect" type="ColorRect" parent="."]
margin_left = 720.0
margin_top = 450.0
margin_right = 720.0
margin_bottom = 450.0
color = Color( 0, 0, 0, 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="AnimLoading" type="AnimationPlayer" parent="."]
method_call_mode = 1
anims/BorderAnim = SubResource( 1 )
scenes/UI/loading/parts/BorderColor.tscn
+28
View File
@@ -0,0 +1,28 @@
[gd_scene format=2]
[node name="Tile" type="VBoxContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 3
[node name="MarginContainer" type="MarginContainer" parent="."]
margin_right = 1280.0
margin_bottom = 237.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="BorderLeft" type="ColorRect" parent="."]
margin_top = 241.0
margin_right = 1280.0
margin_bottom = 478.0
rect_min_size = Vector2( 0, 8 )
size_flags_horizontal = 3
size_flags_vertical = 3
color = Color( 0.74902, 0.701961, 0.65098, 1 )
[node name="MarginContainer2" type="MarginContainer" parent="."]
margin_top = 482.0
margin_right = 1280.0
margin_bottom = 720.0
size_flags_horizontal = 3
size_flags_vertical = 3
scenes/UI/loading/parts/LabelLoading.tscn
+32
View File
@@ -0,0 +1,32 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://assets/fonts/kirsty/kirsty_title.tres" type="DynamicFont" id=1]
[ext_resource path="res://scenes/UI/loading/Loading.gd" type="Script" id=2]
[node name="VBoxLoading" type="VBoxContainer"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -96.5
margin_top = -28.0
margin_right = 96.5
margin_bottom = 28.0
size_flags_horizontal = 0
size_flags_vertical = 0
custom_constants/separation = 0
alignment = 1
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="LabelLoading" type="Label" parent="."]
margin_right = 193.0
margin_bottom = 56.0
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 0.74902, 0.701961, 0.65098, 1 )
text = "loading"
align = 1
valign = 2
uppercase = true
scenes/UI/loading/parts/LoadingBare.tscn
+61
View File
@@ -0,0 +1,61 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/ui/themes/leather.theme" type="Theme" id=1]
[node name="LoadingBare" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
margin_right = 1280.0
margin_bottom = 237.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 241.0
margin_right = 1280.0
margin_bottom = 478.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="HSplitContainer" type="HSplitContainer" parent="VBoxContainer/HBoxContainer"]
margin_right = 238.0
margin_bottom = 237.0
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.3
[node name="ProgressBar" type="ProgressBar" parent="VBoxContainer/HBoxContainer"]
margin_left = 242.0
margin_right = 1037.0
margin_bottom = 237.0
size_flags_horizontal = 3
size_flags_vertical = 3
theme = ExtResource( 1 )
max_value = 1.0
step = 0.1
rounded = true
[node name="HSplitContainer2" type="HSplitContainer" parent="VBoxContainer/HBoxContainer"]
margin_left = 1041.0
margin_right = 1280.0
margin_bottom = 237.0
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.3
[node name="MarginContainer2" type="MarginContainer" parent="VBoxContainer"]
margin_top = 482.0
margin_right = 1280.0
margin_bottom = 720.0
size_flags_horizontal = 3
size_flags_vertical = 3
scenes/UI/loading/parts/TopPart.tscn
+87
View File
@@ -0,0 +1,87 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://scenes/UI/loading/parts/LabelLoading.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/UI/loading/parts/BorderColor.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/ui/themes/bck-hrz-grd.png" type="Texture" id=3]
[node name="LoadingBorder" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
grow_vertical = 2
rect_clip_content = true
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}
[node name="BackgroundGradient" type="VBoxContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
custom_constants/separation = 0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="BlackColor" type="ColorRect" parent="BackgroundGradient"]
margin_right = 1280.0
margin_bottom = 240.0
size_flags_horizontal = 3
size_flags_vertical = 3
color = Color( 0, 0, 0, 1 )
[node name="ColorRect" type="TextureRect" parent="BackgroundGradient"]
margin_top = 240.0
margin_right = 1280.0
margin_bottom = 480.0
size_flags_horizontal = 3
size_flags_vertical = 3
texture = ExtResource( 3 )
expand = true
__meta__ = {
"_edit_use_anchors_": false
}
[node name="MarginContainer" type="MarginContainer" parent="BackgroundGradient"]
margin_top = 480.0
margin_right = 1280.0
margin_bottom = 720.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="LabelAndBorder" type="HBoxContainer" parent="."]
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
margin_top = -30.0
margin_bottom = 30.0
rect_clip_content = true
size_flags_vertical = 5
custom_constants/separation = 20
alignment = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="BorderLeft" parent="LabelAndBorder" instance=ExtResource( 2 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 523.0
margin_bottom = 60.0
[node name="LabelLoading" parent="LabelAndBorder" instance=ExtResource( 1 )]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 543.0
margin_top = 0.0
margin_right = 736.0
margin_bottom = 56.0
[node name="BorderRight" parent="LabelAndBorder" instance=ExtResource( 2 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 756.0
margin_right = 1280.0
margin_bottom = 60.0