aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com>2022-07-17 00:59:28 +0200
committerLibravatar IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com>2022-07-17 00:59:28 +0200
commit1d79bbbb95f1372650914cf543e7d9179653ef6e (patch)
tree822b4f1b696a818178f764e9bb1e8603a0eb686d
parent598a36466e76d0c7c16a690a72d4a0e8d7326351 (diff)
download2022-1d79bbbb95f1372650914cf543e7d9179653ef6e.tar.gz
2022-1d79bbbb95f1372650914cf543e7d9179653ef6e.tar.bz2
2022-1d79bbbb95f1372650914cf543e7d9179653ef6e.zip
added bgm
-rw-r--r--godot/assets/sounds/bgm.mp33
-rw-r--r--godot/assets/sounds/bgm.mp3.import3
-rw-r--r--godot/assets/sounds/main_menu.mp33
-rw-r--r--godot/assets/sounds/main_menu.mp3.import3
-rw-r--r--godot/scenes/Game.tscn15
-rw-r--r--godot/scenes/Menu.tscn7
6 files changed, 32 insertions, 2 deletions
diff --git a/godot/assets/sounds/bgm.mp3 b/godot/assets/sounds/bgm.mp3
new file mode 100644
index 0000000..cad9651
--- /dev/null
+++ b/godot/assets/sounds/bgm.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b3907d7df22c82ee15cfff306a69dd3f5f003cec8a031972f84004dc268da51
+size 5963398
diff --git a/godot/assets/sounds/bgm.mp3.import b/godot/assets/sounds/bgm.mp3.import
new file mode 100644
index 0000000..c98d401
--- /dev/null
+++ b/godot/assets/sounds/bgm.mp3.import
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:128cf14fafb0d84338eca1ea75b9f54d21b86505f97f047a412607dc4e6fbbf3
+size 280
diff --git a/godot/assets/sounds/main_menu.mp3 b/godot/assets/sounds/main_menu.mp3
new file mode 100644
index 0000000..1f262dc
--- /dev/null
+++ b/godot/assets/sounds/main_menu.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b320e47c06cc8ba3889e3ac6467eff129fd9c6dced99de1de919783faea9ae23
+size 6169312
diff --git a/godot/assets/sounds/main_menu.mp3.import b/godot/assets/sounds/main_menu.mp3.import
new file mode 100644
index 0000000..c593491
--- /dev/null
+++ b/godot/assets/sounds/main_menu.mp3.import
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5090dd2ec3c9f87d013bd43165984f1643934d2f51bd8b2aa3e63e784335a2d
+size 298
diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn
index 0896836..9891f4e 100644
--- a/godot/scenes/Game.tscn
+++ b/godot/scenes/Game.tscn
@@ -1,9 +1,11 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=7 format=2]
[ext_resource path="res://scenes/Game.gd" type="Script" id=1]
[ext_resource path="res://scenes/levels/test_scene_movement/TestSceneMovement.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/theme.tres" type="Theme" id=3]
[ext_resource path="res://assets/fonts/format.tres" type="DynamicFont" id=4]
+[ext_resource path="res://scenes/objects/Scoreboard.tscn" type="PackedScene" id=5]
+[ext_resource path="res://assets/sounds/bgm.mp3" type="AudioStream" id=6]
[node name="Game" type="Spatial"]
script = ExtResource( 1 )
@@ -57,5 +59,16 @@ margin_right = 360.0
margin_bottom = 343.0
text = "Quit"
+[node name="Scoreboard" parent="." instance=ExtResource( 5 )]
+visible = false
+margin_right = -0.319946
+margin_bottom = 0.47998
+
+[node name="Level1" type="Spatial" parent="."]
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 6 )
+autoplay = true
+
[connection signal="pressed" from="PausePopup/Panel/VBoxContainer/ResumeButton" to="." method="_on_ResumeButton_pressed"]
[connection signal="pressed" from="PausePopup/Panel/VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]
diff --git a/godot/scenes/Menu.tscn b/godot/scenes/Menu.tscn
index 5529448..792bc28 100644
--- a/godot/scenes/Menu.tscn
+++ b/godot/scenes/Menu.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/theme.tres" type="Theme" id=1]
[ext_resource path="res://scenes/Menu.gd" type="Script" id=2]
+[ext_resource path="res://assets/sounds/main_menu.mp3" type="AudioStream" id=3]
[node name="Menu" type="Control"]
anchor_right = 1.0
@@ -38,5 +39,9 @@ margin_bottom = 251.0
focus_neighbour_bottom = NodePath("../StartButton")
text = "Quit"
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 3 )
+autoplay = true
+
[connection signal="pressed" from="VBoxContainer/StartButton" to="." method="_on_StartButton_pressed"]
[connection signal="pressed" from="VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]