RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show score after the end of the storyboard after it was toggled

This commit is contained in:
Christine Chen 2021-04-17 17:55:46 -04:00
parent fdcb5e924c
commit 97bacbdc76
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Play/DimmableStoryboard.cs
View File

@ -50,6 +50,7 @@ private void initializeStoryboard(bool async)
return;
drawableStoryboard = storyboard.CreateDrawable();
HasStoryboardEnded.BindTo(drawableStoryboard.HasStoryboardEnded);
if (async)
LoadComponentAsync(drawableStoryboard, onStoryboardCreated);
@ -63,6 +64,6 @@ private void onStoryboardCreated(DrawableStoryboard storyboard)
OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
}
public IBindable<bool> HasStoryboardEnded => drawableStoryboard?.HasStoryboardEnded;
public IBindable<bool> HasStoryboardEnded = new BindableBool(true);
}
}

10
osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
View File

@ -95,15 +95,13 @@ protected override void Update()
/// </summary>
public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
private readonly BindableBool hasStoryboardEnded = new BindableBool();
private void updateHasStoryboardEnded()
{
if (Storyboard.LatestEventTime == null)
return;
var time = Clock.CurrentTime;
hasStoryboardEnded.Value = time >= Storyboard.LatestEventTime;
hasStoryboardEnded.Value =
Storyboard.LatestEventTime == null ||
Time.Current >= Storyboard.LatestEventTime;
}
}
}