diff --git a/Assets/Audio/Music/I Feel Good.wav b/Assets/Audio/Music/I Feel Good.wav new file mode 100644 index 0000000..cf1862f Binary files /dev/null and b/Assets/Audio/Music/I Feel Good.wav differ diff --git a/Assets/Audio/Music/The Chase.ogg.meta b/Assets/Audio/Music/I Feel Good.wav.meta similarity index 100% rename from Assets/Audio/Music/The Chase.ogg.meta rename to Assets/Audio/Music/I Feel Good.wav.meta diff --git a/Assets/Audio/Music/Opening.wav b/Assets/Audio/Music/Opening.wav new file mode 100644 index 0000000..0cbe9f9 Binary files /dev/null and b/Assets/Audio/Music/Opening.wav differ diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta b/Assets/Audio/Music/Opening.wav.meta similarity index 95% rename from Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta rename to Assets/Audio/Music/Opening.wav.meta index 27648c7..8ebcd12 100644 --- a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta +++ b/Assets/Audio/Music/Opening.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d3a32efe2355015408181f263148aa5b +guid: 3706c5fb6f7901a429b0066b315e7a71 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Music/The Chase.ogg b/Assets/Audio/Music/The Chase.ogg deleted file mode 100644 index 1d3ec62..0000000 Binary files a/Assets/Audio/Music/The Chase.ogg and /dev/null differ diff --git a/Assets/Audio/Music/The Chase.wav b/Assets/Audio/Music/The Chase.wav new file mode 100644 index 0000000..bc6ee73 Binary files /dev/null and b/Assets/Audio/Music/The Chase.wav differ diff --git a/Assets/Audio/Music/Think About It.ogg.meta b/Assets/Audio/Music/The Chase.wav.meta similarity index 95% rename from Assets/Audio/Music/Think About It.ogg.meta rename to Assets/Audio/Music/The Chase.wav.meta index 0a989ce..aee5c97 100644 --- a/Assets/Audio/Music/Think About It.ogg.meta +++ b/Assets/Audio/Music/The Chase.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ada408cff3af7d64088105703fc32e60 +guid: ebb0e1809180b8e4b8ae4c4fe1671ae7 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Music/Think About It.ogg b/Assets/Audio/Music/Think About It.ogg deleted file mode 100644 index 76a83dc..0000000 Binary files a/Assets/Audio/Music/Think About It.ogg and /dev/null differ diff --git a/Assets/Audio/Music/Think About It.wav b/Assets/Audio/Music/Think About It.wav new file mode 100644 index 0000000..a037809 Binary files /dev/null and b/Assets/Audio/Music/Think About It.wav differ diff --git a/Assets/Audio/Music/Think About It.wav.meta b/Assets/Audio/Music/Think About It.wav.meta new file mode 100644 index 0000000..912cb26 --- /dev/null +++ b/Assets/Audio/Music/Think About It.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: fd2e7d68447011640a244f302d442395 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.84999996 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 0 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 0 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg deleted file mode 100644 index ab62246..0000000 Binary files a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg and /dev/null differ diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav new file mode 100644 index 0000000..e2d6266 Binary files /dev/null and b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav differ diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta new file mode 100644 index 0000000..6e5749a --- /dev/null +++ b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: f464650920c273d4fb42a86c4acaf05f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.84999996 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 0 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 0 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index a0606eb..b3cfe6a 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1021,7 +1021,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 24300002, guid: 6a25e5828fa5ccb4495cc6300b09a686, type: 2} m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -14773,7 +14773,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 24300002, guid: aee65367b763a1b48875117a038466bd, type: 2} m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 diff --git a/Assets/UdonSharp/GameManager.cs b/Assets/UdonSharp/GameManager.cs index b36657c..4e382ab 100644 --- a/Assets/UdonSharp/GameManager.cs +++ b/Assets/UdonSharp/GameManager.cs @@ -894,6 +894,17 @@ public class GameManager : UdonSharpBehaviour [NetworkCallable] public void PlayMusic(MusicEventType MusicEvent) + { + PlayMusicInternal(MusicEvent, false); + } + + [NetworkCallable] + public void PlayMusicLoop(MusicEventType MusicEvent) + { + PlayMusicInternal(MusicEvent, true); + } + + private void PlayMusicInternal(MusicEventType MusicEvent, bool Loop) { _MusicPlayer.Stop(); @@ -906,6 +917,8 @@ public class GameManager : UdonSharpBehaviour default: _MusicPlayer.clip = null; break; } + _MusicPlayer.loop = Loop; + if (_MusicPlayer.clip != null) _MusicPlayer.Play(); } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Raw Files/Music/I Feel Good.aup3 b/Raw Files/Music/I Feel Good.aup3 new file mode 100644 index 0000000..3cdcca2 Binary files /dev/null and b/Raw Files/Music/I Feel Good.aup3 differ diff --git a/Raw Files/Music/Opening.aup3 b/Raw Files/Music/Opening.aup3 new file mode 100644 index 0000000..c536579 Binary files /dev/null and b/Raw Files/Music/Opening.aup3 differ diff --git a/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 b/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 index 9173e93..8ebd8d5 100644 Binary files a/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 and b/Raw Files/Music/Where in The World Is Carmen Sandiego - Theme Edited.aup3 differ diff --git a/Raw Files/SFX/Woo Woo.aup3 b/Raw Files/SFX/Woo Woo.aup3 new file mode 100644 index 0000000..eae0813 Binary files /dev/null and b/Raw Files/SFX/Woo Woo.aup3 differ