Merge branch 'master' into drawable-hit-object-hit-state-fix

This commit is contained in:
Dan Balasescu
2020-11-06 13:19:25 +09:00
committed by GitHub
13 changed files with 221 additions and 139 deletions

View File

@ -17,9 +17,11 @@ namespace osu.Game.Rulesets.Catch.Mods
private const double fade_out_offset_multiplier = 0.6;
private const double fade_out_duration_multiplier = 0.44;
protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
{
if (!(drawable is DrawableCatchHitObject catchDrawable))
base.ApplyNormalVisibilityState(hitObject, state);
if (!(hitObject is DrawableCatchHitObject catchDrawable))
return;
if (catchDrawable.NestedHitObjects.Any())