From f60db5f34d83359bea6dca40e71587d267a69a8a Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Sat, 10 Jan 2026 16:11:46 +0300 Subject: [PATCH] Added menu music --- game/managers/sound_manager.gd | 7 +++++-- game/managers/sound_manager.tscn | 4 +++- game/menu/main_menu.gd | 2 ++ game/menu/options_menu.gd | 1 - sound/music/main_menu.wav | 3 +++ sound/music/main_menu.wav.import | 24 ++++++++++++++++++++++++ 6 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 sound/music/main_menu.wav create mode 100644 sound/music/main_menu.wav.import diff --git a/game/managers/sound_manager.gd b/game/managers/sound_manager.gd index dfbb7ad..488f815 100644 --- a/game/managers/sound_manager.gd +++ b/game/managers/sound_manager.gd @@ -18,12 +18,12 @@ const MUSIC_BUS = "Music" @export_range(1, 10) var player_count_ui := 1 @export_range(1, 100) var player_count_sfx := 1 -@export_group("UI Sounds", "ui_stream") +@export_group("UI Streams", "ui_stream") @export var ui_stream_accept : AudioStream @export var ui_stream_decline : AudioStream @export var ui_stream_select : AudioStream -@export_group("SFX Sounds", "sfx_stream") +@export_group("SFX Streams", "sfx_stream") @export var sfx_stream_book_picked_up : AudioStream @export var sfx_stream_death : AudioStream @export var sfx_stream_door_closing : AudioStream @@ -37,6 +37,9 @@ const MUSIC_BUS = "Music" @export var sfx_stream_player_spoted : AudioStream @export var sfx_stream_switch : AudioStream +@export_group("Music Streams", "music_stream") +@export var music_stream_main_menu : AudioStream + var _ui_players : Array[AudioStreamPlayer] = [] var _sfx_players : Array[AudioStreamPlayer2D] = [] diff --git a/game/managers/sound_manager.tscn b/game/managers/sound_manager.tscn index 7477f67..e77f844 100644 --- a/game/managers/sound_manager.tscn +++ b/game/managers/sound_manager.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://drk4dvbn78dva"] +[gd_scene load_steps=18 format=3 uid="uid://drk4dvbn78dva"] [ext_resource type="Script" uid="uid://cx5qcukr66whc" path="res://game/managers/sound_manager.gd" id="1_cg0sy"] [ext_resource type="AudioStream" uid="uid://d2suvaisb6w45" path="res://sound/ui/accept.wav" id="2_ge1il"] @@ -16,6 +16,7 @@ [ext_resource type="AudioStream" uid="uid://txk8dq16levc" path="res://sound/sfx/key_picked_up.wav" id="8_wyfta"] [ext_resource type="AudioStream" uid="uid://dy7qnen5k20mo" path="res://sound/sfx/player_spoted.wav" id="9_q7cyi"] [ext_resource type="AudioStream" uid="uid://dg0t7fwu8u3m2" path="res://sound/sfx/door_unlocking.wav" id="10_lqyhh"] +[ext_resource type="AudioStream" uid="uid://ckmpft46wjgqs" path="res://sound/music/main_menu.wav" id="17_g6nb7"] [node name="SoundManager" type="Node"] process_mode = 3 @@ -41,3 +42,4 @@ sfx_stream_level_completed = ExtResource("7_22ptj") sfx_stream_player_lost = ExtResource("8_6ll5c") sfx_stream_player_spoted = ExtResource("9_q7cyi") sfx_stream_switch = ExtResource("7_ab171") +music_stream_main_menu = ExtResource("17_g6nb7") diff --git a/game/menu/main_menu.gd b/game/menu/main_menu.gd index 58882ad..2ab8622 100644 --- a/game/menu/main_menu.gd +++ b/game/menu/main_menu.gd @@ -11,6 +11,8 @@ func _ready() -> void: if OS.get_name() == "Web": _setup_for_web() + SoundManager.play_music_stream(SoundManager.music_stream_main_menu) + start_button.grab_focus() get_viewport().gui_focus_changed.connect(_on_gui_focus_changed) diff --git a/game/menu/options_menu.gd b/game/menu/options_menu.gd index 5407d3e..e32be12 100644 --- a/game/menu/options_menu.gd +++ b/game/menu/options_menu.gd @@ -110,5 +110,4 @@ func _on_sfx_volume_changed(value: float) -> void: func _on_music_volume_changed(value: float) -> void: - if _play_sound: SoundManager.play_music_stream(SoundManager.ui_stream_select) SettingsManager.music_volume = floor(value) diff --git a/sound/music/main_menu.wav b/sound/music/main_menu.wav new file mode 100644 index 0000000..bd79bf7 --- /dev/null +++ b/sound/music/main_menu.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a74f86ccf04f456919eb1688b487e2d9a5efe390836691da00faa7efc4593415 +size 12897596 diff --git a/sound/music/main_menu.wav.import b/sound/music/main_menu.wav.import new file mode 100644 index 0000000..6f556d1 --- /dev/null +++ b/sound/music/main_menu.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://ckmpft46wjgqs" +path="res://.godot/imported/main_menu.wav-46fb548f62adfa11c350aa9b5f89efbf.sample" + +[deps] + +source_file="res://sound/music/main_menu.wav" +dest_files=["res://.godot/imported/main_menu.wav-46fb548f62adfa11c350aa9b5f89efbf.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=2 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2