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

Make UserDimContainer abstract

Browse Source
This commit is contained in:
David Zhao
2019-07-11 13:17:28 +09:00
parent 221ee58f55
commit 321266e96f
6 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,9 +76,9 @@ namespace osu.Game.Screens.Play
protected GameplayClockContainer GameplayClockContainer { get; private set; }
protected StoryboardContainer StoryboardContainer { get; private set; }
protected DimmableStoryboardContainer DimmableStoryboardContainer { get; private set; }
protected virtual StoryboardContainer CreateStoryboardContainer(Storyboard storyboard) => new StoryboardContainer(storyboard) { RelativeSizeAxes = Axes.Both };
protected virtual DimmableStoryboardContainer CreateStoryboardContainer(Storyboard storyboard) => new DimmableStoryboardContainer(storyboard) { RelativeSizeAxes = Axes.Both };
[Cached]
[Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
@ -124,7 +124,7 @@ namespace osu.Game.Screens.Play
GameplayClockContainer.Children = new[]
{
StoryboardContainer = CreateStoryboardContainer(Beatmap.Value.Storyboard),
DimmableStoryboardContainer = CreateStoryboardContainer(Beatmap.Value.Storyboard),
new ScalingContainer(ScalingMode.Gameplay)
{
Child = new LocalSkinOverrideContainer(working.Skin)
@ -455,7 +455,7 @@ namespace osu.Game.Screens.Play
Background.BlurAmount.Value = 0;
Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
StoryboardContainer.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
DimmableStoryboardContainer.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;