1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 05:32:54 +08:00

Fix column lighting and key area not handling rewind correctly

This commit is contained in:
Dean Herbert 2022-10-06 20:17:35 +09:00
parent e81f550150
commit 207c76bdec

View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Pooling; using osu.Framework.Graphics.Pooling;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Platform;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Mania.Objects.Drawables;
@ -68,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.UI
private ISkinSource skin { get; set; } private ISkinSource skin { get; set; }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load(GameHost host)
{ {
skin.SourceChanged += onSourceChanged; skin.SourceChanged += onSourceChanged;
onSourceChanged(); onSourceChanged();
@ -82,7 +83,10 @@ namespace osu.Game.Rulesets.Mania.UI
Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground()) Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
{ {
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both,
// This is pretty dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
Clock = host.UpdateThread.Clock,
ProcessCustomClock = false,
}; };
InternalChildren = new[] InternalChildren = new[]
@ -94,7 +98,10 @@ namespace osu.Game.Rulesets.Mania.UI
HitObjectArea, HitObjectArea,
new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea()) new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
{ {
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both,
// This is pretty dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
Clock = host.UpdateThread.Clock,
ProcessCustomClock = false,
}, },
background, background,
TopLevelContainer, TopLevelContainer,