RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up flow of actual skip operation

Browse Source
This commit is contained in:
Dean Herbert 2022-08-16 14:27:02 +09:00
parent 9a1a7bae89
commit 63819648df
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,11 +372,8 @@ namespace osu.Game.Screens.Play
IsBreakTime.BindTo(breakTracker.IsBreakTime);
IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
skipIntroOverlay.IsSkippable.ValueChanged += e =>
{
if (Configuration.AutomaticallySkipIntro && e.NewValue && RestartCount > 0)
performUserRequestedSkip();
};
if (Configuration.AutomaticallySkipIntro)
skipIntroOverlay.SkipWhenReady();
}
protected virtual GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new MasterGameplayClockContainer(beatmap, gameplayStart);

20
osu.Game/Screens/Play/SkipOverlay.cs
View File

@ -8,7 +8,6 @@ using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@ -40,8 +39,7 @@ namespace osu.Game.Screens.Play
private double displayTime;
private bool isClickable;
public IBindable<bool> IsSkippable = new Bindable<bool>();
private bool skipQueued;
[Resolved]
private IGameplayClock gameplayClock { get; set; }
@ -94,8 +92,6 @@ namespace osu.Game.Screens.Play
}
}
};
IsSkippable.BindTo(button.Enabled);
}
private const double fade_time = 300;
@ -130,6 +126,20 @@ namespace osu.Game.Screens.Play
displayTime = gameplayClock.CurrentTime;
fadeContainer.TriggerShow();
if (skipQueued)
{
Scheduler.AddDelayed(() => button.TriggerClick(), 200);
skipQueued = false;
}
}
public void SkipWhenReady()
{
if (IsLoaded)
button.TriggerClick();
else
skipQueued = true;
}
protected override void Update()