Fix merge

This commit is contained in:
2025-09-26 14:13:13 -07:00
parent 9107b8c570
commit 9f26b5fda7
8 changed files with 64 additions and 89 deletions

View File

@@ -2,21 +2,6 @@
[ext_resource type="Script" uid="uid://14e8mu48ed4" path="res://src/map/Map.cs" id="1_bw70o"]
[sub_resource type="Animation" id="Animation_g6eui"]
resource_name = "fade_in"
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)]
}
[sub_resource type="Animation" id="Animation_00xd7"]
length = 0.001
tracks/0/type = "value"
@@ -32,6 +17,21 @@ tracks/0/keys = {
"values": [Color(0, 0, 0, 1)]
}
[sub_resource type="Animation" id="Animation_g6eui"]
resource_name = "fade_in"
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)]
}
[sub_resource type="Animation" id="Animation_v14r0"]
resource_name = "fade_out"
tracks/0/type = "value"