This commit is contained in:
smoogipoo
2019-09-12 14:09:21 +09:00
parent 141e83fada
commit b941f12688
2 changed files with 2 additions and 28 deletions

View File

@ -5,11 +5,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces; using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
using osu.Game.Rulesets.Mania.UI; using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
using osu.Game.Tests.Visual; using osu.Game.Tests.Visual;
using osuTK; using osuTK;
@ -60,25 +58,5 @@ namespace osu.Game.Rulesets.Mania.Tests
}); });
}, 100); }, 100);
} }
private class TestNote : DrawableNote
{
protected override void CheckForResult(bool userTriggered, double timeOffset)
{
if (!userTriggered)
{
// force success
ApplyResult(r => r.Type = HitResult.Great);
}
else
base.CheckForResult(userTriggered, timeOffset);
}
public TestNote(Note hitObject)
: base(hitObject)
{
AccentColour.Value = Color4.Pink;
}
}
} }
} }

View File

@ -18,8 +18,6 @@ namespace osu.Game.Rulesets.Mania.UI
private readonly CircularContainer largeFaint; private readonly CircularContainer largeFaint;
private readonly CircularContainer mainGlow1; private readonly CircularContainer mainGlow1;
private readonly CircularContainer mainGlow2;
private readonly CircularContainer mainGlow3;
public HitExplosion(Color4 objectColour, bool isSmall = false) public HitExplosion(Color4 objectColour, bool isSmall = false)
{ {
@ -36,8 +34,6 @@ namespace osu.Game.Rulesets.Mania.UI
const float roundness = 80; const float roundness = 80;
const float opacity = 1;
const float initial_height = 10; const float initial_height = 10;
var colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1); var colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1);
@ -76,7 +72,7 @@ namespace osu.Game.Rulesets.Mania.UI
Radius = 50, Radius = 50,
}, },
}, },
mainGlow2 = new CircularContainer new CircularContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -93,7 +89,7 @@ namespace osu.Game.Rulesets.Mania.UI
Radius = 40, Radius = 40,
}, },
}, },
mainGlow3 = new CircularContainer new CircularContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,