Merge branch 'master' into osu-fade-slider-body-on-hit

This commit is contained in:
Dan Balasescu
2020-12-02 11:03:04 +09:00
committed by GitHub
20 changed files with 200 additions and 110 deletions

View File

@ -255,7 +255,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
if (userTriggered || Time.Current < HitObject.EndTime)
return;
ApplyResult(r => r.Type = r.Judgement.MaxResult);
ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
}
public override void PlaySamples()