1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-18 03:27:20 +08:00

Reorder fields in BeatmapOffsetControl and MasterGameplayClockContainer

This commit is contained in:
Dean Herbert 2022-03-01 19:57:09 +09:00
parent 7d11cfb301
commit 6c09237956
2 changed files with 19 additions and 19 deletions

View File

@ -61,6 +61,14 @@ namespace osu.Game.Screens.Play
private Bindable<double> userAudioOffset;
private double startOffset;
private IDisposable beatmapOffsetSubscription;
[Resolved]
private RealmAccess realm { get; set; }
[Resolved]
private OsuConfigManager config { get; set; }
public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
: base(beatmap.Track)
{
@ -71,14 +79,6 @@ namespace osu.Game.Screens.Play
firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
}
[Resolved]
private RealmAccess realm { get; set; }
[Resolved]
private OsuConfigManager config { get; set; }
private IDisposable beatmapOffsetSubscription;
protected override void LoadComplete()
{
base.LoadComplete();

View File

@ -44,6 +44,17 @@ namespace osu.Game.Screens.Play.PlayerSettings
private readonly FillFlowContainer referenceScoreContainer;
private IDisposable beatmapOffsetSubscription;
[Resolved]
private RealmAccess realm { get; set; }
[Resolved]
private IBindable<WorkingBeatmap> beatmap { get; set; }
[Resolved]
private OsuColour colours { get; set; }
public BeatmapOffsetControl()
{
RelativeSizeAxes = Axes.X;
@ -74,17 +85,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
};
}
[Resolved]
private RealmAccess realm { get; set; }
[Resolved]
private IBindable<WorkingBeatmap> beatmap { get; set; }
[Resolved]
private OsuColour colours { get; set; }
private IDisposable beatmapOffsetSubscription;
protected override void LoadComplete()
{
base.LoadComplete();