h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 04:33:21 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-testruleset-issues

Browse Source
This commit is contained in:
Dean Herbert 2018-05-14 20:21:49 +09:00 committed by GitHub
commit 4a92d1ddb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Screens/Play/Player.cs
View File

@ -162,7 +162,7 @@ namespace osu.Game.Screens.Play
hudOverlay.KeyCounter.IsCounting = pauseContainer.IsPaused; hudOverlay.KeyCounter.IsCounting = pauseContainer.IsPaused;
}, },
OnResume = () => hudOverlay.KeyCounter.IsCounting = true, OnResume = () => hudOverlay.KeyCounter.IsCounting = true,
Children = new Drawable[] Children = new[]
{ {
storyboardContainer = new Container storyboardContainer = new Container
{ {
@ -174,12 +174,12 @@ namespace osu.Game.Screens.Play
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Child = RulesetContainer Child = RulesetContainer
}, },
new SkipOverlay(firstObjectTime) new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks, scoreProcessor)
{ {
Clock = Clock, // skip button doesn't want to use the audio clock directly Anchor = Anchor.Centre,
Origin = Anchor.Centre,
ProcessCustomClock = false, ProcessCustomClock = false,
AdjustableClock = adjustableClock, Breaks = beatmap.Breaks
FramedClock = offsetClock,
}, },
hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, working, offsetClock, adjustableClock) hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, working, offsetClock, adjustableClock)
{ {
@ -188,13 +188,14 @@ namespace osu.Game.Screens.Play
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre
}, },
new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks, scoreProcessor) RulesetContainer.Cursor?.CreateProxy() ?? new Container(),
new SkipOverlay(firstObjectTime)
{ {
Anchor = Anchor.Centre, Clock = Clock, // skip button doesn't want to use the audio clock directly
Origin = Anchor.Centre,
ProcessCustomClock = false, ProcessCustomClock = false,
Breaks = beatmap.Breaks AdjustableClock = adjustableClock,
} FramedClock = offsetClock,
},
} }
}, },
failOverlay = new FailOverlay failOverlay = new FailOverlay