diff --git a/default_bus_layout.tres b/default_bus_layout.tres index d7364df..faa6a9d 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -1,13 +1,13 @@ [gd_resource type="AudioBusLayout" format=3 uid="uid://b2y3qxehkfaq2"] [resource] -bus/1/name = &"Music" +bus/1/name = &"Musique" bus/1/solo = false bus/1/mute = false bus/1/bypass_fx = false bus/1/volume_db = 0.0 bus/1/send = &"Master" -bus/2/name = &"Sfx" +bus/2/name = &"Effets" bus/2/solo = false bus/2/mute = false bus/2/bypass_fx = false diff --git a/menu_principal/menu_principal_affichage.gd b/menu_principal/menu_principal_affichage.gd index f923b8e..e55ffde 100644 --- a/menu_principal/menu_principal_affichage.gd +++ b/menu_principal/menu_principal_affichage.gd @@ -2,7 +2,6 @@ extends Control @onready var menu_principal = $Menu_principal @onready var menu_parametres = $Menu_parametres -@onready var musique_fond = $MusiqueFond var first_room = preload("res://scenes/Room.tscn").instantiate() @@ -37,7 +36,6 @@ func on_exit_parametres() -> void : func _on_play_button_pressed(): get_tree().root.add_child(first_room) - musique_fond.playing = false menu_principal.visible = false func _on_load_button_pressed(): diff --git a/menu_principal/menu_principal_affichage.tscn b/menu_principal/menu_principal_affichage.tscn index 04c0b12..64c1720 100644 --- a/menu_principal/menu_principal_affichage.tscn +++ b/menu_principal/menu_principal_affichage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://bmwgfrd8butry"] +[gd_scene load_steps=8 format=3 uid="uid://bmwgfrd8butry"] [ext_resource type="Script" path="res://menu_principal/menu_principal_affichage.gd" id="1_10mja"] [ext_resource type="Texture2D" uid="uid://dqfrqntx73do5" path="res://ressources/images/menu_jeu_button.svg" id="1_502q6"] @@ -7,7 +7,6 @@ [ext_resource type="Texture2D" uid="uid://c5q7bc5hpe6hd" path="res://ressources/images/menu_jeu_tiny_button.svg" id="3_o6osq"] [ext_resource type="Texture2D" uid="uid://1pxsc65es708" path="res://ressources/images/menu_jeu_tiny_button_survole.svg" id="4_egxbj"] [ext_resource type="PackedScene" uid="uid://di4chlep1t1or" path="res://parametres/menu_parametres.tscn" id="6_0lenm"] -[ext_resource type="AudioStream" uid="uid://d0dmu15vidwv0" path="res://ressources/sons/main_theme.wav" id="8_sq6yk"] [node name="Menu_principal_affichage" type="Control"] layout_mode = 3 @@ -200,9 +199,7 @@ visible = false layout_mode = 1 [node name="MusiqueFond" type="AudioStreamPlayer" parent="."] -stream = ExtResource("8_sq6yk") autoplay = true -bus = &"Music" [connection signal="pressed" from="Menu_principal/HBoxContainer/VBoxMainButton/play_button" to="." method="_on_play_button_pressed"] [connection signal="pressed" from="Menu_principal/HBoxContainer/VBoxMainButton/load_button" to="." method="_on_load_button_pressed"] diff --git a/ressources/sons/main_theme.wav b/ressources/sons/main_theme.wav deleted file mode 100644 index 131c8eb..0000000 Binary files a/ressources/sons/main_theme.wav and /dev/null differ diff --git a/ressources/sons/main_theme.wav.import b/ressources/sons/main_theme.wav.import deleted file mode 100644 index 07369da..0000000 --- a/ressources/sons/main_theme.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://d0dmu15vidwv0" -path="res://.godot/imported/main_theme.wav-f68a2eb8189ec13871517c9396b1674a.sample" - -[deps] - -source_file="res://ressources/sons/main_theme.wav" -dest_files=["res://.godot/imported/main_theme.wav-f68a2eb8189ec13871517c9396b1674a.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=0