etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 03:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #31 from saladplainzone/master

Browse source 
DJ School: SFX Syncing
This commit is contained in:
Braedon 2022-02-11 22:53:39 -05:00 committed by GitHub
commit d50da5acbd
7 changed files with 141 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg.meta Normal file
View file

@ -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:

22
Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg.meta Normal file
View file

@ -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:

22
Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg.meta Normal file
View file

@ -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:

22
Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg.meta Normal file
View file

@ -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:

22
Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg.meta Normal file
View file

@ -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:

22
Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg.meta Normal file
View file

@ -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:

16
Assets/Scripts/Games/DJSchool/DJSchool.cs
View file

@ -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<BeatAction.Action>()