h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:42:54 +08:00
Code Issues Releases Wiki Activity

Fix test failures

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-02-20 17:25:11 +01:00
parent 1db5cd3aba
commit 9b938f333d
No known key found for this signature in database
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Overlays/MedalOverlay.cs
View File

@ -34,6 +34,7 @@ namespace osu.Game.Overlays
private IAPIProvider api { get; set; } = null!;
private Container<Drawable> medalContainer = null!;
private MedalAnimation? lastAnimation;
[BackgroundDependencyLoader]
private void load()
@ -54,7 +55,7 @@ namespace osu.Game.Overlays
OverlayActivationMode.BindValueChanged(val =>
{
if (val.NewValue == OverlayActivation.All && (queuedMedals.Any() || medalContainer.Any()))
if (val.NewValue == OverlayActivation.All && (queuedMedals.Any() || medalContainer.Any() || lastAnimation?.IsLoaded == false))
Show();
}, true);
}
@ -89,21 +90,21 @@ namespace osu.Game.Overlays
{
base.Update();
if (medalContainer.Any())
if (medalContainer.Any() || lastAnimation?.IsLoaded == false)
return;
if (!queuedMedals.TryDequeue(out var medal))
if (!queuedMedals.TryDequeue(out lastAnimation))
{
Hide();
return;
}
LoadComponentAsync(medal, medalContainer.Add);
LoadComponentAsync(lastAnimation, medalContainer.Add);
}
protected override bool OnClick(ClickEvent e)
{
(medalContainer.FirstOrDefault(anim => anim.IsAlive) as MedalAnimation)?.Dismiss();
lastAnimation?.Dismiss();
return true;
}
@ -111,7 +112,7 @@ namespace osu.Game.Overlays
{
if (e.Action == GlobalAction.Back)
{
(medalContainer.FirstOrDefault(anim => anim.IsAlive) as MedalAnimation)?.Dismiss();
lastAnimation?.Dismiss();
return true;
}