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

Clear all tasks and transforms when resetting Breaks

Browse Source
This commit is contained in:
EVAST9919 2017-10-02 00:44:57 +03:00
parent b62f2437ac
commit ac6c323f93
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,9 +5,11 @@ using OpenTK;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Threading;
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 System.Linq;
namespace osu.Game.Screens.Play.BreaksOverlay namespace osu.Game.Screens.Play.BreaksOverlay
{ {
@ -17,7 +19,21 @@ namespace osu.Game.Screens.Play.BreaksOverlay
private const float remaining_time_container_max_size = 0.3f; private const float remaining_time_container_max_size = 0.3f;
private const int vertical_margin = 25; private const int vertical_margin = 25;
public List<BreakPeriod> Breaks; private List<BreakPeriod> breaks;
public List<BreakPeriod> Breaks
{
set
{
breaks = value;
initializeBreaks();
}
get
{
return breaks;
}
}
private readonly List<ScheduledDelegate> tasks = new List<ScheduledDelegate>();
private readonly bool letterboxing; private readonly bool letterboxing;
private readonly LetterboxOverlay letterboxOverlay; private readonly LetterboxOverlay letterboxOverlay;
@ -71,15 +87,21 @@ namespace osu.Game.Screens.Play.BreaksOverlay
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
InitializeBreaks(); initializeBreaks();
} }
public void InitializeBreaks() private void initializeBreaks()
{ {
if (Breaks == null) FinishTransforms(true);
foreach (var t in tasks)
t.Cancel();
tasks.Clear();
if (breaks == null)
return; return;
foreach (var b in Breaks) foreach (var b in breaks)
{ {
if (!b.HasEffect) if (!b.HasEffect)
continue; continue;
@ -104,7 +126,9 @@ namespace osu.Game.Screens.Play.BreaksOverlay
.Then() .Then()
.ResizeWidthTo(0, b.Duration - fade_duration); .ResizeWidthTo(0, b.Duration - fade_duration);
Scheduler.AddDelayed(() => remainingTimeCounter.StartCounting(b.EndTime), b.StartTime - Clock.CurrentTime); tasks.Add(new ScheduledDelegate(() => remainingTimeCounter.StartCounting(b.EndTime), b.StartTime));
Scheduler.Add(tasks.Last());
remainingTimeCounter.FadeIn(fade_duration); remainingTimeCounter.FadeIn(fade_duration);
info.FadeIn(fade_duration); info.FadeIn(fade_duration);

4
osu.Game/Tests/Visual/TestCaseBreakOverlay.cs
View File

@ -37,8 +37,6 @@ namespace osu.Game.Tests.Visual
EndTime = Clock.CurrentTime + duration, EndTime = Clock.CurrentTime + duration,
} }
}; };
breakOverlay.InitializeBreaks();
} }
private void startMultipleBreaks() private void startMultipleBreaks()
@ -58,8 +56,6 @@ namespace osu.Game.Tests.Visual
EndTime = currentTime + 6000, EndTime = currentTime + 6000,
} }
}; };
breakOverlay.InitializeBreaks();
} }
} }
} }