h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 08:27:49 +08:00
Code Issues Releases Wiki Activity

Fix skin fallback not working as expected

Browse Source
This commit is contained in:
Dean Herbert 2023-06-30 18:09:50 +09:00
parent 010262c764
commit c72ebcfd53
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonDrumSamplePlayer.cs
View File

@ -34,10 +34,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
if (hitObject == null)
return;
var baseSample = new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL));
var originalSample = hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL);
// If the sample is provided by a legacy skin, we should not try and do anything special.
if (skinSource.FindProvider(s => s.GetSample(baseSample) != null) is LegacySkin)
if (skinSource.FindProvider(s => s.GetSample(originalSample) != null) is LegacySkinTransformer)
{
base.Play(hitType, strong);
return;
@ -49,15 +49,15 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
{
PlaySamples(new ISampleInfo[]
{
new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_CLAP : HitSampleInfo.HIT_NORMAL), true),
new VolumeAwareHitSampleInfo(originalSample, true),
// TODO: flourish should only play every time_between_flourishes.
new VolumeAwareHitSampleInfo(hitObject.CreateHitSampleInfo(hitType == HitType.Rim ? HitSampleInfo.HIT_FLOURISH : string.Empty), true),
baseSample
new VolumeAwareHitSampleInfo(originalSample)
});
}
else
{
PlaySamples(new ISampleInfo[] { new VolumeAwareHitSampleInfo(baseSample) });
PlaySamples(new ISampleInfo[] { new VolumeAwareHitSampleInfo(new VolumeAwareHitSampleInfo(originalSample)) });
}
}