diff --git a/addons/pvzadventure/scenes/adventure_editor.tscn b/addons/pvzadventure/scenes/adventure_editor.tscn index 00a3f0f..6a7f9f3 100644 --- a/addons/pvzadventure/scenes/adventure_editor.tscn +++ b/addons/pvzadventure/scenes/adventure_editor.tscn @@ -41,6 +41,11 @@ script = ExtResource("2_d5hwn") [node name="FileDialog" type="FileDialog" parent="Editor/StatusBar/HBoxContainer/FileButton"] +[node name="Button" type="Button" parent="Editor/StatusBar/HBoxContainer"] +layout_mode = 2 +text = "Play" +flat = true + [node name="WorkArea" type="HSplitContainer" parent="Editor"] layout_mode = 2 size_flags_vertical = 3 diff --git a/assets/audio/music/Toxa/Unused.wav b/assets/audio/music/Toxa/Unused.wav new file mode 100644 index 0000000..30c0924 Binary files /dev/null and b/assets/audio/music/Toxa/Unused.wav differ diff --git a/assets/audio/music/Toxa/Unused.wav.import b/assets/audio/music/Toxa/Unused.wav.import new file mode 100644 index 0000000..69bfb49 --- /dev/null +++ b/assets/audio/music/Toxa/Unused.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c44gskf7yfesf" +path="res://.godot/imported/Unused.wav-2f2dac554870b53469f1bdb73d0c0e26.sample" + +[deps] + +source_file="res://assets/audio/music/Toxa/Unused.wav" +dest_files=["res://.godot/imported/Unused.wav-2f2dac554870b53469f1bdb73d0c0e26.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/audio/music/Toxa/Upcoming Serenity.wav b/assets/audio/music/Toxa/Upcoming Serenity.wav new file mode 100644 index 0000000..de357c7 Binary files /dev/null and b/assets/audio/music/Toxa/Upcoming Serenity.wav differ diff --git a/assets/audio/music/Toxa/Upcoming Serenity.wav.import b/assets/audio/music/Toxa/Upcoming Serenity.wav.import new file mode 100644 index 0000000..cda93ec --- /dev/null +++ b/assets/audio/music/Toxa/Upcoming Serenity.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cp7c8ys8sk2r0" +path="res://.godot/imported/Upcoming Serenity.wav-e270d55d84d3b3d770e21b978abdb52d.sample" + +[deps] + +source_file="res://assets/audio/music/Toxa/Upcoming Serenity.wav" +dest_files=["res://.godot/imported/Upcoming Serenity.wav-e270d55d84d3b3d770e21b978abdb52d.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sprites/atlases/atlas1.png b/assets/sprites/atlases/atlas1.png index 6027a0b..66ad649 100644 Binary files a/assets/sprites/atlases/atlas1.png and b/assets/sprites/atlases/atlas1.png differ diff --git a/scenes/main_menu.tscn b/scenes/main_menu.tscn index 5c434df..57e395f 100644 --- a/scenes/main_menu.tscn +++ b/scenes/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://bfstrli64u23y"] +[gd_scene load_steps=20 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"] @@ -11,7 +11,7 @@ [ext_resource type="Script" uid="uid://c36bj8u7jghc7" path="res://scripts/audio/ChannelPlayer.cs" id="7_7b55j"] [ext_resource type="Texture2D" uid="uid://drydueofrb448" path="res://assets/sprites/gui/almanach/book.tres" id="7_flqon"] [ext_resource type="AudioStream" uid="uid://bdx83fokp6kha" path="res://assets/audio/sfx/buttonclick.mp3" id="8_5pajh"] -[ext_resource type="AudioStream" uid="uid://djgyc7bbwcepp" path="res://assets/audio/music/Александр Зацепин - Увертюра.mp3" id="9_j7ex8"] +[ext_resource type="AudioStream" uid="uid://cp7c8ys8sk2r0" path="res://assets/audio/music/Toxa/Upcoming Serenity.wav" id="12_1ajci"] [ext_resource type="PackedScene" uid="uid://bvpt0q4j6nx18" path="res://scenes/gui/almanach.tscn" id="12_rcqid"] [ext_resource type="PackedScene" uid="uid://djfsa0pxqeoq1" path="res://scenes/gui/cursor_canvas_layer.tscn" id="14_1ajci"] @@ -36,6 +36,10 @@ texture_margin_top = 6.0 texture_margin_right = 6.0 texture_margin_bottom = 6.0 +[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_7b55j"] +stream_count = 1 +stream_0 = ExtResource("12_1ajci") + [sub_resource type="GDScript" id="GDScript_flqon"] resource_name = "version_label" script/source = "extends Label @@ -195,7 +199,7 @@ channel = "button" metadata/_custom_type_script = "uid://c36bj8u7jghc7" [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource("9_j7ex8") +stream = SubResource("AudioStreamPlaylist_7b55j") volume_db = -20.0 autoplay = true bus = &"MusicBus"