From 6a90fda820d125d4333e26cee46a7ce0225249d9 Mon Sep 17 00:00:00 2001
From: tailtoolong <164694220+tailtoolong@users.noreply.github.com>
Date: Thu, 6 Mar 2025 16:09:42 -0500
Subject: [PATCH] Fix music playing
- Music loops
- Space no longer toggles music
- Pressing Enter to exit tutorial window starts music
---
.../Scripts/EasyRhythmAudioManager.cs | 10 ++++++--
.../.cache/buildrecords/Desktop/Master.br | Bin 140 -> 140 bytes
...341e-5f92-49d4-8c8c-f3800acacb4f}.user.xml | 4 ---
.../.unsaved/.user/Metadata/Mixer.user.xml | 4 ---
.../.user/Metadata/Workspace.user.xml | 23 ------------------
.../Assets/FMOD/Build/Desktop/Master.bank | Bin 7279392 -> 7279520 bytes
...{8b4cfef1-6a86-403e-8acc-465b113a8f68}.xml | 17 +++++++++++++
.../FMOD/Cache/Editor/FMODStudioCache.asset | 10 ++++----
8 files changed, 30 insertions(+), 38 deletions(-)
delete mode 100644 UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Asset/{b482341e-5f92-49d4-8c8c-f3800acacb4f}.user.xml
delete mode 100644 UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Mixer.user.xml
delete mode 100644 UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Workspace.user.xml
diff --git a/UnityProject/Assets/EasyRhythm/Scripts/EasyRhythmAudioManager.cs b/UnityProject/Assets/EasyRhythm/Scripts/EasyRhythmAudioManager.cs
index 707d6e4..ebef55d 100644
--- a/UnityProject/Assets/EasyRhythm/Scripts/EasyRhythmAudioManager.cs
+++ b/UnityProject/Assets/EasyRhythm/Scripts/EasyRhythmAudioManager.cs
@@ -20,13 +20,13 @@ void Start()
// Passes the EventReference so EasyEvent can create the FMOD Event instance
// Passes an array of listeners through (IEasyListener) so the audio event knows which objects want to listen to the callbacks
myAudioEvent = new EasyEvent(myEventPath, myEventListeners);
- myAudioEvent.start();
+ //myAudioEvent.start();
}
public void Update()
{
// Press space bar to start and stop the audio event
- if (Input.GetKeyDown(KeyCode.Space))
+ /*if (Input.GetKeyDown(KeyCode.Space))
{
if (!myAudioEvent.IsPlaying())
{
@@ -38,6 +38,12 @@ public void Update()
myAudioEvent.stop();
}
+ }*/
+
+ if (Input.GetKeyDown(KeyCode.Return))
+ {
+ myAudioEvent.start();
+
}
}
diff --git a/UnityProject/Assets/FMOD/.cache/buildrecords/Desktop/Master.br b/UnityProject/Assets/FMOD/.cache/buildrecords/Desktop/Master.br
index 88e2098e1f8742e68fb7d9e371ea208c74a6030a..3418b1b99572777a9513844dc7dc4ed9bb7b8da7 100644
GIT binary patch
delta 68
zcmeBS>|r!<3UYO3U|?VbVgcRAJe!t9#lKBY`=&qgxbhV!#^mPd;|io181jV|0F_P6
SwOtcG(L{>{NGD88(gFZ-EfYKd
delta 68
zcmeBS>|r!<3UYO3U|?VbVu5gnpEq)LY8`T&d#gf6#rHT+jLFT@#}!C3Fysp>0F_P6
Sm}zxyqKOs@kbW>RNecjMqZ2Ct
diff --git a/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Asset/{b482341e-5f92-49d4-8c8c-f3800acacb4f}.user.xml b/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Asset/{b482341e-5f92-49d4-8c8c-f3800acacb4f}.user.xml
deleted file mode 100644
index ce93198..0000000
--- a/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Asset/{b482341e-5f92-49d4-8c8c-f3800acacb4f}.user.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Mixer.user.xml b/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Mixer.user.xml
deleted file mode 100644
index 7102e2c..0000000
--- a/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Mixer.user.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Workspace.user.xml b/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Workspace.user.xml
deleted file mode 100644
index 86d1a6e..0000000
--- a/UnityProject/Assets/FMOD/.unsaved/.user/Metadata/Workspace.user.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/UnityProject/Assets/FMOD/Build/Desktop/Master.bank b/UnityProject/Assets/FMOD/Build/Desktop/Master.bank
index 4fe2debdd4e301450c7cfbd24cf83e3cfc3b097c..2e8c0a3c0796da02e702d30c3d1b5d28182d39f3 100644
GIT binary patch
delta 706
zcmZY2Nlz1D7{KxAbQD_b!XhAw)PgLs3014eQd$@&Ob3|0q9B`q0t%845=lIe)B`aw
zUM3+NC?O%r72?4QF&v2c5rD+6;L(6y{7+9LJjpM4w)c5AKkwN$xA*LRBdV%v+4GXx
z-tSXm!j~>d(noxN7L5zHch{feu;rRTM?m(<=B#7Yb;3-fg7&4p_2cF=R%Z70c74!qDSdL>CIV4c7hMRKHbc7H%Y;Tv(qP|JSJ~
z`=5S)|8aDD?&@O5y2<9*_!*Wdg&{Pn8xcm2RohZOELoE;E6$)IhrH&#`qREAkc}K%MlSM@k1Hs^Ra`?MuA>M(+<+g&
zD8WsXq73Dzz%5jw3e~7VEpDR@^$6e&?&2PTxQ_>Dz(X{m3C(Ch2(1Vsf;O~6MF%<&
zMHjlEAqE{i=tUn4#3Aqq{dkNg7{DN&VhF<+!6?S?4C9!TaVh*pr
JCOq>S_W!_i*ogoD
delta 561
zcmWm5OEW?N0EXeyDXK$G6mn0lA-CMGi4LVg9l4kLHQL%)SlF1x%$cz?tymiio5uJB
zw*H78;BE12-fzC#TV9`g&FfvUprSZz89@mooJvG>ngl_};t}CsT+PbwF1uO#F&edL
zvqyZ=X=(Gb<(5^AgrjOW>Q890KmMeULHw3ApZsM=-u?RTMeBoT
z)j@m+aF0`N(ZD>aa
zI^jkay3qpAKsJJ`h@l1O162ROtLj&XuhoZ%c7xWpCGxW>(=XwAIn{{bDl
Bd6fVF
diff --git a/UnityProject/Assets/FMOD/Metadata/Event/{8b4cfef1-6a86-403e-8acc-465b113a8f68}.xml b/UnityProject/Assets/FMOD/Metadata/Event/{8b4cfef1-6a86-403e-8acc-465b113a8f68}.xml
index 717d7f4..0762ee4 100644
--- a/UnityProject/Assets/FMOD/Metadata/Event/{8b4cfef1-6a86-403e-8acc-465b113a8f68}.xml
+++ b/UnityProject/Assets/FMOD/Metadata/Event/{8b4cfef1-6a86-403e-8acc-465b113a8f68}.xml
@@ -24,6 +24,7 @@
{242d72bc-f049-4af8-81fa-8aa6bd32b343}
+ {6ec4f1ab-71e3-40c3-9549-6d782b603ca9}
{ce5584cd-dce0-464b-9f1f-1b702fec5553}
@@ -58,6 +59,7 @@
+
+