Added better animation
This commit is contained in:
parent
4ec7adfbdf
commit
d590d22ab5
|
@ -1,10 +1,4 @@
|
||||||
extends AnimationPlayer
|
extends AnimationPlayer
|
||||||
|
|
||||||
func _ready() -> void:
|
|
||||||
play("text")
|
|
||||||
await get_tree().create_timer(2)
|
|
||||||
play("fadeIn")
|
|
||||||
|
|
||||||
|
|
||||||
func _on_exit_zone_player_exit() -> void:
|
func _on_exit_zone_player_exit() -> void:
|
||||||
play("fadeOut")
|
play("fadeOut")
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=9 format=3 uid="uid://dxojtfoa4jbe"]
|
[gd_scene load_steps=7 format=3 uid="uid://dxojtfoa4jbe"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://c3qi2ffmxsl8i" path="res://levels/levelOne/exit_zone.gd" id="1_2uwmc"]
|
[ext_resource type="Script" uid="uid://c3qi2ffmxsl8i" path="res://levels/levelOne/exit_zone.gd" id="1_2uwmc"]
|
||||||
[ext_resource type="Script" uid="uid://jeddvfkorpxu" path="res://levels/levelOne/animation_player.gd" id="2_h31ej"]
|
[ext_resource type="Script" uid="uid://jeddvfkorpxu" path="res://levels/levelOne/animation_player.gd" id="2_h31ej"]
|
||||||
|
@ -35,57 +35,19 @@ tracks/1/keys = {
|
||||||
tracks/2/type = "value"
|
tracks/2/type = "value"
|
||||||
tracks/2/imported = false
|
tracks/2/imported = false
|
||||||
tracks/2/enabled = true
|
tracks/2/enabled = true
|
||||||
tracks/2/path = NodePath("Label:position")
|
tracks/2/path = NodePath("Label:self_modulate")
|
||||||
tracks/2/interp = 1
|
tracks/2/interp = 1
|
||||||
tracks/2/loop_wrap = true
|
tracks/2/loop_wrap = true
|
||||||
tracks/2/keys = {
|
tracks/2/keys = {
|
||||||
"times": PackedFloat32Array(0),
|
"times": PackedFloat32Array(0),
|
||||||
"transitions": PackedFloat32Array(1),
|
"transitions": PackedFloat32Array(1),
|
||||||
"update": 0,
|
"update": 0,
|
||||||
"values": [Vector2(510, -39)]
|
"values": [Color(1, 1, 1, 1)]
|
||||||
}
|
|
||||||
|
|
||||||
[sub_resource type="Animation" id="Animation_a6hc6"]
|
|
||||||
resource_name = "fadeIn"
|
|
||||||
tracks/0/type = "value"
|
|
||||||
tracks/0/imported = false
|
|
||||||
tracks/0/enabled = true
|
|
||||||
tracks/0/path = NodePath("ColorRect:color")
|
|
||||||
tracks/0/interp = 1
|
|
||||||
tracks/0/loop_wrap = true
|
|
||||||
tracks/0/keys = {
|
|
||||||
"times": PackedFloat32Array(0, 1),
|
|
||||||
"transitions": PackedFloat32Array(1, 1),
|
|
||||||
"update": 0,
|
|
||||||
"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
|
|
||||||
}
|
|
||||||
tracks/1/type = "value"
|
|
||||||
tracks/1/imported = false
|
|
||||||
tracks/1/enabled = true
|
|
||||||
tracks/1/path = NodePath("ColorRect:modulate")
|
|
||||||
tracks/1/interp = 1
|
|
||||||
tracks/1/loop_wrap = true
|
|
||||||
tracks/1/keys = {
|
|
||||||
"times": PackedFloat32Array(0, 1),
|
|
||||||
"transitions": PackedFloat32Array(1, 1),
|
|
||||||
"update": 0,
|
|
||||||
"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
|
|
||||||
}
|
|
||||||
tracks/2/type = "value"
|
|
||||||
tracks/2/imported = false
|
|
||||||
tracks/2/enabled = true
|
|
||||||
tracks/2/path = NodePath("Label:position")
|
|
||||||
tracks/2/interp = 1
|
|
||||||
tracks/2/loop_wrap = true
|
|
||||||
tracks/2/keys = {
|
|
||||||
"times": PackedFloat32Array(0, 0.16, 0.57, 1),
|
|
||||||
"transitions": PackedFloat32Array(1, 1, 1, 1),
|
|
||||||
"update": 0,
|
|
||||||
"values": [Vector2(510, -39), Vector2(501.7, 297.66), Vector2(501.7, 297.66), Vector2(510, -39)]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[sub_resource type="Animation" id="Animation_e5775"]
|
[sub_resource type="Animation" id="Animation_e5775"]
|
||||||
resource_name = "fadeOut"
|
resource_name = "fadeOut"
|
||||||
|
length = 1.5
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
|
@ -93,7 +55,7 @@ tracks/0/path = NodePath("ColorRect:color")
|
||||||
tracks/0/interp = 1
|
tracks/0/interp = 1
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
"times": PackedFloat32Array(0, 1),
|
"times": PackedFloat32Array(0, 1.46667),
|
||||||
"transitions": PackedFloat32Array(1, 1),
|
"transitions": PackedFloat32Array(1, 1),
|
||||||
"update": 0,
|
"update": 0,
|
||||||
"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
|
"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
|
||||||
|
@ -105,34 +67,16 @@ tracks/1/path = NodePath("ColorRect:modulate")
|
||||||
tracks/1/interp = 1
|
tracks/1/interp = 1
|
||||||
tracks/1/loop_wrap = true
|
tracks/1/loop_wrap = true
|
||||||
tracks/1/keys = {
|
tracks/1/keys = {
|
||||||
"times": PackedFloat32Array(0, 1),
|
"times": PackedFloat32Array(0, 1.46667),
|
||||||
"transitions": PackedFloat32Array(1, 1),
|
"transitions": PackedFloat32Array(1, 1),
|
||||||
"update": 0,
|
"update": 0,
|
||||||
"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
|
"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
|
||||||
}
|
}
|
||||||
|
|
||||||
[sub_resource type="Animation" id="Animation_1pmln"]
|
|
||||||
resource_name = "text"
|
|
||||||
length = 2.0
|
|
||||||
tracks/0/type = "value"
|
|
||||||
tracks/0/imported = false
|
|
||||||
tracks/0/enabled = true
|
|
||||||
tracks/0/path = NodePath("Label:position")
|
|
||||||
tracks/0/interp = 1
|
|
||||||
tracks/0/loop_wrap = true
|
|
||||||
tracks/0/keys = {
|
|
||||||
"times": PackedFloat32Array(0, 0.22, 1.7, 2),
|
|
||||||
"transitions": PackedFloat32Array(1, 1, 1, 1),
|
|
||||||
"update": 0,
|
|
||||||
"values": [Vector2(510, -39), Vector2(518, 296), Vector2(518, 296), Vector2(499, -61)]
|
|
||||||
}
|
|
||||||
|
|
||||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_h31ej"]
|
[sub_resource type="AnimationLibrary" id="AnimationLibrary_h31ej"]
|
||||||
_data = {
|
_data = {
|
||||||
&"RESET": SubResource("Animation_h31ej"),
|
&"RESET": SubResource("Animation_h31ej"),
|
||||||
&"fadeIn": SubResource("Animation_a6hc6"),
|
&"fadeOut": SubResource("Animation_e5775")
|
||||||
&"fadeOut": SubResource("Animation_e5775"),
|
|
||||||
&"text": SubResource("Animation_1pmln")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[node name="exit" type="Node2D"]
|
[node name="exit" type="Node2D"]
|
||||||
|
@ -146,6 +90,7 @@ position = Vector2(-14, 18)
|
||||||
shape = SubResource("RectangleShape2D_jhhth")
|
shape = SubResource("RectangleShape2D_jhhth")
|
||||||
|
|
||||||
[node name="fadeOut" type="CanvasLayer" parent="."]
|
[node name="fadeOut" type="CanvasLayer" parent="."]
|
||||||
|
visible = false
|
||||||
|
|
||||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="fadeOut"]
|
[node name="AnimationPlayer" type="AnimationPlayer" parent="fadeOut"]
|
||||||
physics_interpolation_mode = 1
|
physics_interpolation_mode = 1
|
||||||
|
@ -154,13 +99,6 @@ libraries = {
|
||||||
}
|
}
|
||||||
script = ExtResource("2_h31ej")
|
script = ExtResource("2_h31ej")
|
||||||
|
|
||||||
[node name="Label" type="Label" parent="fadeOut"]
|
|
||||||
offset_left = 510.0
|
|
||||||
offset_top = -39.0
|
|
||||||
offset_right = 602.0
|
|
||||||
offset_bottom = -16.0
|
|
||||||
text = "placeholder"
|
|
||||||
|
|
||||||
[node name="ColorRect" type="ColorRect" parent="fadeOut"]
|
[node name="ColorRect" type="ColorRect" parent="fadeOut"]
|
||||||
modulate = Color(0, 0, 0, 1)
|
modulate = Color(0, 0, 0, 1)
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
|
@ -172,5 +110,12 @@ mouse_filter = 2
|
||||||
color = Color(0, 0, 0, 1)
|
color = Color(0, 0, 0, 1)
|
||||||
metadata/_edit_use_anchors_ = true
|
metadata/_edit_use_anchors_ = true
|
||||||
|
|
||||||
|
[node name="Label" type="Label" parent="fadeOut"]
|
||||||
|
offset_left = 510.0
|
||||||
|
offset_top = -39.0
|
||||||
|
offset_right = 602.0
|
||||||
|
offset_bottom = -16.0
|
||||||
|
text = "placeholder"
|
||||||
|
|
||||||
[connection signal="body_entered" from="exitZone" to="exitZone" method="_on_body_entered"]
|
[connection signal="body_entered" from="exitZone" to="exitZone" method="_on_body_entered"]
|
||||||
[connection signal="playerExit" from="exitZone" to="fadeOut/AnimationPlayer" method="_on_exit_zone_player_exit"]
|
[connection signal="playerExit" from="exitZone" to="fadeOut/AnimationPlayer" method="_on_exit_zone_player_exit"]
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
extends Area2D
|
extends Area2D
|
||||||
|
|
||||||
|
signal playerExit
|
||||||
var planetOne = preload("res://planets/planetOne/planetOne.tscn")
|
var planetOne = preload("res://planets/planetOne/planetOne.tscn")
|
||||||
var activated: bool = false
|
var activated: bool = false
|
||||||
|
|
||||||
|
@ -11,8 +12,6 @@ func levelComplete():
|
||||||
activated = true
|
activated = true
|
||||||
print("exit active")
|
print("exit active")
|
||||||
|
|
||||||
signal playerExit
|
|
||||||
|
|
||||||
func _on_body_entered(body: Node2D) -> void:
|
func _on_body_entered(body: Node2D) -> void:
|
||||||
if activated:
|
if activated:
|
||||||
emit_signal("playerExit")
|
emit_signal("playerExit")
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2,12 +2,16 @@ extends CharacterBody2D
|
||||||
|
|
||||||
const SPEED = 3.0
|
const SPEED = 3.0
|
||||||
var Progress
|
var Progress
|
||||||
|
var direction: Vector2
|
||||||
|
var animationFinished: bool = false
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
func _on_intro_animation_animation_finished(anim_name: StringName) -> void:
|
||||||
|
animationFinished = true
|
||||||
|
|
||||||
func _physics_process(delta: float) -> void:
|
func _physics_process(delta: float) -> void:
|
||||||
# Get the input direction and handle the movement/deceleration.
|
#Handles movement
|
||||||
# As good practice, you should replace UI actions with custom gameplay actions.
|
if animationFinished:
|
||||||
var direction := Input.get_vector("moveLeft", "moveRight", "moveUp", "moveDown")
|
direction = Input.get_vector("moveLeft", "moveRight", "moveUp", "moveDown")
|
||||||
move_and_collide(direction * SPEED)
|
move_and_collide(direction * SPEED)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user