h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 15:12:57 +08:00
Code Issues Releases Wiki Activity

Make RemainingTimeCounter into a Counter

Browse Source
This commit is contained in:
smoogipoo 2017-11-06 14:58:05 +09:00
parent 4854302aaa
commit 2fbd490626
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Play/BreaksOverlay/BreakOverlay.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Screens.Play.BreaksOverlay namespace osu.Game.Screens.Play.BreaksOverlay
{ {
@ -115,7 +116,7 @@ namespace osu.Game.Screens.Play.BreaksOverlay
.Then() .Then()
.ResizeWidthTo(1); .ResizeWidthTo(1);
remainingTimeCounter.CountTo(b.Duration); remainingTimeCounter.CountTo(b.Duration).CountTo(0, b.Duration);
} }
using (BeginAbsoluteSequence(b.StartTime)) using (BeginAbsoluteSequence(b.StartTime))

21
osu.Game/Screens/Play/BreaksOverlay/RemainingTimeCounter.cs
View File

@ -6,10 +6,11 @@ using osu.Game.Graphics.Sprites;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using System; using System;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Screens.Play.BreaksOverlay namespace osu.Game.Screens.Play.BreaksOverlay
{ {
public class RemainingTimeCounter : Container public class RemainingTimeCounter : Counter
{ {
private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2; private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
@ -18,7 +19,7 @@ namespace osu.Game.Screens.Play.BreaksOverlay
public RemainingTimeCounter() public RemainingTimeCounter()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Child = counter = new OsuSpriteText InternalChild = counter = new OsuSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -29,21 +30,7 @@ namespace osu.Game.Screens.Play.BreaksOverlay
Alpha = 0; Alpha = 0;
} }
public void CountTo(double duration) protected override void OnCountChanged(double count) => counter.Text = ((int)Math.Ceiling(count / 1000)).ToString();
{
double offset = 0;
while (duration > 0)
{
int seconds = (int)Math.Ceiling(duration / 1000);
counter.Delay(offset).TransformTextTo(seconds.ToString());
double localOffset = duration - (seconds - 1) * 1000 + 1; // +1 because we want the duration to be the next second when ceiled
offset += localOffset;
duration -= localOffset;
}
}
public override void Show() => this.FadeIn(fade_duration); public override void Show() => this.FadeIn(fade_duration);
public override void Hide() => this.FadeOut(fade_duration); public override void Hide() => this.FadeOut(fade_duration);