From 2891773810d727776ee106ccddb28440ab2dcf4a Mon Sep 17 00:00:00 2001 From: Mylloon Date: Sun, 28 Jan 2024 19:16:41 +0100 Subject: [PATCH] music --- ressources/sounds/menu/miaou.mp3.import | 2 +- scenes/game/ads/Ads_music.tscn | 29 ++++++++++++++++++++++++- scripts/ads/ads_music.gd | 9 ++++++-- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/ressources/sounds/menu/miaou.mp3.import b/ressources/sounds/menu/miaou.mp3.import index 96ecda8..80c67e9 100644 --- a/ressources/sounds/menu/miaou.mp3.import +++ b/ressources/sounds/menu/miaou.mp3.import @@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/miaou.mp3-14011d42bc74dc84a6a6273c0e7c06a2.mp [params] -loop=false +loop=true loop_offset=0 bpm=0 beat_count=0 diff --git a/scenes/game/ads/Ads_music.tscn b/scenes/game/ads/Ads_music.tscn index e28debd..cad797e 100644 --- a/scenes/game/ads/Ads_music.tscn +++ b/scenes/game/ads/Ads_music.tscn @@ -1,7 +1,34 @@ -[gd_scene load_steps=3 format=3 uid="uid://d2irk5735vjls"] +[gd_scene load_steps=6 format=3 uid="uid://d2irk5735vjls"] [ext_resource type="PackedScene" uid="uid://n06gkookqeml" path="res://scenes/game/windows/Ads.tscn" id="1_0jlha"] [ext_resource type="Script" path="res://scripts/ads/ads_music.gd" id="2_l1b3e"] +[ext_resource type="Texture2D" uid="uid://dd8civte7y1h4" path="res://ressources/assets/MeowSounds/Music.png" id="3_b60lt"] +[ext_resource type="Texture2D" uid="uid://dthd82kqaqqs0" path="res://ressources/assets/MeowSounds/MusicButton.png" id="4_yng4o"] +[ext_resource type="AudioStream" uid="uid://b6r8lvskuu228" path="res://ressources/sounds/menu/miaou.mp3" id="5_gf3d2"] [node name="Windows" instance=ExtResource("1_0jlha")] script = ExtResource("2_l1b3e") + +[node name="Music" type="Sprite2D" parent="." index="2"] +position = Vector2(251, 224.5) +scale = Vector2(0.401667, 0.351042) +texture = ExtResource("3_b60lt") + +[node name="MusicButton" type="Sprite2D" parent="." index="3"] +position = Vector2(252, 336) +scale = Vector2(0.625, 0.441892) +texture = ExtResource("4_yng4o") + +[node name="Button" type="Button" parent="MusicButton" index="0"] +offset_left = -115.0 +offset_top = -93.0 +offset_right = 117.0 +offset_bottom = 93.0 +focus_mode = 0 +flat = true + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="4"] +stream = ExtResource("5_gf3d2") +bus = &"SFX" + +[connection signal="pressed" from="MusicButton/Button" to="." method="_on_button_pressed"] diff --git a/scripts/ads/ads_music.gd b/scripts/ads/ads_music.gd index 4e92afc..37dde44 100644 --- a/scripts/ads/ads_music.gd +++ b/scripts/ads/ads_music.gd @@ -1,9 +1,14 @@ extends "res://scripts/ads/ads_default.gd" -# TODO +@onready var button := $MusicButton/Button +@onready var player := $AudioStreamPlayer func _ready(): - pass + await get_tree().create_timer(randf_range(0, 2.5)).timeout + player.play() func exit_condition(): return condition + +func _on_button_pressed(): + condition = true