mcg/mlpcardgame
2
0
Fork 0
Code Issues 23 Pull requests 1 Releases Wiki Activity

Fix titlescreen name

Browse source
This commit is contained in:
Hamcha 2019-07-03 22:22:55 +02:00
parent 19d27b7515
commit f7c14e668d
Signed by: hamcha
GPG key ID: A40413D21021EAEE
2 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Scenes/Scripts/SplashScreen.gd
View file

@ -10,5 +10,5 @@ func _ready():
func _process(delta): func _process(delta):
timeout -= delta timeout -= delta
if timeout <= 0: if timeout <= 0:
Loader.load_scene("res://Scenes/TitleIntro.tscn") Loader.load_scene("res://Scenes/TitleScreen.tscn")
set_process(false) set_process(false)

52
Scenes/TitleScreen.tscn
View file

@ -8,7 +8,7 @@
[sub_resource type="Animation" id=1] [sub_resource type="Animation" id=1]
resource_name = "FadeIn" resource_name = "FadeIn"
length = 3.5 length = 4.0
step = 0.05 step = 0.05
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("Intro/TS:position") tracks/0/path = NodePath("Intro/TS:position")
@ -17,7 +17,7 @@ tracks/0/loop_wrap = true
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/keys = { tracks/0/keys = {
"times": PoolRealArray( 0, 1.5, 2.9 ), "times": PoolRealArray( 0, 2.2, 3.6 ),
"transitions": PoolRealArray( 0.450625, 0.450625, 0.999999 ), "transitions": PoolRealArray( 0.450625, 0.450625, 0.999999 ),
"update": 0, "update": 0,
"values": [ Vector2( 655.393, 702.101 ), Vector2( 655.393, 702.101 ), Vector2( 656.979, 500 ) ] "values": [ Vector2( 655.393, 702.101 ), Vector2( 655.393, 702.101 ), Vector2( 656.979, 500 ) ]
@ -29,7 +29,7 @@ tracks/1/loop_wrap = true
tracks/1/imported = false tracks/1/imported = false
tracks/1/enabled = true tracks/1/enabled = true
tracks/1/keys = { tracks/1/keys = {
"times": PoolRealArray( 0, 1.5, 2.3 ), "times": PoolRealArray( 0, 2.2, 3 ),
"transitions": PoolRealArray( 1, 0.392292, 1 ), "transitions": PoolRealArray( 1, 0.392292, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
@ -41,7 +41,7 @@ tracks/2/loop_wrap = true
tracks/2/imported = false tracks/2/imported = false
tracks/2/enabled = true tracks/2/enabled = true
tracks/2/keys = { tracks/2/keys = {
"times": PoolRealArray( 0, 0.85, 1.15 ), "times": PoolRealArray( 0, 1.55, 1.85 ),
"transitions": PoolRealArray( 1, 0.5, 1 ), "transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 599.236, 504.842 ), Vector2( 599.236, 504.842 ), Vector2( 319.982, 603.216 ) ] "values": [ Vector2( 599.236, 504.842 ), Vector2( 599.236, 504.842 ), Vector2( 319.982, 603.216 ) ]
@ -53,7 +53,7 @@ tracks/3/loop_wrap = true
tracks/3/imported = false tracks/3/imported = false
tracks/3/enabled = true tracks/3/enabled = true
tracks/3/keys = { tracks/3/keys = {
"times": PoolRealArray( 0, 0.85, 1.15 ), "times": PoolRealArray( 0, 1.55, 1.85 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
@ -65,7 +65,7 @@ tracks/4/loop_wrap = true
tracks/4/imported = false tracks/4/imported = false
tracks/4/enabled = true tracks/4/enabled = true
tracks/4/keys = { tracks/4/keys = {
"times": PoolRealArray( 0, 0.3, 0.6 ), "times": PoolRealArray( 0, 1, 1.3 ),
"transitions": PoolRealArray( 1, 0.5, 1 ), "transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 559.227, 368.769 ), Vector2( 559.227, 368.769 ), Vector2( 299.012, 292.608 ) ] "values": [ Vector2( 559.227, 368.769 ), Vector2( 559.227, 368.769 ), Vector2( 299.012, 292.608 ) ]
@ -77,7 +77,7 @@ tracks/5/loop_wrap = true
tracks/5/imported = false tracks/5/imported = false
tracks/5/enabled = true tracks/5/enabled = true
tracks/5/keys = { tracks/5/keys = {
"times": PoolRealArray( 0, 0.3, 0.6 ), "times": PoolRealArray( 0, 1, 1.3 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
@ -89,7 +89,7 @@ tracks/6/loop_wrap = true
tracks/6/imported = false tracks/6/imported = false
tracks/6/enabled = true tracks/6/enabled = true
tracks/6/keys = { tracks/6/keys = {
"times": PoolRealArray( 0, 0.65, 0.95 ), "times": PoolRealArray( 0, 1.35, 1.65 ),
"transitions": PoolRealArray( 1, 0.5, 1 ), "transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 630.323, 392.166 ), Vector2( 630.323, 392.166 ), Vector2( 630.323, 247.779 ) ] "values": [ Vector2( 630.323, 392.166 ), Vector2( 630.323, 392.166 ), Vector2( 630.323, 247.779 ) ]
@ -101,7 +101,7 @@ tracks/7/loop_wrap = true
tracks/7/imported = false tracks/7/imported = false
tracks/7/enabled = true tracks/7/enabled = true
tracks/7/keys = { tracks/7/keys = {
"times": PoolRealArray( 0, 0.65, 0.95 ), "times": PoolRealArray( 0, 1.35, 1.65 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
@ -113,7 +113,7 @@ tracks/8/loop_wrap = true
tracks/8/imported = false tracks/8/imported = false
tracks/8/enabled = true tracks/8/enabled = true
tracks/8/keys = { tracks/8/keys = {
"times": PoolRealArray( 0, 1.1, 1.4 ), "times": PoolRealArray( 0, 1.8, 2.1 ),
"transitions": PoolRealArray( 1, 0.5, 1 ), "transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 767.327, 325.855 ), Vector2( 767.327, 325.855 ), Vector2( 1008.5, 278.254 ) ] "values": [ Vector2( 767.327, 325.855 ), Vector2( 767.327, 325.855 ), Vector2( 1008.5, 278.254 ) ]
@ -125,7 +125,7 @@ tracks/9/loop_wrap = true
tracks/9/imported = false tracks/9/imported = false
tracks/9/enabled = true tracks/9/enabled = true
tracks/9/keys = { tracks/9/keys = {
"times": PoolRealArray( 0, 1.1, 1.4 ), "times": PoolRealArray( 0, 1.8, 2.1 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
@ -137,7 +137,7 @@ tracks/10/loop_wrap = true
tracks/10/imported = false tracks/10/imported = false
tracks/10/enabled = true tracks/10/enabled = true
tracks/10/keys = { tracks/10/keys = {
"times": PoolRealArray( 0, 0.45, 0.75 ), "times": PoolRealArray( 0, 1.15, 1.45 ),
"transitions": PoolRealArray( 1, 0.5, 1 ), "transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 744.717, 476.045 ), Vector2( 744.717, 476.045 ), Vector2( 1008.5, 598.14 ) ] "values": [ Vector2( 744.717, 476.045 ), Vector2( 744.717, 476.045 ), Vector2( 1008.5, 598.14 ) ]
@ -149,7 +149,7 @@ tracks/11/loop_wrap = true
tracks/11/imported = false tracks/11/imported = false
tracks/11/enabled = true tracks/11/enabled = true
tracks/11/keys = { tracks/11/keys = {
"times": PoolRealArray( 0, 0.45, 0.75 ), "times": PoolRealArray( 0, 1.15, 1.45 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
@ -174,7 +174,7 @@ tracks/12/keys = {
"start_offset": 0.0, "start_offset": 0.0,
"stream": ExtResource( 3 ) "stream": ExtResource( 3 )
} ], } ],
"times": PoolRealArray( 0.35, 0.7, 1.15 ) "times": PoolRealArray( 1.05, 1.4, 1.85 )
} }
tracks/13/type = "audio" tracks/13/type = "audio"
tracks/13/path = NodePath("Intro/Channel2") tracks/13/path = NodePath("Intro/Channel2")
@ -196,7 +196,7 @@ tracks/13/keys = {
"start_offset": 0.0, "start_offset": 0.0,
"stream": ExtResource( 4 ) "stream": ExtResource( 4 )
} ], } ],
"times": PoolRealArray( 0.5, 0.9, 1.3 ) "times": PoolRealArray( 1.2, 1.6, 2 )
} }
tracks/14/type = "value" tracks/14/type = "value"
tracks/14/path = NodePath("Intro/ColorRect:material:shader_param/effect_strength") tracks/14/path = NodePath("Intro/ColorRect:material:shader_param/effect_strength")
@ -205,7 +205,7 @@ tracks/14/loop_wrap = true
tracks/14/imported = false tracks/14/imported = false
tracks/14/enabled = true tracks/14/enabled = true
tracks/14/keys = { tracks/14/keys = {
"times": PoolRealArray( 0, 2.55, 3.2 ), "times": PoolRealArray( 0, 3.25, 3.9 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ 0.0, 0.0, 1.0 ] "values": [ 0.0, 0.0, 1.0 ]
@ -213,7 +213,7 @@ tracks/14/keys = {
[sub_resource type="ShaderMaterial" id=2] [sub_resource type="ShaderMaterial" id=2]
shader = ExtResource( 5 ) shader = ExtResource( 5 )
shader_param/effect_strength = 1.0 shader_param/effect_strength = 0.0
[node name="TitleScreen" type="Control"] [node name="TitleScreen" type="Control"]
anchor_left = 0.5 anchor_left = 0.5
@ -229,42 +229,48 @@ script = ExtResource( 1 )
[node name="Intro" type="Node" parent="."] [node name="Intro" type="Node" parent="."]
[node name="RD" type="Sprite" parent="Intro"] [node name="RD" type="Sprite" parent="Intro"]
position = Vector2( 630.323, 247.779 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 630.323, 392.166 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
region_enabled = true region_enabled = true
region_rect = Rect2( 3.0625, -0.241745, 357.39, 576.697 ) region_rect = Rect2( 3.0625, -0.241745, 357.39, 576.697 )
[node name="FS" type="Sprite" parent="Intro"] [node name="FS" type="Sprite" parent="Intro"]
position = Vector2( 299.012, 292.608 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 559.227, 368.769 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
region_enabled = true region_enabled = true
region_rect = Rect2( 850.711, 1.36916, 538.217, 391.606 ) region_rect = Rect2( 850.711, 1.36916, 538.217, 391.606 )
[node name="AJ" type="Sprite" parent="Intro"] [node name="AJ" type="Sprite" parent="Intro"]
position = Vector2( 1008.5, 278.254 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 767.327, 325.855 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
region_enabled = true region_enabled = true
region_rect = Rect2( -7.22717, 592.3, 422.556, 379.131 ) region_rect = Rect2( -7.22717, 592.3, 422.556, 379.131 )
[node name="RR" type="Sprite" parent="Intro"] [node name="RR" type="Sprite" parent="Intro"]
position = Vector2( 1008.5, 598.14 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 744.717, 476.045 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
region_enabled = true region_enabled = true
region_rect = Rect2( 362.65, -8.27631, 466.841, 383.89 ) region_rect = Rect2( 362.65, -8.27631, 466.841, 383.89 )
[node name="PP" type="Sprite" parent="Intro"] [node name="PP" type="Sprite" parent="Intro"]
position = Vector2( 319.982, 603.216 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 599.236, 504.842 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
region_enabled = true region_enabled = true
region_rect = Rect2( 846.772, 430.27, 542.718, 340.81 ) region_rect = Rect2( 846.772, 430.27, 542.718, 340.81 )
[node name="TS" type="Sprite" parent="Intro"] [node name="TS" type="Sprite" parent="Intro"]
position = Vector2( 656.979, 500 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 655.393, 702.101 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
region_enabled = true region_enabled = true