From 32e17f9eae0e1b61ea96f4c5b7bdfe9382abe629 Mon Sep 17 00:00:00 2001 From: Nilou Date: Wed, 17 Sep 2025 22:07:17 +0200 Subject: [PATCH] mixage du jeu et lecture en boucle de la piste d'ambiance #48 --- common/music/assets/vent.ogg.import | 2 +- common/music/music.tscn | 14 ++++++++++---- entities/player/player.tscn | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/common/music/assets/vent.ogg.import b/common/music/assets/vent.ogg.import index 198ee39..e122399 100644 --- a/common/music/assets/vent.ogg.import +++ b/common/music/assets/vent.ogg.import @@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/vent.ogg-ae488051619e48b592cdcb0ef4467441.ogg [params] -loop=false +loop=true loop_offset=0 bpm=0 beat_count=0 diff --git a/common/music/music.tscn b/common/music/music.tscn index c19c963..c731906 100644 --- a/common/music/music.tscn +++ b/common/music/music.tscn @@ -1,15 +1,21 @@ -[gd_scene load_steps=3 format=3 uid="uid://b6hscxcrj065q"] +[gd_scene load_steps=5 format=3 uid="uid://b6hscxcrj065q"] [ext_resource type="AudioStream" uid="uid://diyefcv8tqa3r" path="res://common/music/assets/forest_phase_1.ogg" id="1_stre8"] +[ext_resource type="AudioStream" uid="uid://bqwiaek5b5q00" path="res://common/music/assets/forest_phase_2.ogg" id="2_ji160"] [ext_resource type="AudioStream" uid="uid://d1fyd5o331360" path="res://common/music/assets/vent.ogg" id="2_n52pk"] +[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ei6w7"] +loop = false +stream_count = 2 +stream_0 = ExtResource("1_stre8") +stream_1 = ExtResource("2_ji160") + [node name="Music" type="Node"] [node name="AudioStreamPlayer_music" type="AudioStreamPlayer" parent="."] -stream = ExtResource("1_stre8") +stream = SubResource("AudioStreamPlaylist_ei6w7") +volume_db = -5.0 autoplay = true -stream_paused = true -parameters/looping = false [node name="AudioStreamPlayer2_ambient" type="AudioStreamPlayer" parent="."] stream = ExtResource("2_n52pk") diff --git a/entities/player/player.tscn b/entities/player/player.tscn index a13ea76..9b974d7 100644 --- a/entities/player/player.tscn +++ b/entities/player/player.tscn @@ -93,11 +93,11 @@ pitch_scale = 1.5 [node name="AudioStreamPlayer_pick_up" type="AudioStreamPlayer" parent="Audio"] stream = SubResource("AudioStreamRandomizer_24ehl") -volume_db = -15.0 +volume_db = -25.0 [node name="AudioStreamPlayer_movement" type="AudioStreamPlayer" parent="Audio"] stream = SubResource("AudioStreamRandomizer_bwdx1") -volume_db = -20.0 +volume_db = -80.0 [node name="AudioStreamPlayer_drop" type="AudioStreamPlayer" parent="Audio"] stream = SubResource("AudioStreamRandomizer_yqrof")