From 3eaa959910edbc9f6b8be37e473d67e6b059a25c Mon Sep 17 00:00:00 2001 From: Dan Date: Sat, 11 May 2024 08:54:54 +0100 Subject: [PATCH] Update export path and level load steps, remove audio resources from levels, adjust main menu load steps and audio resources. - Updated export path to "build/web/index.html" - Adjusted level load steps for levels 1, 2, and 3 - Removed audio resources from levels - Modified main menu load steps and removed audio resources --- export_presets.cfg | 2 +- levels/level_1.tscn | 13 +------------ levels/level_2.tscn | 13 +------------ levels/level_3.tscn | 13 +------------ scenes/main_menu.tscn | 13 +------------ scenes/scene_manager.tscn | 14 +++++++++++++- 6 files changed, 18 insertions(+), 50 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 36abaa7..b079a43 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="" +export_path="build/web/index.html" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false diff --git a/levels/level_1.tscn b/levels/level_1.tscn index 7e9c660..eb753e4 100644 --- a/levels/level_1.tscn +++ b/levels/level_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://dalh10tit6qg"] +[gd_scene load_steps=15 format=3 uid="uid://dalh10tit6qg"] [ext_resource type="PackedScene" uid="uid://dn6aa6f2f4g4i" path="res://components/RulesComponent.tscn" id="1_g1iu7"] [ext_resource type="Script" path="res://levels/scripts/level_1.gd" id="1_jrhhc"] @@ -14,8 +14,6 @@ [ext_resource type="PackedScene" uid="uid://b7eeptlk47ymd" path="res://ui/UiComponent.tscn" id="11_ndtvv"] [ext_resource type="PackedScene" uid="uid://ct3c16xm33r2a" path="res://scenes/elements/drone_manager.tscn" id="12_37aah"] [ext_resource type="PackedScene" uid="uid://cwutwy11pityw" path="res://ui/LevelCompleteComponent.tscn" id="13_we755"] -[ext_resource type="AudioStream" uid="uid://bgcbd6xf0lyrr" path="res://resources/music/bee_background.ogg" id="14_r7utx"] -[ext_resource type="AudioStream" uid="uid://dvsjpsh5dyixq" path="res://resources/SFX/mixkit-european-spring-forest-ambience-1219.wav" id="15_sukco"] [node name="Level1" type="Node2D"] script = ExtResource("1_jrhhc") @@ -151,12 +149,3 @@ z_index = 1000 offset_right = 1280.0 offset_bottom = 720.0 mouse_filter = 1 - -[node name="BackgroundMusic" type="AudioStreamPlayer" parent="."] -stream = ExtResource("14_r7utx") -volume_db = -18.0 -autoplay = true - -[node name="AtmosphericSounds" type="AudioStreamPlayer" parent="."] -stream = ExtResource("15_sukco") -autoplay = true diff --git a/levels/level_2.tscn b/levels/level_2.tscn index 814ef35..ba82dd5 100644 --- a/levels/level_2.tscn +++ b/levels/level_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://dcgmtmjsrtafq"] +[gd_scene load_steps=16 format=3 uid="uid://dcgmtmjsrtafq"] [ext_resource type="Script" path="res://levels/scripts/level_2.gd" id="1_dtbi3"] [ext_resource type="PackedScene" uid="uid://dn6aa6f2f4g4i" path="res://components/RulesComponent.tscn" id="2_gln7y"] @@ -15,8 +15,6 @@ [ext_resource type="PackedScene" uid="uid://b7eeptlk47ymd" path="res://ui/UiComponent.tscn" id="12_mmtyl"] [ext_resource type="PackedScene" uid="uid://ct3c16xm33r2a" path="res://scenes/elements/drone_manager.tscn" id="13_pibpn"] [ext_resource type="PackedScene" uid="uid://cwutwy11pityw" path="res://ui/LevelCompleteComponent.tscn" id="14_uyhgj"] -[ext_resource type="AudioStream" uid="uid://bgcbd6xf0lyrr" path="res://resources/music/bee_background.ogg" id="15_uo15m"] -[ext_resource type="AudioStream" uid="uid://dvsjpsh5dyixq" path="res://resources/SFX/mixkit-european-spring-forest-ambience-1219.wav" id="16_n1b2q"] [node name="Level2" type="Node2D"] script = ExtResource("1_dtbi3") @@ -154,12 +152,3 @@ visible = false z_index = 999 offset_right = 1280.0 offset_bottom = 720.0 - -[node name="BackgroundMusic" type="AudioStreamPlayer" parent="."] -stream = ExtResource("15_uo15m") -volume_db = -18.0 -autoplay = true - -[node name="AtmosphericSounds" type="AudioStreamPlayer" parent="."] -stream = ExtResource("16_n1b2q") -autoplay = true diff --git a/levels/level_3.tscn b/levels/level_3.tscn index e1f1459..a0b2a77 100644 --- a/levels/level_3.tscn +++ b/levels/level_3.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://bw12t0pk5eecr"] +[gd_scene load_steps=16 format=3 uid="uid://bw12t0pk5eecr"] [ext_resource type="Script" path="res://levels/scripts/level_3.gd" id="1_6fiq4"] [ext_resource type="PackedScene" uid="uid://dn6aa6f2f4g4i" path="res://components/RulesComponent.tscn" id="2_qf6aq"] @@ -15,8 +15,6 @@ [ext_resource type="PackedScene" uid="uid://b7eeptlk47ymd" path="res://ui/UiComponent.tscn" id="13_cw1ps"] [ext_resource type="PackedScene" uid="uid://ct3c16xm33r2a" path="res://scenes/elements/drone_manager.tscn" id="14_mtjsg"] [ext_resource type="PackedScene" uid="uid://cwutwy11pityw" path="res://ui/LevelCompleteComponent.tscn" id="15_1jo0f"] -[ext_resource type="AudioStream" uid="uid://bgcbd6xf0lyrr" path="res://resources/music/bee_background.ogg" id="16_q3tkj"] -[ext_resource type="AudioStream" uid="uid://dvsjpsh5dyixq" path="res://resources/SFX/mixkit-european-spring-forest-ambience-1219.wav" id="17_b1iwr"] [node name="Level3" type="Node2D"] script = ExtResource("1_6fiq4") @@ -186,12 +184,3 @@ visible = false z_index = 999 offset_right = 1280.0 offset_bottom = 720.0 - -[node name="BackgroundMusic" type="AudioStreamPlayer" parent="."] -stream = ExtResource("16_q3tkj") -volume_db = -18.0 -autoplay = true - -[node name="AtmosphericSounds" type="AudioStreamPlayer" parent="."] -stream = ExtResource("17_b1iwr") -autoplay = true diff --git a/scenes/main_menu.tscn b/scenes/main_menu.tscn index 56fe5c6..2f6a0aa 100644 --- a/scenes/main_menu.tscn +++ b/scenes/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3 uid="uid://cdk8rrve1fe3u"] +[gd_scene load_steps=19 format=3 uid="uid://cdk8rrve1fe3u"] [ext_resource type="Script" path="res://scenes/scripts/main_menu.gd" id="1_ges7y"] [ext_resource type="Resource" uid="uid://bn4qhonifxne3" path="res://levels/rules/main_menu.tres" id="2_4iepj"] @@ -16,8 +16,6 @@ [ext_resource type="PackedScene" uid="uid://cx7cunaspu08a" path="res://entities/DancerDrone.tscn" id="13_fi5ph"] [ext_resource type="PackedScene" uid="uid://dqdi1tpoid80c" path="res://entities/CollectorDrone.tscn" id="14_qpr88"] [ext_resource type="PackedScene" uid="uid://cwutwy11pityw" path="res://ui/LevelCompleteComponent.tscn" id="14_swqxu"] -[ext_resource type="AudioStream" uid="uid://bgcbd6xf0lyrr" path="res://resources/music/bee_background.ogg" id="15_ixwoe"] -[ext_resource type="AudioStream" uid="uid://dvsjpsh5dyixq" path="res://resources/SFX/mixkit-european-spring-forest-ambience-1219.wav" id="16_cqdjb"] [ext_resource type="Texture2D" uid="uid://15wckxixnr8y" path="res://resources/images/logo.png" id="19_jw5rd"] [ext_resource type="Texture2D" uid="uid://c3tl5pihlrd8u" path="res://resources/cursors/navigation_s.png" id="20_fw4ew"] @@ -170,15 +168,6 @@ z_index = 999 offset_right = 1280.0 offset_bottom = 720.0 -[node name="BackgroundMusic" type="AudioStreamPlayer" parent="."] -stream = ExtResource("15_ixwoe") -volume_db = -18.0 -autoplay = true - -[node name="AtmosphericSounds" type="AudioStreamPlayer" parent="."] -stream = ExtResource("16_cqdjb") -autoplay = true - [node name="Logo" type="Sprite2D" parent="."] position = Vector2(640, 167) texture = ExtResource("19_jw5rd") diff --git a/scenes/scene_manager.tscn b/scenes/scene_manager.tscn index 16b6e43..c7f99ad 100644 --- a/scenes/scene_manager.tscn +++ b/scenes/scene_manager.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=4 format=3 uid="uid://cbsqd08rb8f83"] +[gd_scene load_steps=6 format=3 uid="uid://cbsqd08rb8f83"] [ext_resource type="PackedScene" uid="uid://cdk8rrve1fe3u" path="res://scenes/main_menu.tscn" id="1_phmcp"] [ext_resource type="Script" path="res://scenes/scripts/scene_manager.gd" id="1_py1pt"] [ext_resource type="PackedScene" uid="uid://bhy041v5u551a" path="res://scenes/transition_scene.tscn" id="2_jhpbi"] +[ext_resource type="AudioStream" uid="uid://bgcbd6xf0lyrr" path="res://resources/music/bee_background.ogg" id="4_px4qr"] +[ext_resource type="AudioStream" uid="uid://dvsjpsh5dyixq" path="res://resources/SFX/mixkit-european-spring-forest-ambience-1219.wav" id="5_r1xj0"] [node name="SceneManager" type="Node2D"] script = ExtResource("1_py1pt") @@ -12,3 +14,13 @@ script = ExtResource("1_py1pt") [node name="MainMenu" parent="CurrentScene" instance=ExtResource("1_phmcp")] [node name="TransitionScene" parent="." instance=ExtResource("2_jhpbi")] + +[node name="BackgroundMusic" type="AudioStreamPlayer" parent="."] +process_mode = 3 +stream = ExtResource("4_px4qr") +volume_db = -18.0 +autoplay = true + +[node name="AtmosphericSounds" type="AudioStreamPlayer" parent="."] +stream = ExtResource("5_r1xj0") +autoplay = true