1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-24 10:10:15 +08:00

Allow exit during matchmaking intro (#137)

This commit is contained in:
Dan Balasescu
2025-09-09 18:09:43 +09:00
committed by GitHub
Unverified
parent 449038d070
commit a436372b05
2 changed files with 7 additions and 9 deletions
@@ -37,11 +37,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
[Resolved]
private MusicController musicController { get; set; } = null!;
[Resolved]
private MatchmakingController controller { get; set; } = null!;
public override bool AllowUserExit => !ValidForResume;
private Sample? dateWindupSample;
private Sample? dateImpactSample;
private Sample? beatmapWindupSample;
@@ -56,6 +51,11 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
protected override BackgroundScreen CreateBackground() => new MatchmakingIntroBackgroundScreen(colourProvider);
public MatchmakingIntroScreen()
{
ValidForResume = false;
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
@@ -123,14 +123,10 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
updateAnimationState();
playDateWindupSample();
controller.SearchInForeground();
}
public override void OnSuspending(ScreenTransitionEvent e)
{
ValidForResume = false;
duckOperation?.Dispose();
this.FadeOut(800, Easing.OutQuint);
@@ -169,6 +169,8 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Screens
{
base.OnEntering(e);
controller.SearchInForeground();
client.MatchmakingJoinLobby().FireAndForget();
using (BeginDelayedSequence(800))