RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-22 02:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7974 from peppy/fix-barline-lifetimes

Browse Source 
Fix bar lines in osu!taiko and osu!mania not correctly being cleaned up
This commit is contained in:
Dean Herbert 2020-02-25 21:15:27 +09:00 committed by GitHub
commit efa81c9f7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
View File

@ -71,8 +71,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
{ {
} }
protected override void UpdateStateTransforms(ArmedState state) protected override void UpdateStateTransforms(ArmedState state) => this.FadeOut(150);
{
}
} }
} }

3
osu.Game.Rulesets.Taiko/Objects/BarLine.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
namespace osu.Game.Rulesets.Taiko.Objects namespace osu.Game.Rulesets.Taiko.Objects
@ -8,5 +9,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
public class BarLine : TaikoHitObject, IBarLine public class BarLine : TaikoHitObject, IBarLine
{ {
public bool Major { get; set; } public bool Major { get; set; }
public override Judgement CreateJudgement() => new IgnoreJudgement();
} }
} }

2
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
View File

@ -54,5 +54,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
Alpha = 0.75f Alpha = 0.75f
}); });
} }
protected override void UpdateStateTransforms(ArmedState state) => this.FadeOut(150);
} }
} }

2
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -262,7 +262,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
} }
} }
if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue) if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue || HitObject.HitWindows == null)
Expire(); Expire();
} }
else else