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

Don't rely on parent's clock

Browse Source
This commit is contained in:
Dean Herbert 2017-05-19 22:12:09 +09:00
parent aef82acb0d
commit 20156d26f9
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,13 +160,13 @@ namespace osu.Game.Screens.Play
}, },
Children = new Drawable[] Children = new Drawable[]
{ {
new SkipButton(firstObjectTime) { AudioClock = decoupledClock },
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Clock = offsetClock, Clock = offsetClock,
Children = new Drawable[] Children = new Drawable[]
{ {
new SkipButton(firstObjectTime) { AudioClock = decoupledClock, Depth = 1 },
HitRenderer, HitRenderer,
} }
}, },

13
osu.Game/Screens/Play/SkipButton.cs
View File

@ -54,6 +54,11 @@ namespace osu.Game.Screens.Play
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
var baseClock = Clock;
if (AudioClock != null)
Clock = new FramedClock(AudioClock);
Children = new Drawable[] Children = new Drawable[]
{ {
fadeContainer = new FadeContainer fadeContainer = new FadeContainer
@ -63,6 +68,7 @@ namespace osu.Game.Screens.Play
{ {
button = new Button button = new Button
{ {
Clock = baseClock,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
}, },
@ -109,7 +115,7 @@ namespace osu.Game.Screens.Play
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
remainingTimeBox.Width = (float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)); remainingTimeBox.ResizeWidthTo((float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)), 120, EasingTypes.OutQuint);
} }
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
@ -273,9 +279,10 @@ namespace osu.Game.Screens.Play
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)
{ {
box.FlashColour(Color4.White, 500, EasingTypes.OutQuint);
Action?.Invoke(); Action?.Invoke();
box.FlashColour(Color4.White, 500, EasingTypes.OutQuint);
aspect.ScaleTo(1.2f, 2000, EasingTypes.OutQuint);
return true; return true;
} }
} }