diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 65ee737..2fdc88f 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -214,13 +214,14 @@ stream = ExtResource("16_xmumj") [node name="Drop" type="AudioStreamPlayer" parent="Sfx" unique_id=1391500830] stream = SubResource("AudioStreamRandomizer_1w04j") +volume_db = -2.0 [node name="Harvest" type="AudioStreamPlayer" parent="Sfx" unique_id=345539331] stream = SubResource("AudioStreamRandomizer_i4m0x") [node name="PickUp" type="AudioStreamPlayer" parent="Sfx" unique_id=176915166] stream = SubResource("AudioStreamRandomizer_jjdv2") -volume_db = -10.0 +volume_db = -11.0 [node name="Announce" type="AudioStreamPlayer" parent="Sfx" unique_id=876644323] stream = ExtResource("22_btfwx") @@ -260,7 +261,7 @@ stream = SubResource("AudioStreamRandomizer_yjs51") [node name="Screen_interaction" type="AudioStreamPlayer" parent="Sfx" unique_id=1140309368] stream = ExtResource("47_svctq") -volume_db = -2.0 +volume_db = -8.0 [node name="Ship_exit" type="AudioStreamPlayer" parent="Sfx" unique_id=615567072] stream = ExtResource("48_j8acj") @@ -272,4 +273,4 @@ volume_db = -7.0 [node name="Teleportation" type="AudioStreamPlayer" parent="Sfx" unique_id=369599456] stream = ExtResource("50_rlnfe") -volume_db = -3.0 +volume_db = -6.0 diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index 2fddc6a..e7b0c34 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -37,7 +37,7 @@ func _on_change_scene(scene : Scene): match scene.scene_id: "TITLE": - play_music_alone("Title", false, 5.0) + play_music_alone("Title", false, 1.0) "INTRO": stop_all_musics() "REGION": @@ -72,6 +72,8 @@ func _on_timeline_started(): play_ambiance("Demeter") "demeter_intro": play_ambiance("Demeter") + "demeter_introV2": + play_ambiance("Demeter") "demeter_post_tutorial": play_ambiance("Demeter") "failure": @@ -79,9 +81,10 @@ func _on_timeline_started(): # Fonction s'exécutant à chaque fin de timeline func _on_timeline_ended(): + stop_ambiance("Demeter") if SceneManager.actual_scene: change_ambiances_volume() - stop_ambiance("Demeter") + # Joue la musique définie par player_name, arrête toute les autres musiques immédiatement # - player_name : Nom de la Node dans la scène Godot sous la node Musics à jouer diff --git a/stages/3d_scenes/borea_base/scripts/borea_base.gd b/stages/3d_scenes/borea_base/scripts/borea_base.gd index 55cb3e3..b8acc71 100644 --- a/stages/3d_scenes/borea_base/scripts/borea_base.gd +++ b/stages/3d_scenes/borea_base/scripts/borea_base.gd @@ -12,11 +12,11 @@ func _ready(): await Dialogic.timeline_ended Input.mouse_mode = Input.MOUSE_MODE_VISIBLE %Credits.show() - AudioManager.play_music("Title") + AudioManager.play_music("Demo_end", false, 5.0) AudioManager.stop_all_ambiances() func _on_ambiance_change_detector_body_entered(body: Node3D): if body is Player3D: AudioManager.stop_all_ambiances() - AudioManager.play_music("Title") + AudioManager.play_music("Demo_end", false, 5.0)