diff --git a/Assets/Resources/Sfx/games/djSchool/breakCmon1.ogg b/Assets/Resources/Sfx/games/djSchool/breakCmon1.ogg index c1be7f0e1..f14390910 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/breakCmon1.ogg and b/Assets/Resources/Sfx/games/djSchool/breakCmon1.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/breakCmonLoud2.ogg b/Assets/Resources/Sfx/games/djSchool/breakCmonLoud2.ogg index 77b18f006..0e3da7e5b 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/breakCmonLoud2.ogg and b/Assets/Resources/Sfx/games/djSchool/breakCmonLoud2.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHey1.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHey1.ogg index 405b20649..220d2b80f 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/scratchoHey1.ogg and b/Assets/Resources/Sfx/games/djSchool/scratchoHey1.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHey2.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHey2.ogg index d6c14b79e..f4b84eed7 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/scratchoHey2.ogg and b/Assets/Resources/Sfx/games/djSchool/scratchoHey2.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg new file mode 100644 index 000000000..404ffd9bc Binary files /dev/null and b/Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg.meta b/Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg.meta new file mode 100644 index 000000000..d890020a3 --- /dev/null +++ b/Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8284e6c1bd4f18e49992fc98a81986e1 +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/djSchool/scratchoHey4.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg new file mode 100644 index 000000000..d6c14b79e Binary files /dev/null and b/Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg.meta b/Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg.meta new file mode 100644 index 000000000..1af01cc41 --- /dev/null +++ b/Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 43ab9eb6d625bbd40bb579bd16aa7869 +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/djSchool/scratchoHeyAlt1.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg index ca915d1d5..ee63d7c18 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt2.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt2.ogg index 7699321fc..6c491173d 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt2.ogg and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt2.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg new file mode 100644 index 000000000..70eb9ab34 Binary files /dev/null and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg.meta b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg.meta new file mode 100644 index 000000000..7a022aebd --- /dev/null +++ b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7f6d06cbc286df843bc05dd224d62860 +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/djSchool/scratchoHeyAlt4.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg new file mode 100644 index 000000000..7699321fc Binary files /dev/null and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg.meta b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg.meta new file mode 100644 index 000000000..17fda94f3 --- /dev/null +++ b/Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d757563af7e58af4e9b00c00863e709b +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/djSchool/scratchoHeyLoud1.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg index a2c194877..57b47f7de 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud2.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud2.ogg index c100d87ce..eff935344 100644 Binary files a/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud2.ogg and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud2.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg new file mode 100644 index 000000000..c72c6d892 Binary files /dev/null and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg.meta b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg.meta new file mode 100644 index 000000000..e9d89e24f --- /dev/null +++ b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4ad03276ee80a9641b82544b9fa45bcc +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/djSchool/scratchoHeyLoud4.ogg b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg new file mode 100644 index 000000000..c100d87ce Binary files /dev/null and b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg differ diff --git a/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg.meta b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg.meta new file mode 100644 index 000000000..2a09ddd37 --- /dev/null +++ b/Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2d53e8307cf3ce14aa839ec2f8a28fa9 +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/DJSchool/DJSchool.cs b/Assets/Scripts/Games/DJSchool/DJSchool.cs index 525995121..888e08761 100644 --- a/Assets/Scripts/Games/DJSchool/DJSchool.cs +++ b/Assets/Scripts/Games/DJSchool/DJSchool.cs @@ -93,7 +93,7 @@ namespace RhythmHeavenMania.Games.DJSchool MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound(sounds[0], beat), - new MultiSound.Sound(sounds[1], beat + 1f), + new MultiSound.Sound(sounds[1], beat + 1f - 0.030f/Conductor.instance.secPerBeat), new MultiSound.Sound(sounds[2], beat + 2f), }); @@ -120,7 +120,7 @@ namespace RhythmHeavenMania.Games.DJSchool MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("djSchool/andStop1", beat), - new MultiSound.Sound("djSchool/andStop2", beat + 0.35f), + new MultiSound.Sound("djSchool/andStop2", beat + .5f - 0.1200f/Conductor.instance.secPerBeat), new MultiSound.Sound("djSchool/oohAlt", beat + 1.5f), }); @@ -145,22 +145,24 @@ namespace RhythmHeavenMania.Games.DJSchool if (type == 0) { - sounds = new string[] { "djSchool/scratchoHey1", "djSchool/scratchoHey2", "djSchool/hey" }; + sounds = new string[] { "djSchool/scratchoHey1", "djSchool/scratchoHey2", "djSchool/scratchoHey3", "djSchool/scratchoHey4", "djSchool/hey" }; } else if (type == 1) { - sounds = new string[] { "djSchool/scratchoHeyAlt1", "djSchool/scratchoHeyAlt2", "djSchool/heyAlt" }; + sounds = new string[] { "djSchool/scratchoHeyAlt1", "djSchool/scratchoHeyAlt2", "djSchool/scratchoHeyAlt3", "djSchool/scratchoHeyAlt4", "djSchool/heyAlt" }; } else if (type == 2) { - sounds = new string[] { "djSchool/scratchoHeyLoud1", "djSchool/scratchoHeyLoud2", "djSchool/heyLoud" }; + sounds = new string[] { "djSchool/scratchoHeyLoud1", "djSchool/scratchoHeyLoud2", "djSchool/scratchoHeyLoud3", "djSchool/scratchoHeyLoud4", "djSchool/heyLoud" }; } MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound(sounds[0], beat), - new MultiSound.Sound(sounds[1], beat + 1f), - new MultiSound.Sound(sounds[2], beat + 2f), + new MultiSound.Sound(sounds[1], beat + .25f), + new MultiSound.Sound(sounds[2], beat + .5f), + new MultiSound.Sound(sounds[3], beat + 1f - 0.0500f/Conductor.instance.secPerBeat), + new MultiSound.Sound(sounds[4], beat + 2f - 0.070f/Conductor.instance.secPerBeat), }); BeatAction.New(djYellow, new List()