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

Don't schedule event, it's unreliable and doesn't match the fade.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-10 17:25:46 +09:00
parent 7366640b95
commit 15c1013f5b
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Screens/Play/HotkeyRetryOverlay.cs
View File

@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using OpenTK.Graphics;
using osu.Framework.Threading;
namespace osu.Game.Screens.Play
{
@ -20,12 +19,13 @@ namespace osu.Game.Screens.Play
public Action Action;
private SampleChannel retrySample;
private ScheduledDelegate task;
private Box overlay;
private const int activate_delay = 500;
private const int fadeout_delay = 200;
private bool fired;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
@ -52,13 +52,6 @@ namespace osu.Game.Screens.Play
if (args.Key == Key.Tilde)
{
overlay.FadeIn(activate_delay);
task = Scheduler.AddDelayed(() =>
{
retrySample.Play();
Action();
}, activate_delay);
return true;
}
@ -67,14 +60,24 @@ namespace osu.Game.Screens.Play
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
{
if (args.Key == Key.Tilde)
if (args.Key == Key.Tilde && !fired)
{
task?.Cancel();
overlay.FadeOut(fadeout_delay);
return true;
}
return base.OnKeyUp(state, args);
}
protected override void Update()
{
base.Update();
if (!fired && overlay.Alpha == 1)
{
fired = true;
retrySample.Play();
Action?.Invoke();
}
}
}
}