diff --git a/Audio/PasMenuMusic.ogg b/Audio/PasMenuMusic.ogg new file mode 100644 index 0000000..8aa1a9a Binary files /dev/null and b/Audio/PasMenuMusic.ogg differ diff --git a/Audio/PasMenuMusic.ogg.import b/Audio/PasMenuMusic.ogg.import new file mode 100644 index 0000000..35a8653 --- /dev/null +++ b/Audio/PasMenuMusic.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/PasMenuMusic.ogg-4f332fec8b3130f36943a282a4a481aa.oggstr" + +[deps] + +source_file="res://Audio/PasMenuMusic.ogg" +dest_files=[ "res://.import/PasMenuMusic.ogg-4f332fec8b3130f36943a282a4a481aa.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/HUD.tscn b/HUD.tscn index db01b45..c518c45 100644 --- a/HUD.tscn +++ b/HUD.tscn @@ -152,6 +152,7 @@ text = "Quit Game" [node name="MenuMusic" type="AudioStreamPlayer" parent="MenuLayer/Start"] stream = ExtResource( 4 ) +volume_db = 3.0 [connection signal="pressed" from="MenuLayer/Start/New Game" to="MenuLayer/Start" method="_on_New_Game_pressed"] [connection signal="pressed" from="MenuLayer/Start/Quit to Desktop" to="MenuLayer/Start" method="_on_Quit_to_Desktop_Button_pressed"] diff --git a/Music.gd b/Music.gd new file mode 100644 index 0000000..5f9874a --- /dev/null +++ b/Music.gd @@ -0,0 +1,16 @@ +extends AudioStreamPlayer + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/Player.tscn b/Player.tscn index 3f65003..ce3da4e 100644 --- a/Player.tscn +++ b/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://Player.gd" type="Script" id=1] [ext_resource path="res://BlenderStuff/Hand/protohand.obj" type="ArrayMesh" id=2] @@ -12,6 +12,8 @@ [ext_resource path="res://Audio/step4.wav" type="AudioStream" id=10] [ext_resource path="res://Audio/step1.wav" type="AudioStream" id=11] [ext_resource path="res://Audio/mixkit-fast-whoosh-transition-1490.wav" type="AudioStream" id=12] +[ext_resource path="res://Audio/PasMenuMusic.ogg" type="AudioStream" id=13] +[ext_resource path="res://Music.gd" type="Script" id=14] [sub_resource type="CapsuleShape" id=2] height = 3.0 @@ -145,15 +147,20 @@ anims/basic_slap = SubResource( 6 ) [node name="AudioSlap" type="AudioStreamPlayer3D" parent="."] stream = ExtResource( 5 ) +bus = "SFX" [node name="AudioMegaSlap" type="AudioStreamPlayer3D" parent="."] stream = ExtResource( 6 ) +bus = "SFX" emission_angle_enabled = true doppler_tracking = 2 [node name="Music" type="AudioStreamPlayer" parent="."] -volume_db = 13.983 +stream = ExtResource( 13 ) +volume_db = -3.0 autoplay = true +bus = "Music" +script = ExtResource( 14 ) [node name="SlapCooldown" type="Timer" parent="."] wait_time = 0.5 @@ -161,18 +168,22 @@ wait_time = 0.5 [node name="Step2" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 8 ) +bus = "SFX" [node name="Step3" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 9 ) +bus = "SFX" [node name="Step1" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 11 ) +bus = "SFX" [node name="Step4" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 10 ) +bus = "SFX" [node name="AudioCharge" type="AudioStreamPlayer3D" parent="."] stream = ExtResource( 12 ) diff --git a/default_bus_layout.tres b/default_bus_layout.tres index 6b7e9ae..53aa55c 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -17,7 +17,7 @@ bus/1/name = "SFX" bus/1/solo = false bus/1/mute = false bus/1/bypass_fx = false -bus/1/volume_db = 0.0 +bus/1/volume_db = 6.02 bus/1/send = "Master" bus/1/effect/0/effect = SubResource( 2 ) bus/1/effect/0/enabled = false @@ -25,5 +25,5 @@ bus/2/name = "Music" bus/2/solo = false bus/2/mute = false bus/2/bypass_fx = false -bus/2/volume_db = 0.0 +bus/2/volume_db = -3.76831 bus/2/send = "Master"