sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reorder fields in BeatmapOffsetControl and MasterGameplayClockContainer

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Screens/Play/MasterGameplayClockContainer.cs
View File

@ -61,6 +61,14 @@ namespace osu.Game.Screens.Play
private Bindable<double> userAudioOffset; private Bindable<double> userAudioOffset;
private double startOffset; 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) public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
: base(beatmap.Track) : base(beatmap.Track)
{ {
@ -71,14 +79,6 @@ namespace osu.Game.Screens.Play
firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime; 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() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();

22
osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
View File

@ -44,6 +44,17 @@ namespace osu.Game.Screens.Play.PlayerSettings
private readonly FillFlowContainer referenceScoreContainer; 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() public BeatmapOffsetControl()
{ {
RelativeSizeAxes = Axes.X; 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() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();