From f97f58f00ee2e87c3c8fc66016a622179f9f750c Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Thu, 2 Jul 2026 15:50:13 +0300 Subject: [PATCH] Added menu music --- game/levels/abstract_level.gd | 2 +- game/managers/sound_manager.gd | 2 ++ game/managers/sound_manager.tscn | 2 ++ game/menu/main_menu.gd | 2 +- sound/music/menu_music.wav | 3 +++ sound/music/menu_music.wav.import | 24 ++++++++++++++++++++++++ 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 sound/music/menu_music.wav create mode 100644 sound/music/menu_music.wav.import diff --git a/game/levels/abstract_level.gd b/game/levels/abstract_level.gd index 6b36d82..4325b1d 100644 --- a/game/levels/abstract_level.gd +++ b/game/levels/abstract_level.gd @@ -41,7 +41,7 @@ func _ready() -> void: Input.mouse_mode = Input.MOUSE_MODE_HIDDEN - #TODO Add gameplay music + SoundManager.play_music_stream(SoundManager.music_stream_gameplay) func _process(_delta: float) -> void: diff --git a/game/managers/sound_manager.gd b/game/managers/sound_manager.gd index 21224d6..b06d78f 100644 --- a/game/managers/sound_manager.gd +++ b/game/managers/sound_manager.gd @@ -39,6 +39,8 @@ const MUSIC_BUS = "Music" @export_group("Music Streams", "music_stream") +@export var music_stream_menu : AudioStream +@export var music_stream_gameplay : AudioStream diff --git a/game/managers/sound_manager.tscn b/game/managers/sound_manager.tscn index 26d1cbe..37fc4b8 100644 --- a/game/managers/sound_manager.tscn +++ b/game/managers/sound_manager.tscn @@ -16,6 +16,7 @@ [ext_resource type="AudioStream" uid="uid://mwornwi1s000" path="res://sound/sfx/level_completed.wav" id="12_lqyhh"] [ext_resource type="AudioStream" uid="uid://bnrvkm5wy8wda" path="res://sound/sfx/turret_shot.wav" id="13_814q3"] [ext_resource type="AudioStream" uid="uid://8nag1oaly0by" path="res://sound/sfx/turret_hit.wav" id="13_ounmg"] +[ext_resource type="AudioStream" uid="uid://c7fvxe05ekdqg" path="res://sound/music/menu_music.wav" id="17_g6nb7"] [node name="SoundManager" type="Node" unique_id=1576371552] process_mode = 3 @@ -41,3 +42,4 @@ sfx_stream_swing = ExtResource("7_ab171") sfx_stream_turret_hit = ExtResource("13_ounmg") sfx_stream_turret_shot = ExtResource("13_814q3") sfx_stream_wall_jump = ExtResource("8_22ptj") +music_stream_menu = ExtResource("17_g6nb7") diff --git a/game/menu/main_menu.gd b/game/menu/main_menu.gd index a2f3c69..a871db2 100644 --- a/game/menu/main_menu.gd +++ b/game/menu/main_menu.gd @@ -13,7 +13,7 @@ func _ready() -> void: Input.mouse_mode = Input.MOUSE_MODE_VISIBLE - #TODO Add menu music + SoundManager.play_music_stream(SoundManager.music_stream_menu) start_button.grab_focus() get_viewport().gui_focus_changed.connect(_on_gui_focus_changed) diff --git a/sound/music/menu_music.wav b/sound/music/menu_music.wav new file mode 100644 index 0000000..d00834d --- /dev/null +++ b/sound/music/menu_music.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fe02a5fa9af27d702c4bd4996f7d91848829f2a308924a28c53ebceae5a9e1a +size 16352264 diff --git a/sound/music/menu_music.wav.import b/sound/music/menu_music.wav.import new file mode 100644 index 0000000..062939f --- /dev/null +++ b/sound/music/menu_music.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c7fvxe05ekdqg" +path="res://.godot/imported/menu_music.wav-9c104f1a91389c8732ba52fff29e26f4.sample" + +[deps] + +source_file="res://sound/music/menu_music.wav" +dest_files=["res://.godot/imported/menu_music.wav-9c104f1a91389c8732ba52fff29e26f4.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