From 2f1a2b38fe066138d9db11fe4282d6dac85fc8f4 Mon Sep 17 00:00:00 2001 From: Rendo Date: Sat, 12 Jul 2025 07:32:31 +0500 Subject: [PATCH] previews --- assets/sprites/zombies/previews.png | Bin 0 -> 6446 bytes assets/sprites/zombies/previews.png.import | 34 +++++++++++++++++++++ resources/zombies/basic.tres | 10 ++++-- resources/zombies/buckethead.tres | 10 ++++-- resources/zombies/conehead.tres | 10 ++++-- resources/zombies/hobo.tres | 10 ++++-- scenes/entities/Zombies/bucket_zombie.tscn | 3 -- scenes/entities/Zombies/cone_zombie.tscn | 30 +++++++++--------- scenes/entities/Zombies/hobo.tscn | 28 +++++++++-------- scenes/main_menu.tscn | 27 +++++++++++++++- scenes/sacrifice.tscn | 10 ++---- scripts/level/RuntimeLevelData.cs | 1 + 12 files changed, 123 insertions(+), 50 deletions(-) create mode 100644 assets/sprites/zombies/previews.png create mode 100644 assets/sprites/zombies/previews.png.import diff --git a/assets/sprites/zombies/previews.png b/assets/sprites/zombies/previews.png new file mode 100644 index 0000000000000000000000000000000000000000..cdfd0bd8755467633e8ecf65b48ef34532fe7e7b GIT binary patch literal 6446 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 literal 0 HcmV?d00001 diff --git a/assets/sprites/zombies/previews.png.import b/assets/sprites/zombies/previews.png.import new file mode 100644 index 0000000..4e0ece8 --- /dev/null +++ b/assets/sprites/zombies/previews.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5gpf2sodhn6e" +path="res://.godot/imported/previews.png-bf5734315ff51e6cede135bafe2c4975.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/zombies/previews.png" +dest_files=["res://.godot/imported/previews.png-bf5734315ff51e6cede135bafe2c4975.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/zombies/basic.tres b/resources/zombies/basic.tres index e9c1a67..cfa837e 100644 --- a/resources/zombies/basic.tres +++ b/resources/zombies/basic.tres @@ -1,8 +1,12 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://buvacn56kyy2p"] +[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://buvacn56kyy2p"] [ext_resource type="PackedScene" uid="uid://co11v3w8hbwgf" path="res://scenes/entities/Zombies/zombie.tscn" id="1_c2mq3"] [ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="1_k277m"] -[ext_resource type="Texture2D" uid="uid://dunlsp8tx7a4w" path="res://assets/sprites/zombies/Зондби.png" id="1_l6de4"] +[ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_l6de4"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_wu2q8"] +atlas = ExtResource("1_l6de4") +region = Rect2(0, 0, 43, 88) [resource] script = ExtResource("1_k277m") @@ -12,6 +16,6 @@ Cost = 1.0 Scene = ExtResource("1_c2mq3") ReloadTime = 1.0 ReloadProgress = 0.0 -Preview = ExtResource("1_l6de4") +Preview = SubResource("AtlasTexture_wu2q8") Layer = 1 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/resources/zombies/buckethead.tres b/resources/zombies/buckethead.tres index ad2983b..ef9c339 100644 --- a/resources/zombies/buckethead.tres +++ b/resources/zombies/buckethead.tres @@ -1,8 +1,12 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://dkhjlu7u0vny6"] +[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://dkhjlu7u0vny6"] [ext_resource type="PackedScene" uid="uid://xu4i6tmkv00a" path="res://scenes/entities/Zombies/bucket_zombie.tscn" id="1_lhcag"] [ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="1_sngfh"] -[ext_resource type="Texture2D" uid="uid://dunlsp8tx7a4w" path="res://assets/sprites/zombies/Зондби.png" id="1_ufs7s"] +[ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_ufs7s"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_drksh"] +atlas = ExtResource("1_ufs7s") +region = Rect2(137, 0, 47, 101) [resource] script = ExtResource("1_sngfh") @@ -12,6 +16,6 @@ Cost = 5.0 Scene = ExtResource("1_lhcag") ReloadTime = 1.0 ReloadProgress = 0.0 -Preview = ExtResource("1_ufs7s") +Preview = SubResource("AtlasTexture_drksh") Layer = 1 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/resources/zombies/conehead.tres b/resources/zombies/conehead.tres index a9b8fd8..637299f 100644 --- a/resources/zombies/conehead.tres +++ b/resources/zombies/conehead.tres @@ -1,9 +1,13 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://nceohd32fkxk"] +[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://nceohd32fkxk"] -[ext_resource type="Texture2D" uid="uid://dunlsp8tx7a4w" path="res://assets/sprites/zombies/Зондби.png" id="1_f7g7v"] +[ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_f7g7v"] [ext_resource type="PackedScene" uid="uid://hhjbqkjqpt7x" path="res://scenes/entities/Zombies/cone_zombie.tscn" id="1_llf5l"] [ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="1_sw7hj"] +[sub_resource type="AtlasTexture" id="AtlasTexture_q44xp"] +atlas = ExtResource("1_f7g7v") +region = Rect2(92, 0, 45, 106) + [resource] script = ExtResource("1_sw7hj") name_key = "conehead" @@ -12,6 +16,6 @@ Cost = 2.0 Scene = ExtResource("1_llf5l") ReloadTime = 1.0 ReloadProgress = 0.0 -Preview = ExtResource("1_f7g7v") +Preview = SubResource("AtlasTexture_q44xp") Layer = 1 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/resources/zombies/hobo.tres b/resources/zombies/hobo.tres index 96ffa0d..693c1a1 100644 --- a/resources/zombies/hobo.tres +++ b/resources/zombies/hobo.tres @@ -1,9 +1,13 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://c38vfdw5b60xw"] +[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://c38vfdw5b60xw"] [ext_resource type="PackedScene" uid="uid://bgqmwsb6ynm81" path="res://scenes/entities/Zombies/hobo.tscn" id="1_4myt6"] -[ext_resource type="Texture2D" uid="uid://dunlsp8tx7a4w" path="res://assets/sprites/zombies/Зондби.png" id="1_nt7w3"] +[ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_nt7w3"] [ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="1_u5qpq"] +[sub_resource type="AtlasTexture" id="AtlasTexture_73ahc"] +atlas = ExtResource("1_nt7w3") +region = Rect2(43, 0, 49, 95) + [resource] script = ExtResource("1_u5qpq") name_key = "hobo" @@ -12,6 +16,6 @@ Cost = 7.0 Scene = ExtResource("1_4myt6") ReloadTime = 1.0 ReloadProgress = 0.0 -Preview = ExtResource("1_nt7w3") +Preview = SubResource("AtlasTexture_73ahc") Layer = 1 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/scenes/entities/Zombies/bucket_zombie.tscn b/scenes/entities/Zombies/bucket_zombie.tscn index 753de64..2df1937 100644 --- a/scenes/entities/Zombies/bucket_zombie.tscn +++ b/scenes/entities/Zombies/bucket_zombie.tscn @@ -69,9 +69,6 @@ use_parent_material = false [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] scale = Vector2(0.999834, 0.999834) -[node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] -scale = Vector2(0.999831, 0.999831) - [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] use_parent_material = false diff --git a/scenes/entities/Zombies/cone_zombie.tscn b/scenes/entities/Zombies/cone_zombie.tscn index 605f830..c0607ce 100644 --- a/scenes/entities/Zombies/cone_zombie.tscn +++ b/scenes/entities/Zombies/cone_zombie.tscn @@ -41,7 +41,7 @@ _armor = NodePath("Armor") material = SubResource("ShaderMaterial_sat5k") [node name="RightUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="1"] -scale = Vector2(0.999836, 0.999836) +scale = Vector2(0.999835, 0.999835) [node name="RightLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="1"] scale = Vector2(0.999835, 0.999835) @@ -56,7 +56,7 @@ scale = Vector2(0.999834, 0.999834) scale = Vector2(0.999836, 0.999836) [node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] -scale = Vector2(0.999832, 0.999832) +scale = Vector2(0.999831, 0.999831) [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] scale = Vector2(0.999829, 0.999829) @@ -68,19 +68,19 @@ scale = Vector2(0.999825, 0.999825) scale = Vector2(0.999825, 0.999825) [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] -rotation = -0.109484 +position = Vector2(-9, -21) +rotation = 0.0487752 skew = -9.78708e-05 [node name="Head" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="3"] scale = Vector2(0.999829, 0.999829) -[node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] -position = Vector2(-2.73308, 2.35578) -rotation = -0.0509399 -scale = Vector2(0.999827, 0.999827) +[node name="Left_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="1"] +position = Vector2(-4, -8.99999) -[node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="1"] -scale = Vector2(0.999827, 0.999827) +[node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] +position = Vector2(-2.80745, 2.53167) +rotation = 0.0233037 [node name="Hat" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="4" node_paths=PackedStringArray("data")] position = Vector2(-2.5, -13.5) @@ -113,25 +113,25 @@ shape = SubResource("CircleShape2D_67t4t") scale = Vector2(0.999829, 0.999829) [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] -rotation = -0.0477755 +rotation = 0.129286 scale = Vector2(0.999998, 0.999998) [node name="Left_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" index="0"] -rotation = -0.135402 -scale = Vector2(0.999661, 0.999661) +rotation = -0.0996425 +scale = Vector2(0.99966, 0.99966) [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999829, 0.999829) [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] -scale = Vector2(0.999831, 0.999831) +scale = Vector2(0.99983, 0.99983) [node name="Eatbox" parent="." index="2"] _damage = SubResource("Resource_w70im") [node name="Mover" parent="." index="4"] _speed = SubResource("Resource_b6mal") -_speedControlMult = 1.05271 +_speedControlMult = 0.774692 [node name="Armor" type="Node" parent="." index="6"] script = ExtResource("3_5s7in") diff --git a/scenes/entities/Zombies/hobo.tscn b/scenes/entities/Zombies/hobo.tscn index 5b74f13..e967583 100644 --- a/scenes/entities/Zombies/hobo.tscn +++ b/scenes/entities/Zombies/hobo.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=61 format=3 uid="uid://bgqmwsb6ynm81"] +[gd_scene load_steps=62 format=3 uid="uid://bgqmwsb6ynm81"] [ext_resource type="PackedScene" uid="uid://co11v3w8hbwgf" path="res://scenes/entities/Zombies/zombie.tscn" id="1_fnu7s"] [ext_resource type="Shader" uid="uid://d0eo5uuj222c4" path="res://assets/shaders/CG_color_blender.gdshader" id="2_6qr4h"] +[ext_resource type="Script" uid="uid://bcc7skl7ts6sh" path="res://scripts/systems/effects/Effect.cs" id="2_b583s"] [ext_resource type="Resource" uid="uid://dsg1vjx76ifgu" path="res://resources/effects/GarlicEffect.tres" id="3_b583s"] [ext_resource type="Script" uid="uid://dt5uj25u0g6y3" path="res://scripts/particles/FallParticle.cs" id="3_tu6af"] [ext_resource type="Script" uid="uid://c5v2og85t7s6j" path="res://scripts/zombies/behaviours/HoboBehaviour.cs" id="4_5selg"] @@ -754,7 +755,7 @@ mult_value = 1.0 [node name="Hobo" node_paths=PackedStringArray("_armor") instance=ExtResource("1_fnu7s")] _armor = NodePath("CanArmor") MaxHP = 130.0 -_effectImmunities = [ExtResource("3_b583s")] +_effectImmunities = Array[ExtResource("2_b583s")]([ExtResource("3_b583s")]) [node name="CanvasGroup" parent="." index="0"] material = SubResource("ShaderMaterial_w8pya") @@ -775,7 +776,7 @@ texture = SubResource("AtlasTexture_b583s") scale = Vector2(0.99983, 0.99983) [node name="RightFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" index="0"] -scale = Vector2(0.999826, 0.999826) +scale = Vector2(0.999825, 0.999825) [node name="Right_Foot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg/RightFoot" index="0"] texture = SubResource("AtlasTexture_uoit3") @@ -784,19 +785,19 @@ texture = SubResource("AtlasTexture_uoit3") texture = SubResource("AtlasTexture_vn3j1") [node name="LeftUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="2"] -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999829, 0.999829) [node name="Left_Upper_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="0"] texture = SubResource("AtlasTexture_yb81c") [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.999829, 0.999829) [node name="Left_Lower_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="0"] texture = SubResource("AtlasTexture_nlwsb") [node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] -scale = Vector2(0.999819, 0.999819) +scale = Vector2(0.999818, 0.999818) [node name="Left_Foot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg/LeftFoot" index="0"] texture = SubResource("AtlasTexture_8y6c0") @@ -827,7 +828,7 @@ texture = SubResource("AtlasTexture_0s5wm") [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] position = Vector2(-9, -21) -rotation = 0.0584823 +rotation = 0.042342 scale = Vector2(1e-05, 1e-05) [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Tie" index="0"] @@ -869,18 +870,21 @@ scale = Vector2(0.999827, 0.999827) texture = SubResource("AtlasTexture_pjhfy") [node name="Right_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="0"] -position = Vector2(-16, -7.99999) +position = Vector2(-16, -8) + +[node name="Left_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="1"] +position = Vector2(-4, -9) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] position = Vector2(-3, 3) -rotation = -0.0951176 +rotation = -0.0688665 scale = Vector2(0.999827, 0.999827) texture = SubResource("AtlasTexture_7cvmi") offset = Vector2(-14, -2) [node name="Trashcan_lid" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="3"] z_index = -1 -position = Vector2(-0.00229764, -17.0131) +position = Vector2(-0.00229669, -17.0131) scale = Vector2(0.999828, 0.999828) texture = SubResource("AtlasTexture_n380g") offset = Vector2(-0.5, -0.5) @@ -908,7 +912,7 @@ scale = Vector2(0.999827, 0.999827) texture = SubResource("AtlasTexture_tebih") [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] -rotation = 0.0527558 +rotation = 0.0381959 scale = Vector2(0.999999, 0.999999) texture = SubResource("AtlasTexture_auxav") @@ -918,7 +922,7 @@ scale = Vector2(0.999652, 0.999652) texture = SubResource("AtlasTexture_dntsa") [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999829, 0.999829) [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] scale = Vector2(0.999822, 0.999822) diff --git a/scenes/main_menu.tscn b/scenes/main_menu.tscn index 7dde938..f47d938 100644 --- a/scenes/main_menu.tscn +++ b/scenes/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://bfstrli64u23y"] +[gd_scene load_steps=17 format=3 uid="uid://bfstrli64u23y"] [ext_resource type="Texture2D" uid="uid://dvldjlg0nr355" path="res://assets/sprites/atlases/atlas1.png" id="1_jk1qb"] [ext_resource type="Script" uid="uid://drru785m4eep" path="res://scripts/gui/main_menu_rich_text.gd" id="2_5dd4i"] @@ -34,6 +34,16 @@ texture_margin_top = 6.0 texture_margin_right = 6.0 texture_margin_bottom = 6.0 +[sub_resource type="GDScript" id="GDScript_flqon"] +resource_name = "version_label" +script/source = "extends Label + + +func _ready() -> void: + text = ProjectSettings.get_setting(\"application/config/version\") + +" + [node name="MainMenu" type="Control"] process_mode = 3 layout_mode = 3 @@ -178,6 +188,21 @@ bus = &"MusicBus" visible = false layout_mode = 1 +[node name="VersionLabel" type="Label" parent="."] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.823 +anchor_top = 0.957 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 0.199982 +offset_top = 0.199982 +grow_horizontal = 0 +grow_vertical = 0 +horizontal_alignment = 2 +vertical_alignment = 1 +script = SubResource("GDScript_flqon") + [connection signal="meta_clicked" from="PrototypeWindow/ScrollContainer/PrototypeNotification" to="PrototypeWindow/ScrollContainer/PrototypeNotification" method="_on_meta_clicked"] [connection signal="pressed" from="Buttons/GameButtons/PlayButton" to="Buttons" method="_on_play_button_pressed"] [connection signal="pressed" from="Buttons/GameButtons/ExitButton" to="Buttons" method="_on_exit_button_pressed"] diff --git a/scenes/sacrifice.tscn b/scenes/sacrifice.tscn index 0a2c43d..652cddc 100644 --- a/scenes/sacrifice.tscn +++ b/scenes/sacrifice.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=13 format=3 uid="uid://d2ut237hxscbo"] +[gd_scene load_steps=12 format=3 uid="uid://d2ut237hxscbo"] [ext_resource type="Texture2D" uid="uid://3m6opnieiyr2" path="res://assets/sprites/golden_bg.png" id="1_tsh0d"] [ext_resource type="Shader" uid="uid://d0rylce8i5xtg" path="res://assets/shaders/SACRIFICE.gdshader" id="2_b8skw"] -[ext_resource type="AudioStream" uid="uid://dwr53ucg07nla" path="res://assets/audio/music/Oliver Buckland - Dead God Graveyard .mp3" id="2_bijdt"] [ext_resource type="Texture2D" uid="uid://dfmi4cgn6hmsj" path="res://assets/sprites/gold.png" id="3_1ybnd"] +[ext_resource type="AudioStream" uid="uid://lshrnpdrhh77" path="res://assets/audio/music/Смешарики - 194. Метеоритный дождь.mp3" id="4_b8skw"] [sub_resource type="Gradient" id="Gradient_b8skw"] colors = PackedColorArray(0, 0, 0, 0, 1, 1, 1, 1) @@ -21,10 +21,6 @@ noise = SubResource("FastNoiseLite_1ybnd") shader = ExtResource("2_b8skw") shader_parameter/noise = SubResource("NoiseTexture2D_yu0ma") -[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_7l6qq"] -stream_count = 1 -stream_0 = ExtResource("2_bijdt") - [sub_resource type="Animation" id="Animation_1ybnd"] length = 0.001 tracks/0/type = "value" @@ -78,7 +74,7 @@ offset_bottom = 40.0 texture = ExtResource("3_1ybnd") [node name="Musicale" type="AudioStreamPlayer" parent="."] -stream = SubResource("AudioStreamPlaylist_7l6qq") +stream = ExtResource("4_b8skw") autoplay = true [node name="AnimationPlayer" type="AnimationPlayer" parent="."] diff --git a/scripts/level/RuntimeLevelData.cs b/scripts/level/RuntimeLevelData.cs index d7fb28c..f26c2e9 100644 --- a/scripts/level/RuntimeLevelData.cs +++ b/scripts/level/RuntimeLevelData.cs @@ -26,6 +26,7 @@ public partial class RuntimeLevelData : Node { Instance = this; GetTree().Paused = true; + Engine.TimeScale = 1.0; } #region Sun