animation between scenes edited

diff --git a/scenes/SplashScreen.tscn b/scenes/SplashScreen.tscn
index 2aba58f57cf8d28b544a438585f1cdd9e9e4f7ad..d31cd45a0542f22ae2b70e5d708ff3154f306854 100644 (file)
--- a/scenes/SplashScreen.tscn
+++ b/scenes/SplashScreen.tscn
@@ -5,8 +5,8 @@
 [ext_resource type="Texture2D" uid="uid://c2hclus3idni7" path="res://assets/logo_made_with_godot.png" id="2_6njfd"]
 [ext_resource type="Texture2D" uid="uid://bwwrm5h5uvljd" path="res://assets/logo_backpain.png" id="3_w6fb6"]
 
-[sub_resource type="Animation" id="Animation_brjr2"]
-resource_name = "entrance"
+[sub_resource type="Animation" id="Animation_lsi77"]
+length = 0.001
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -14,10 +14,10 @@ tracks/0/path = NodePath("LogoMadeWithGodot:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.3663),
-"transitions": PackedFloat32Array(0.31864, 1),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [Vector2(517, 1090), Vector2(517, 488)]
+"values": [Vector2(517, 488)]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -26,10 +26,10 @@ tracks/1/path = NodePath("LogoBackpain:position")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0.5661, 0.999),
-"transitions": PackedFloat32Array(0.378929, 1),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [Vector2(1088, 1090), Vector2(1088, 424)]
+"values": [Vector2(1088, 424)]
 }
 tracks/2/type = "value"
 tracks/2/imported = false
@@ -38,14 +38,14 @@ tracks/2/path = NodePath("ColorRect/VerticalDivisor:scale")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0.4329, 0.666),
-"transitions": PackedFloat32Array(0.406126, 1),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [Vector2(1, 0), Vector2(1, 1)]
+"values": [Vector2(1, 1)]
 }
 
-[sub_resource type="Animation" id="Animation_lsi77"]
-length = 0.001
+[sub_resource type="Animation" id="Animation_brjr2"]
+resource_name = "entrance"
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -53,10 +53,10 @@ tracks/0/path = NodePath("LogoMadeWithGodot:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0, 0.3663),
+"transitions": PackedFloat32Array(0.31864, 1),
 "update": 0,
-"values": [Vector2(517, 488)]
+"values": [Vector2(517, 1090), Vector2(517, 488)]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -65,10 +65,10 @@ tracks/1/path = NodePath("LogoBackpain:position")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0.5661, 0.999),
+"transitions": PackedFloat32Array(0.378929, 1),
 "update": 0,
-"values": [Vector2(1088, 424)]
+"values": [Vector2(1088, 1090), Vector2(1088, 424)]
 }
 tracks/2/type = "value"
 tracks/2/imported = false
@@ -77,10 +77,10 @@ tracks/2/path = NodePath("ColorRect/VerticalDivisor:scale")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0.4329, 0.666),
+"transitions": PackedFloat32Array(0.406126, 1),
 "update": 0,
-"values": [Vector2(1, 1)]
+"values": [Vector2(1, 0), Vector2(1, 1)]
 }
 
 [sub_resource type="Animation" id="Animation_mltn6"]

diff --git a/scenes/main_menu.gd b/scenes/main_menu.gd
index d0643c2a118d75e282d5e157a29b938cf2b424a8..661353227390509ed5b6a59406ba2e53f83266d3 100644 (file)
--- a/scenes/main_menu.gd
+++ b/scenes/main_menu.gd
@@ -4,16 +4,6 @@ extends Control
 @onready var animation_player = $AnimationPlayer
 
 
-# Called when the node enters the scene tree for the first time.
-func _ready():
-       pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
-       pass
-
-
 func _on_animation_player_animation_finished(anim_name):
        if anim_name == "entrance":
                animation_player.play("logo_bounce")

diff --git a/scenes/splash_screen.gd b/scenes/splash_screen.gd
index c766b1cf5ce0a697fb802e4772e587a90163d40a..6bb871e5e2ebe2d8b6a5a7bfc0888dd8da714835 100644 (file)
--- a/scenes/splash_screen.gd
+++ b/scenes/splash_screen.gd
@@ -10,8 +10,9 @@ func _on_animation_player_animation_finished(anim_name):
        elif anim_name == "exit":
                SceneManager.change_scene("res://scenes/MainMenu.tscn",
                { 
-                       "speed": 1,
-                       "pattern": "diagonal"
+                       "speed": 2,
+                       "pattern": "diagonal",
+                       "wait_time": 0
                 })