h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 01:42:55 +08:00
Code Issues Releases Wiki Activity

Fix depth of dropped objects

Browse Source
This commit is contained in:
ekrctb 2020-12-04 10:21:54 +09:00
parent 3de46d0a3b
commit e82ca66d3e
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
View File

@ -6,6 +6,7 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
@ -72,14 +73,23 @@ namespace osu.Game.Rulesets.Catch.Tests
{
circleSize = size;
SetContents(() => new CatchInputManager(catchRuleset)
SetContents(() =>
{
RelativeSizeAxes = Axes.Both,
Child = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
var droppedObjectContainer = new Container();
return new CatchInputManager(catchRuleset)
{
Anchor = Anchor.Centre,
Origin = Anchor.TopCentre,
},
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
droppedObjectContainer,
new TestCatcherArea(droppedObjectContainer, new BeatmapDifficulty { CircleSize = size })
{
Anchor = Anchor.Centre,
Origin = Anchor.TopCentre,
}
}
};
});
}
@ -91,8 +101,8 @@ namespace osu.Game.Rulesets.Catch.Tests
private class TestCatcherArea : CatcherArea
{
public TestCatcherArea(BeatmapDifficulty beatmapDifficulty)
: base(beatmapDifficulty)
public TestCatcherArea(Container droppedObjectContainer, BeatmapDifficulty beatmapDifficulty)
: base(droppedObjectContainer, beatmapDifficulty)
{
}

2
osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
View File

@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Catch.Tests
AddStep("create hyper-dashing catcher", () =>
{
Child = setupSkinHierarchy(catcherArea = new CatcherArea
Child = setupSkinHierarchy(catcherArea = new CatcherArea(new Container())
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,

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

@ -36,12 +36,12 @@ namespace osu.Game.Rulesets.Catch.UI
public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation)
{
var explodingFruitContainer = new Container
var droppedObjectContainer = new Container
{
RelativeSizeAxes = Axes.Both,
};
CatcherArea = new CatcherArea(difficulty)
CatcherArea = new CatcherArea(droppedObjectContainer, difficulty)
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.TopLeft,
@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.UI
InternalChildren = new[]
{
explodingFruitContainer,
droppedObjectContainer,
CatcherArea.MovableCatcher.CreateProxiedContent(),
HitObjectContainer,
CatcherArea,

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

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.UI
public readonly Catcher MovableCatcher;
private readonly CatchComboDisplay comboDisplay;
public CatcherArea(BeatmapDifficulty difficulty = null)
public CatcherArea(Container droppedObjectContainer, BeatmapDifficulty difficulty = null)
{
Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
Children = new Drawable[]
@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.UI
Margin = new MarginPadding { Bottom = 350f },
X = CatchPlayfield.CENTER_X
},
MovableCatcher = new Catcher(this, this, difficulty) { X = CatchPlayfield.CENTER_X },
MovableCatcher = new Catcher(this, droppedObjectContainer, difficulty) { X = CatchPlayfield.CENTER_X },
};
}