sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-15 18:47:33 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into catmull-sliders

Browse Source
This commit is contained in:
Dean Herbert 2018-02-01 21:21:25 +09:00 committed by GitHub
commit 002fe45741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
View File

@ -35,10 +35,6 @@ namespace osu.Game.Rulesets.Catch.UI
ScaledContent.AddRange(new Drawable[] ScaledContent.AddRange(new Drawable[]
{ {
content = new Container<Drawable>
{
RelativeSizeAxes = Axes.Both,
},
explodingFruitContainer = new Container explodingFruitContainer = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -49,7 +45,11 @@ namespace osu.Game.Rulesets.Catch.UI
ExplodingFruitTarget = explodingFruitContainer, ExplodingFruitTarget = explodingFruitContainer,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.TopLeft, Origin = Anchor.TopLeft,
} },
content = new Container<Drawable>
{
RelativeSizeAxes = Axes.Both,
},
}); });
} }

4
osu.Game.Rulesets.Catch/UI/CatcherArea.cs
View File

@ -84,9 +84,9 @@ namespace osu.Game.Rulesets.Catch.UI
} }
} }
protected override void Update() protected override void UpdateAfterChildren()
{ {
base.Update(); base.UpdateAfterChildren();
var state = GetContainingInputManager().CurrentState as CatchFramedReplayInputHandler.CatchReplayState; var state = GetContainingInputManager().CurrentState as CatchFramedReplayInputHandler.CatchReplayState;