From a61c31448d0c152732002e9f405680c6c0faaecc Mon Sep 17 00:00:00 2001 From: Jellirby <80490342+Jellirby@users.noreply.github.com> Date: Tue, 21 Feb 2023 22:48:24 -0500 Subject: [PATCH] Fireworks Sound Effect Quality Improvement (#310) Does exactly what the title says --- .../{bomb.ogg.meta => explode_5.wav.meta} | 2 +- .../{explodeBomb.ogg.meta => nuei.ogg.meta} | 2 +- ...plodeRocket.ogg.meta => rocket_2.wav.meta} | 2 +- .../Sfx/games/fireworks/sparkler.ogg.meta | 22 ------------------- ...{rocket.ogg.meta => taikoExplode.wav.meta} | 2 +- .../Sfx/games/fireworks/tamaya_4.wav.meta | 22 +++++++++++++++++++ Assets/Scripts/Games/Fireworks/Fireworks.cs | 6 ++--- .../Scripts/Games/Fireworks/FireworksBomb.cs | 2 +- Assets/Scripts/Games/Fireworks/Rocket.cs | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) rename Assets/Resources/Sfx/games/fireworks/{bomb.ogg.meta => explode_5.wav.meta} (91%) rename Assets/Resources/Sfx/games/fireworks/{explodeBomb.ogg.meta => nuei.ogg.meta} (91%) rename Assets/Resources/Sfx/games/fireworks/{explodeRocket.ogg.meta => rocket_2.wav.meta} (91%) delete mode 100644 Assets/Resources/Sfx/games/fireworks/sparkler.ogg.meta rename Assets/Resources/Sfx/games/fireworks/{rocket.ogg.meta => taikoExplode.wav.meta} (91%) create mode 100644 Assets/Resources/Sfx/games/fireworks/tamaya_4.wav.meta diff --git a/Assets/Resources/Sfx/games/fireworks/bomb.ogg.meta b/Assets/Resources/Sfx/games/fireworks/explode_5.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/fireworks/bomb.ogg.meta rename to Assets/Resources/Sfx/games/fireworks/explode_5.wav.meta index 449b9e32..16e4e42f 100644 --- a/Assets/Resources/Sfx/games/fireworks/bomb.ogg.meta +++ b/Assets/Resources/Sfx/games/fireworks/explode_5.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 594e1d61c2c427a49b98ef7deb9551f9 +guid: 6594baedf84b45d4d838df6f559c6499 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/fireworks/explodeBomb.ogg.meta b/Assets/Resources/Sfx/games/fireworks/nuei.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/fireworks/explodeBomb.ogg.meta rename to Assets/Resources/Sfx/games/fireworks/nuei.ogg.meta index a98cfb0f..44767cbe 100644 --- a/Assets/Resources/Sfx/games/fireworks/explodeBomb.ogg.meta +++ b/Assets/Resources/Sfx/games/fireworks/nuei.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f85ec797d37d64409cbb31738b3d69f +guid: f7942eb9dec52f14ab393efd83f59805 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/fireworks/explodeRocket.ogg.meta b/Assets/Resources/Sfx/games/fireworks/rocket_2.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/fireworks/explodeRocket.ogg.meta rename to Assets/Resources/Sfx/games/fireworks/rocket_2.wav.meta index 4983380f..115dc0cc 100644 --- a/Assets/Resources/Sfx/games/fireworks/explodeRocket.ogg.meta +++ b/Assets/Resources/Sfx/games/fireworks/rocket_2.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba72946ccdd57ae4eaeed6035337c97b +guid: 3af3fff2b4184c04692072ba05c32cef AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/fireworks/sparkler.ogg.meta b/Assets/Resources/Sfx/games/fireworks/sparkler.ogg.meta deleted file mode 100644 index bc1e0de0..00000000 --- a/Assets/Resources/Sfx/games/fireworks/sparkler.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 7f9f888258ef0d24a93858fd10bb6651 -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/fireworks/rocket.ogg.meta b/Assets/Resources/Sfx/games/fireworks/taikoExplode.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/fireworks/rocket.ogg.meta rename to Assets/Resources/Sfx/games/fireworks/taikoExplode.wav.meta index 86e1da5a..643f00f6 100644 --- a/Assets/Resources/Sfx/games/fireworks/rocket.ogg.meta +++ b/Assets/Resources/Sfx/games/fireworks/taikoExplode.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e84be1cac56dcda42a0deb668fe363e6 +guid: ad01839d64123ba4cae9b5bd78e71833 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/fireworks/tamaya_4.wav.meta b/Assets/Resources/Sfx/games/fireworks/tamaya_4.wav.meta new file mode 100644 index 00000000..82da6acf --- /dev/null +++ b/Assets/Resources/Sfx/games/fireworks/tamaya_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1131eada75d4f1d4082c06f591428a7a +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/Fireworks/Fireworks.cs b/Assets/Scripts/Games/Fireworks/Fireworks.cs index ceb3d585..53aec1f1 100644 --- a/Assets/Scripts/Games/Fireworks/Fireworks.cs +++ b/Assets/Scripts/Games/Fireworks/Fireworks.cs @@ -192,14 +192,14 @@ namespace HeavenStudio.Games { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("fireworks/sparkler", beat, 1, 1, false, 0.223f) + new MultiSound.Sound("fireworks/nuei", beat, 1, 1, false, 0.223f) }, forcePlay: true); } else { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("fireworks/rocket", beat) + new MultiSound.Sound("fireworks/rocket_2", beat) }, forcePlay: true); } if (GameManager.instance.currentGame == "fireworks") @@ -260,7 +260,7 @@ namespace HeavenStudio.Games public void SpawnBomb(float beat, bool practice, bool applause) { - Jukebox.PlayOneShotGame("fireworks/bomb"); + Jukebox.PlayOneShotGame("fireworks/tamaya_4"); if (practice) { MultiSound.Play(new MultiSound.Sound[] diff --git a/Assets/Scripts/Games/Fireworks/FireworksBomb.cs b/Assets/Scripts/Games/Fireworks/FireworksBomb.cs index 5bf5ef23..fc34fa5d 100644 --- a/Assets/Scripts/Games/Fireworks/FireworksBomb.cs +++ b/Assets/Scripts/Games/Fireworks/FireworksBomb.cs @@ -55,7 +55,7 @@ namespace HeavenStudio.Games.Scripts_Fireworks void Success(PlayerActionEvent caller) { - Jukebox.PlayOneShotGame("fireworks/explodeBomb"); + Jukebox.PlayOneShotGame("fireworks/taikoExplode"); game.FadeFlashColor(Color.white, new Color(1, 1, 1, 0), 0.5f); if (applause) Jukebox.PlayOneShot("applause", caller.timer + caller.startBeat + 1f); } diff --git a/Assets/Scripts/Games/Fireworks/Rocket.cs b/Assets/Scripts/Games/Fireworks/Rocket.cs index 15d3f608..d4336711 100644 --- a/Assets/Scripts/Games/Fireworks/Rocket.cs +++ b/Assets/Scripts/Games/Fireworks/Rocket.cs @@ -60,7 +60,7 @@ namespace HeavenStudio.Games.Scripts_Fireworks void Success(PlayerActionEvent caller) { - Jukebox.PlayOneShotGame("fireworks/explodeRocket"); + Jukebox.PlayOneShotGame("fireworks/explode_5"); selectedParticleEffect.Play(); anim.gameObject.SetActive(false); if (applause) Jukebox.PlayOneShot("applause", caller.timer + caller.startBeat + 1f);