diff --git a/Assets/Resources/Sfx/games/animalAcrobat/applause.wav b/Assets/Resources/Sfx/games/animalAcrobat/applause.wav new file mode 100644 index 000000000..bec501a24 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/applause.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/cymbal.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/applause.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/animalAcrobat/cymbal.ogg.meta rename to Assets/Resources/Sfx/games/animalAcrobat/applause.wav.meta index 4a151b738..2279dc2f2 100644 --- a/Assets/Resources/Sfx/games/animalAcrobat/cymbal.ogg.meta +++ b/Assets/Resources/Sfx/games/animalAcrobat/applause.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1c14ff688b4a4b44984038e94cd5e81 +guid: 00c03bbdfe1554f4ebf91af9f2b40788 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/animalAcrobat/audienceCheer.ogg b/Assets/Resources/Sfx/games/animalAcrobat/audienceCheer.ogg deleted file mode 100644 index 04d023134..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/audienceCheer.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/beginningLeap.ogg b/Assets/Resources/Sfx/games/animalAcrobat/beginningLeap.ogg deleted file mode 100644 index 98cfe1ff1..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/beginningLeap.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/catch.wav b/Assets/Resources/Sfx/games/animalAcrobat/catch.wav new file mode 100644 index 000000000..1af498f28 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/catch.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/audienceCheer.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/catch.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/animalAcrobat/audienceCheer.ogg.meta rename to Assets/Resources/Sfx/games/animalAcrobat/catch.wav.meta index 33af16122..c24f1ef01 100644 --- a/Assets/Resources/Sfx/games/animalAcrobat/audienceCheer.ogg.meta +++ b/Assets/Resources/Sfx/games/animalAcrobat/catch.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1fe51a2f72820f4b99f4fa77ebb93ee +guid: 8866bfc5a8d4a2e45930b07f7575af44 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/animalAcrobat/cracker.wav b/Assets/Resources/Sfx/games/animalAcrobat/cracker.wav new file mode 100644 index 000000000..c00cbf134 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/cracker.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/eek.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/cracker.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/animalAcrobat/eek.ogg.meta rename to Assets/Resources/Sfx/games/animalAcrobat/cracker.wav.meta index fe3478a54..f4de442aa 100644 --- a/Assets/Resources/Sfx/games/animalAcrobat/eek.ogg.meta +++ b/Assets/Resources/Sfx/games/animalAcrobat/cracker.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f4efa68ecb75f148a224956e98ae430 +guid: 00f7ca5bfe22e5345ad1264c91d7dfdd AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/animalAcrobat/cymbal.ogg b/Assets/Resources/Sfx/games/animalAcrobat/cymbal.ogg deleted file mode 100644 index 1b5e2a8fe..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/cymbal.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/eek.ogg b/Assets/Resources/Sfx/games/animalAcrobat/eek.ogg deleted file mode 100644 index 37414be19..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/eek.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/eek.wav b/Assets/Resources/Sfx/games/animalAcrobat/eek.wav new file mode 100644 index 000000000..c79af39d1 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/eek.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/beginningLeap.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/eek.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/animalAcrobat/beginningLeap.ogg.meta rename to Assets/Resources/Sfx/games/animalAcrobat/eek.wav.meta index 2628b3bc9..0b74dcb38 100644 --- a/Assets/Resources/Sfx/games/animalAcrobat/beginningLeap.ogg.meta +++ b/Assets/Resources/Sfx/games/animalAcrobat/eek.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 198f0969e798286468a7832edcc84201 +guid: 6e40d87e220fd4749bc3d7d51bd89782 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/animalAcrobat/eekAR.wav b/Assets/Resources/Sfx/games/animalAcrobat/eekAR.wav new file mode 100644 index 000000000..fd4e22d7b Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/eekAR.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/eekAR.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/eekAR.wav.meta new file mode 100644 index 000000000..58f43d854 --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/eekAR.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 94c40faa9eabaf74e8fb7cd1a1f2d74c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/eekUnused.ogg b/Assets/Resources/Sfx/games/animalAcrobat/eekUnused.ogg deleted file mode 100644 index c5b3993bf..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/eekUnused.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/eekUnused.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/eekUnused.ogg.meta deleted file mode 100644 index 8abf8e859..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/eekUnused.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 4aef3a4a10dcbe0429443ceca48935ee -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/flip.ogg b/Assets/Resources/Sfx/games/animalAcrobat/flip.ogg deleted file mode 100644 index e15c60554..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/flip.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/flip.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/flip.ogg.meta deleted file mode 100644 index 2b3d44beb..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/flip.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 853d788bb0a1fd6428de4d810c731658 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeCatch.wav b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCatch.wav new file mode 100644 index 000000000..b134b65e5 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCatch.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeCatch.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCatch.wav.meta new file mode 100644 index 000000000..4d6459784 --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCatch.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4d7019e871e06c74c83cd62f10780a34 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeCymbal.wav b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCymbal.wav new file mode 100644 index 000000000..642085ac5 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCymbal.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeCymbal.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCymbal.wav.meta new file mode 100644 index 000000000..62964f9fa --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/giraffeCymbal.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e952fb555ee8e1d4baa1ea98aa75701f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeDrumroll.wav b/Assets/Resources/Sfx/games/animalAcrobat/giraffeDrumroll.wav new file mode 100644 index 000000000..5eb6434ab Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/giraffeDrumroll.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeDrumroll.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/giraffeDrumroll.wav.meta new file mode 100644 index 000000000..6ecdd6b35 --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/giraffeDrumroll.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3408581295ca58c429bebe3c29ca3c37 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeJump.wav b/Assets/Resources/Sfx/games/animalAcrobat/giraffeJump.wav new file mode 100644 index 000000000..750102bff Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/giraffeJump.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeJump.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/giraffeJump.wav.meta new file mode 100644 index 000000000..f7bfbc061 --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/giraffeJump.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 20197a0f1df50e648beebd4aac269078 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeRelease.ogg b/Assets/Resources/Sfx/games/animalAcrobat/giraffeRelease.ogg deleted file mode 100644 index 4bebf24c3..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/giraffeRelease.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeRelease.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/giraffeRelease.ogg.meta deleted file mode 100644 index 74edf8ea3..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/giraffeRelease.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 0d19ba00d6009924fa2e8a4bf4baae6f -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeReleaseLoop.ogg b/Assets/Resources/Sfx/games/animalAcrobat/giraffeReleaseLoop.ogg deleted file mode 100644 index 8f6ccfa33..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/giraffeReleaseLoop.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/giraffeReleaseLoop.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/giraffeReleaseLoop.ogg.meta deleted file mode 100644 index 8b70dc7b1..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/giraffeReleaseLoop.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 20d5b59d0250a3b46b71eac99149b460 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/grab.ogg b/Assets/Resources/Sfx/games/animalAcrobat/grab.ogg deleted file mode 100644 index 158b2fe98..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/grab.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/grab.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/grab.ogg.meta deleted file mode 100644 index 93871946d..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/grab.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 623891bef14a8d84fbde980f0331eb41 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/land.wav b/Assets/Resources/Sfx/games/animalAcrobat/land.wav new file mode 100644 index 000000000..badc8bbd0 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/land.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/land.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/land.wav.meta new file mode 100644 index 000000000..b013ce015 --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/land.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 47521a3d444d1b547ab7b02067dd950f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/landing.ogg b/Assets/Resources/Sfx/games/animalAcrobat/landing.ogg deleted file mode 100644 index 72206f5a8..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/landing.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/landing.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/landing.ogg.meta deleted file mode 100644 index 508c404a9..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/landing.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: b13d3a46f86d4414d848c0dd3b506542 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/laugh.wav b/Assets/Resources/Sfx/games/animalAcrobat/laugh.wav new file mode 100644 index 000000000..cbd2159a5 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/laugh.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/laugh.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/laugh.wav.meta new file mode 100644 index 000000000..aee6b6733 --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/laugh.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 529fd68be31cb4243913390d3d21f3cb +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/miss.wav b/Assets/Resources/Sfx/games/animalAcrobat/miss.wav new file mode 100644 index 000000000..fd46b1f90 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/miss.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/miss.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/miss.wav.meta new file mode 100644 index 000000000..84d84d7bd --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/miss.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c5bd6d197fa537c468d489b2b97d8d58 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/poppers.ogg b/Assets/Resources/Sfx/games/animalAcrobat/poppers.ogg deleted file mode 100644 index e9468b620..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/poppers.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/poppers.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/poppers.ogg.meta deleted file mode 100644 index 3ed347435..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/poppers.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 0fc56e2a74b63fc4180cc06a92ae2d99 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/release.ogg b/Assets/Resources/Sfx/games/animalAcrobat/release.ogg deleted file mode 100644 index 34db3d0b4..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/release.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/release.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/release.ogg.meta deleted file mode 100644 index 2863c6bb0..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/release.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 3f91cc4997fe6554c826e568e09a93e2 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/release.wav b/Assets/Resources/Sfx/games/animalAcrobat/release.wav new file mode 100644 index 000000000..bd78ac73f Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/release.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/release.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/release.wav.meta new file mode 100644 index 000000000..f9dd1fc5f --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/release.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b2bec822f4484a04abdd16bf1589c7e1 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/return.wav b/Assets/Resources/Sfx/games/animalAcrobat/return.wav new file mode 100644 index 000000000..0c08b8369 Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/return.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/return.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/return.wav.meta new file mode 100644 index 000000000..823cb3949 --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/return.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c6a557fc738f13a458ed16341d304d79 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/ringOfFireCymbal.ogg b/Assets/Resources/Sfx/games/animalAcrobat/ringOfFireCymbal.ogg deleted file mode 100644 index f08ef343d..000000000 Binary files a/Assets/Resources/Sfx/games/animalAcrobat/ringOfFireCymbal.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/ringOfFireCymbal.ogg.meta b/Assets/Resources/Sfx/games/animalAcrobat/ringOfFireCymbal.ogg.meta deleted file mode 100644 index 5c4cd6281..000000000 --- a/Assets/Resources/Sfx/games/animalAcrobat/ringOfFireCymbal.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 734854c137d0ea747b40510d92894ae6 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/start.wav b/Assets/Resources/Sfx/games/animalAcrobat/start.wav new file mode 100644 index 000000000..7e12a7aac Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/start.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/start.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/start.wav.meta new file mode 100644 index 000000000..8c920ab1b --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/start.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 143f0a0f1056d444996046809fcf41ea +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/animalAcrobat/turn.wav b/Assets/Resources/Sfx/games/animalAcrobat/turn.wav new file mode 100644 index 000000000..5bfd5547e Binary files /dev/null and b/Assets/Resources/Sfx/games/animalAcrobat/turn.wav differ diff --git a/Assets/Resources/Sfx/games/animalAcrobat/turn.wav.meta b/Assets/Resources/Sfx/games/animalAcrobat/turn.wav.meta new file mode 100644 index 000000000..4c08cd86e --- /dev/null +++ b/Assets/Resources/Sfx/games/animalAcrobat/turn.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 80595f639ab8b5644abe2c96113a080b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/AnimalAcrobat/AcrobatObstacle.cs b/Assets/Scripts/Games/AnimalAcrobat/AcrobatObstacle.cs index 632a53f57..725f184a8 100644 --- a/Assets/Scripts/Games/AnimalAcrobat/AcrobatObstacle.cs +++ b/Assets/Scripts/Games/AnimalAcrobat/AcrobatObstacle.cs @@ -2,16 +2,17 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using HeavenStudio.Util; +using UnityEngine.Events; namespace HeavenStudio.Games.Scripts_AnimalAcrobat { public class AcrobatObstacle : MonoBehaviour { + [SerializeField] private UnityEvent _onInit; + [Header("Values")] [SerializeField] private float _fullRotRange; - [SerializeField] private float _spawnDistance; [SerializeField] private float _spawnOffset; - [SerializeField] private float _nextAnimalDistance; [SerializeField] private double _holdLength; [SerializeField] private EasingFunction.Ease _ease = EasingFunction.Ease.EaseInOutQuad; @@ -20,9 +21,7 @@ namespace HeavenStudio.Games.Scripts_AnimalAcrobat private float _halfRotRange; private EasingFunction.Function _func; - public float SpawnDistance => _spawnDistance; public float SpawnOffset => _spawnOffset; - public float NextAnimalDistance => _nextAnimalDistance; [Header("Components")] [SerializeField] private Transform _rotateRoot; @@ -38,6 +37,7 @@ namespace HeavenStudio.Games.Scripts_AnimalAcrobat { _startBeat = beat; _expirationBeat = expirationBeat; + _onInit.Invoke(_startBeat); Update(); } diff --git a/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs b/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs index 965ab74af..eccaee023 100644 --- a/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs +++ b/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs @@ -51,6 +51,9 @@ namespace HeavenStudio.Games [SerializeField] private AcrobatObstacle _elephant; [SerializeField] private AcrobatObstacle _giraffe, _monkeysLong, _monkeysShort; + [Header("Values")] + [SerializeField] private float _jumpDistance = 8; + private List _pooledElephants = new(), _pooledGiraffes = new(), _pooledMonkeysLong = new(), _pooledMonkeysShort = new(); private enum AnimalType @@ -104,7 +107,7 @@ namespace HeavenStudio.Games }; var animal = pooledObstacles.Find(x => x.IsAvailableAtBeat(currentAnimal.startBeat)); - _animalSummatedDistance += (_animalPoolIndex == 0) ? animal.SpawnOffset : animal.SpawnDistance; + _animalSummatedDistance += (_animalPoolIndex == 0) ? animal.SpawnOffset : animal.GetRotationDistance() + _jumpDistance; animal.gameObject.SetActive(true); double expBeat = currentAnimal.startBeat + currentAnimal.length; @@ -124,7 +127,6 @@ namespace HeavenStudio.Games animal.Init(currentAnimal.startBeat, expBeat); animal.transform.localPosition = new Vector3(_animalSummatedDistance, 0, 0); - _animalSummatedDistance += animal.NextAnimalDistance; _animalPoolIndex++; }