RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-01 22:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scrolling-hitobjects-rewrite

Browse Source
This commit is contained in:
Dan Balasescu 2018-01-12 17:31:08 +09:00 committed by GitHub
commit bb9e89b452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Play/Player.cs
View File

@ -394,9 +394,8 @@ namespace osu.Game.Screens.Play
.FadeColour(OsuColour.Gray(opacity), duration, Easing.OutQuint) .FadeColour(OsuColour.Gray(opacity), duration, Easing.OutQuint)
.FadeTo(storyboardVisible && opacity > 0 ? 1 : 0, duration, Easing.OutQuint); .FadeTo(storyboardVisible && opacity > 0 ? 1 : 0, duration, Easing.OutQuint);
(Background as BackgroundScreenBeatmap)? (Background as BackgroundScreenBeatmap)?.BlurTo(new Vector2((float)blurLevel.Value * 25), duration, Easing.OutQuint);
.BlurTo(new Vector2((float)blurLevel.Value * 25), duration, Easing.OutQuint)? Background?.FadeTo(!storyboardVisible || beatmap.Background == null ? opacity : 0, duration, Easing.OutQuint);
.FadeTo(!storyboardVisible || beatmap.Background == null ? opacity : 0, duration, Easing.OutQuint);
} }
private void fadeOut() private void fadeOut()