mirror of
https://github.com/ppy/osu.git
synced 2024-12-05 10:33:22 +08:00
Fix hidden dissmissing logic
This commit is contained in:
parent
672dbe6e03
commit
e8fae85e8d
@ -245,18 +245,19 @@ namespace osu.Game.Overlays
|
||||
this.FadeOut(200);
|
||||
}
|
||||
|
||||
public void Dismiss()
|
||||
public bool Dismiss()
|
||||
{
|
||||
if (drawableMedal != null && drawableMedal.State != DisplayState.Full)
|
||||
{
|
||||
// if we haven't yet, play out the animation fully
|
||||
drawableMedal.State = DisplayState.Full;
|
||||
FinishTransforms(true);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
Hide();
|
||||
Expire();
|
||||
return true;
|
||||
}
|
||||
|
||||
private partial class BackgroundStrip : Container
|
||||
|
@ -114,7 +114,10 @@ namespace osu.Game.Overlays
|
||||
if (currentMedalDisplay?.IsLoaded == false)
|
||||
return;
|
||||
|
||||
currentMedalDisplay?.Dismiss();
|
||||
// Dismissing may sometimes play out the medal animation rather than immediately dismissing.
|
||||
if (currentMedalDisplay?.Dismiss() == false)
|
||||
return;
|
||||
|
||||
currentMedalDisplay = null;
|
||||
|
||||
if (!queuedMedals.Any())
|
||||
|
Loading…
Reference in New Issue
Block a user