diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs index 23fc7ca9ea..44331d9679 100644 --- a/osu.Game/Beatmaps/Beatmap.cs +++ b/osu.Game/Beatmaps/Beatmap.cs @@ -47,9 +47,9 @@ namespace osu.Game.Beatmaps public Storyboard Storyboard = new Storyboard(); /// - /// Whether this beatmap's Storyboard uses the background texture in its Background layer. + /// Whether this beatmap's background should be hidden while its storyboard is being displayed. /// - public bool StoryboardUsesBackground + public bool StoryboardReplacesBackground { get { diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index d0f0280c74..7675ba0ee4 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -70,7 +70,7 @@ namespace osu.Game.Screens.Play #endregion private DrawableStoryboard storyboard; - private bool storyboardUsesBackground; + private bool storyboardReplacesBackground; private HUDOverlay hudOverlay; private FailOverlay failOverlay; @@ -212,7 +212,7 @@ namespace osu.Game.Screens.Play scoreProcessor = RulesetContainer.CreateScoreProcessor(); - storyboardUsesBackground = beatmap.StoryboardUsesBackground; + storyboardReplacesBackground = beatmap.StoryboardReplacesBackground; storyboard.Width = storyboard.Height * beatmap.BeatmapInfo.StoryboardAspect; storyboard.Masking = true; storyboard.Alpha = showStoryboard ? 1 : 0; @@ -341,9 +341,9 @@ namespace osu.Game.Screens.Play { var opacity = 1 - (float)dimLevel; storyboard.FadeColour(new Color4(opacity, opacity, opacity, 1), 800); - storyboard.FadeTo(!showStoryboard || opacity == 0 ? 0 : 1, 800); + storyboard.FadeTo(!showStoryboard || opacity == 0 ? 0 : 1, 200); - Background?.FadeTo(showStoryboard && storyboardUsesBackground ? 0 : opacity, 800, Easing.OutQuint); + Background?.FadeTo(showStoryboard && storyboardReplacesBackground ? 0 : opacity, 800, Easing.OutQuint); } private void fadeOut()