mirror of
https://github.com/osukey/osukey.git
synced 2025-08-05 23:53:51 +09:00
Retry on Tilde key
This commit is contained in:
@ -22,6 +22,10 @@ using System;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using osu.Framework.Threading;
|
using osu.Framework.Threading;
|
||||||
using osu.Game.Modes.Scoring;
|
using osu.Game.Modes.Scoring;
|
||||||
|
using OpenTK.Input;
|
||||||
|
using osu.Framework.Audio.Sample;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using OpenTK.Graphics;
|
||||||
|
|
||||||
namespace osu.Game.Screens.Play
|
namespace osu.Game.Screens.Play
|
||||||
{
|
{
|
||||||
@ -59,10 +63,16 @@ namespace osu.Game.Screens.Play
|
|||||||
private HudOverlay hudOverlay;
|
private HudOverlay hudOverlay;
|
||||||
private PauseOverlay pauseOverlay;
|
private PauseOverlay pauseOverlay;
|
||||||
private FailOverlay failOverlay;
|
private FailOverlay failOverlay;
|
||||||
|
private Box retryOverlay;
|
||||||
|
|
||||||
|
private SampleChannel SampleClick;
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config)
|
private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config)
|
||||||
{
|
{
|
||||||
|
AlwaysPresent = true;
|
||||||
|
SampleClick = audio.Sample.Get(@"Menu/menuback");
|
||||||
|
|
||||||
var beatmap = Beatmap.Beatmap;
|
var beatmap = Beatmap.Beatmap;
|
||||||
|
|
||||||
if (beatmap.BeatmapInfo?.Mode > PlayMode.Taiko)
|
if (beatmap.BeatmapInfo?.Mode > PlayMode.Taiko)
|
||||||
@ -157,6 +167,13 @@ namespace osu.Game.Screens.Play
|
|||||||
{
|
{
|
||||||
OnRetry = Restart,
|
OnRetry = Restart,
|
||||||
OnQuit = Exit,
|
OnQuit = Exit,
|
||||||
|
},
|
||||||
|
retryOverlay = new Box
|
||||||
|
{
|
||||||
|
Alpha = 0,
|
||||||
|
AlwaysPresent = true,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = Color4.Black,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -331,5 +348,41 @@ namespace osu.Game.Screens.Play
|
|||||||
private Bindable<bool> mouseWheelDisabled;
|
private Bindable<bool> mouseWheelDisabled;
|
||||||
|
|
||||||
protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
|
protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
|
||||||
|
|
||||||
|
private bool isHolded;
|
||||||
|
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
|
||||||
|
{
|
||||||
|
if (args.Repeat) return false;
|
||||||
|
|
||||||
|
if (args.Key == Key.Tilde)
|
||||||
|
{
|
||||||
|
isHolded = true;
|
||||||
|
|
||||||
|
retryOverlay.FadeIn(500);
|
||||||
|
|
||||||
|
Delay(500).Schedule(() =>{
|
||||||
|
if (isHolded)
|
||||||
|
{
|
||||||
|
SampleClick.Play();
|
||||||
|
Restart();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return base.OnKeyDown(state, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
|
||||||
|
{
|
||||||
|
if (args.Key == Key.Tilde)
|
||||||
|
{
|
||||||
|
isHolded = false;
|
||||||
|
retryOverlay.FadeOut(200);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return base.OnKeyUp(state, args);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Reference in New Issue
Block a user