h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:02:54 +08:00
Code Issues Releases Wiki Activity

Update in line with upstream changes

Browse Source 
(cherry picked from commit 2b6d991)
This commit is contained in:
Dean Herbert 2018-01-10 16:58:20 +09:00
parent 5b15073010
commit 26fedd7e61
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs
View File

@ -13,13 +13,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
{ {
private readonly Container bananaContainer; private readonly Container bananaContainer;
public DrawableBananaShower(BananaShower s) : base(s) public DrawableBananaShower(BananaShower s)
: base(s)
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Height = (float)HitObject.Duration; Height = (float)HitObject.Duration;
X = 0; X = 0;
Child = bananaContainer = new Container Child = bananaContainer = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RelativeChildOffset = new Vector2(0, (float)HitObject.StartTime), RelativeChildOffset = new Vector2(0, (float)HitObject.StartTime),
@ -27,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
}; };
foreach (var b in s.NestedHitObjects.Cast<BananaShower.Banana>()) foreach (var b in s.NestedHitObjects.Cast<BananaShower.Banana>())
AddNested(new DrawableFruit(b)); AddNested(new DrawableFruit(b));
} }
protected override void AddNested(DrawableHitObject<CatchHitObject> h) protected override void AddNested(DrawableHitObject<CatchHitObject> h)

15
osu.Game.Rulesets.Catch/Tests/TestCaseBananaShower.cs
View File

@ -1,9 +1,13 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Objects; using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.Objects.Drawable;
using osu.Game.Rulesets.Catch.UI;
namespace osu.Game.Rulesets.Catch.Tests namespace osu.Game.Rulesets.Catch.Tests
{ {
@ -11,8 +15,17 @@ namespace osu.Game.Rulesets.Catch.Tests
[Ignore("getting CI working")] [Ignore("getting CI working")]
public class TestCaseBananaShower : Game.Tests.Visual.TestCasePlayer public class TestCaseBananaShower : Game.Tests.Visual.TestCasePlayer
{ {
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(BananaShower),
typeof(DrawableBananaShower),
typeof(CatchRuleset),
typeof(CatchRulesetContainer),
};
public TestCaseBananaShower() public TestCaseBananaShower()
: base(typeof(CatchRuleset)) : base(new CatchRuleset())
{ {
} }