sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into pause-logic-simplification

Browse Source
This commit is contained in:
Dean Herbert
2019-03-21 16:04:18 +09:00
parent f43e7a880c 6058f994e1
commit 15f9a6b9df
15 changed files with 207 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ namespace osu.Game.Screens.Play
if (StoryboardContainer == null || storyboard != null)
return;
if (!ShowStoryboard.Value)
if (!showStoryboard.Value)
return;
var beatmap = Beatmap.Value;
@ -93,6 +93,8 @@ namespace osu.Game.Screens.Play
#endregion
private Bindable<bool> showStoryboard;
protected virtual UserDimContainer CreateStoryboardContainer() => new UserDimContainer(true)
{
RelativeSizeAxes = Axes.Both,
@ -117,6 +119,7 @@ namespace osu.Game.Screens.Play
sampleRestart = audio.Sample.Get(@"Gameplay/restart");
mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
showStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
ScoreProcessor = DrawableRuleset.CreateScoreProcessor();
if (!ScoreProcessor.Mode.Disabled)
@ -422,9 +425,10 @@ namespace osu.Game.Screens.Play
.Delay(250)
.FadeIn(250);
ShowStoryboard.ValueChanged += _ => initializeStoryboard(true);
showStoryboard.ValueChanged += _ => initializeStoryboard(true);
Background.EnableUserDim.Value = true;
Background.BlurAmount.Value = 0;
Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
StoryboardContainer.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);