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 88e2098..3418b1b 100644 Binary files a/UnityProject/Assets/FMOD/.cache/buildrecords/Desktop/Master.br and b/UnityProject/Assets/FMOD/.cache/buildrecords/Desktop/Master.br differ 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 @@ - - - - - {619f11d3-6adc-4b5b-8080-593f4ea05814} - - - {70f2f5a8-7a22-44da-b089-96c4a38cd474} - - - - - Event Editor 1 - - - AAAAAQAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAP////sAAAT/AAAC7wAAAUAAAABmAAAFDwAAAgkAAAAAAgAAAAUAAAAAAAAAABEAAAT/AAAC7w== - - - {32eaa8ae-4c5c-429a-8997-58b12263169e} - - - - diff --git a/UnityProject/Assets/FMOD/Build/Desktop/Master.bank b/UnityProject/Assets/FMOD/Build/Desktop/Master.bank index 4fe2deb..2e8c0a3 100644 Binary files a/UnityProject/Assets/FMOD/Build/Desktop/Master.bank and b/UnityProject/Assets/FMOD/Build/Desktop/Master.bank differ 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 @@ + {b107d6f1-5f99-4331-a15e-1d76623df075} @@ -72,6 +74,7 @@ {ff225c16-4fad-4fa7-93ca-f38f733f96ab} + {6089229d-a3f9-4b17-9df6-0d46fa7bddc4} @@ -124,6 +127,20 @@ {242d72bc-f049-4af8-81fa-8aa6bd32b343} + + + 0 + + + 88 + + + {b7a997c1-cc09-4a97-a6c0-5ce074b19e59} + + + {6ec4f1ab-71e3-40c3-9549-6d782b603ca9} + + {f098e37b-c9c8-457a-ab20-13834f4e0d30} diff --git a/UnityProject/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset b/UnityProject/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset index 72b3ba3..ca3d24e 100644 --- a/UnityProject/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset +++ b/UnityProject/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset @@ -116,10 +116,10 @@ MonoBehaviour: Path: Assets/FMOD/Build/Desktop/Master.bank Name: Master StudioPath: bank:/Master - lastModified: 638767954274226252 + lastModified: 638768733132477686 FileSizes: - Name: Desktop - Value: 7279392 + Value: 7279520 Exists: 1 --- !u!114 &-1308961276341546955 MonoBehaviour: @@ -180,7 +180,7 @@ MonoBehaviour: - {fileID: -1401637302299783264} StringsBanks: - {fileID: 8641842500893547333} - cacheTime: 638767954276651800 + cacheTime: 638768733132487944 cacheVersion: 131622 --- !u!114 &2072186320137544863 MonoBehaviour: @@ -285,7 +285,7 @@ MonoBehaviour: - {fileID: -1401637302299783264} IsStream: 1 Is3D: 0 - IsOneShot: 1 + IsOneShot: 0 Parameters: [] MinDistance: 1 MaxDistance: 20 @@ -356,7 +356,7 @@ MonoBehaviour: Path: Assets/FMOD/Build/Desktop/Master.strings.bank Name: Master.strings StudioPath: bank:/Master.strings - lastModified: 638767954274247009 + lastModified: 638768733132487944 FileSizes: - Name: Desktop Value: 1234