h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 17:03:18 +08:00
Code Issues Releases Wiki Activity

Improve implementation

Browse Source
This commit is contained in:
BlauFx 2022-08-07 13:20:29 +02:00
parent bd43a9e96e
commit 09230304a4
No known key found for this signature in database
GPG Key ID: BB73374479D2AA97
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,10 +81,6 @@ namespace osu.Game.Screens.Play
private bool isRestarting; private bool isRestarting;
public bool RestartedViaHotkey;
public Bindable<bool> IsRestartingFromHotkey = new Bindable<bool>();
private Bindable<bool> mouseWheelDisabled; private Bindable<bool> mouseWheelDisabled;
private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>(); private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
@ -291,7 +287,7 @@ namespace osu.Game.Screens.Play
{ {
if (!this.IsCurrentScreen()) return; if (!this.IsCurrentScreen()) return;
IsRestartingFromHotkey.Value = true; Configuration.AutomaticallySkipIntro = true;
fadeOut(true); fadeOut(true);
Restart(); Restart();
}, },
@ -373,8 +369,11 @@ namespace osu.Game.Screens.Play
skipIntroOverlay.IsSkippable.ValueChanged += e => skipIntroOverlay.IsSkippable.ValueChanged += e =>
{ {
if (RestartedViaHotkey && e.NewValue && RestartCount > 0) if (Configuration.AutomaticallySkipIntro && e.NewValue && RestartCount > 0)
{
Configuration.AutomaticallySkipIntro = false;
skipIntroOverlay.RequestSkip.Invoke(); skipIntroOverlay.RequestSkip.Invoke();
}
}; };
} }

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

@ -31,5 +31,7 @@ namespace osu.Game.Screens.Play
/// Whether the player should be allowed to skip intros/outros, advancing to the start of gameplay or the end of a storyboard. /// Whether the player should be allowed to skip intros/outros, advancing to the start of gameplay or the end of a storyboard.
/// </summary> /// </summary>
public bool AllowSkipping { get; set; } = true; public bool AllowSkipping { get; set; } = true;
public bool AutomaticallySkipIntro { get; set; }
} }
} }

12
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -365,17 +365,12 @@ namespace osu.Game.Screens.Play
CurrentPlayer = createPlayer(); CurrentPlayer = createPlayer();
CurrentPlayer.RestartCount = restartCount++; CurrentPlayer.RestartCount = restartCount++;
CurrentPlayer.RestartRequested = restartRequested; CurrentPlayer.RestartRequested = restartRequested;
CurrentPlayer.IsRestartingFromHotkey.ValueChanged += e =>
{
if (e.NewValue)
isHotKeyRestart = true;
};
LoadTask = LoadComponentAsync(CurrentPlayer, _ => LoadTask = LoadComponentAsync(CurrentPlayer, _ =>
{ {
if (isHotKeyRestart) if (isHotKeyRestart)
{ {
CurrentPlayer.RestartedViaHotkey = true; CurrentPlayer.Configuration.AutomaticallySkipIntro = true;
isHotKeyRestart = false; isHotKeyRestart = false;
} }
@ -390,6 +385,11 @@ namespace osu.Game.Screens.Play
private void restartRequested() private void restartRequested()
{ {
if (CurrentPlayer != null)
{
isHotKeyRestart = CurrentPlayer.Configuration.AutomaticallySkipIntro;
}
hideOverlays = true; hideOverlays = true;
ValidForResume = true; ValidForResume = true;
} }