diff --git a/osu.Desktop.Tests/Visual/TestCaseManiaPlayfield.cs b/osu.Desktop.Tests/Visual/TestCaseManiaPlayfield.cs index 7b458b9224..a0f1162ecb 100644 --- a/osu.Desktop.Tests/Visual/TestCaseManiaPlayfield.cs +++ b/osu.Desktop.Tests/Visual/TestCaseManiaPlayfield.cs @@ -16,7 +16,6 @@ using osu.Game.Rulesets.Timing; using osu.Game.Rulesets; using osu.Game.Rulesets.Mania.Judgements; using osu.Game.Rulesets.Objects.Drawables; -using OpenTK.Graphics; namespace osu.Desktop.Tests.Visual { diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs index 39abbb6b3d..a074715faf 100644 --- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs +++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs @@ -58,9 +58,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables } } }; - - // Set the default glow - AccentColour = Color4.White; } public override Color4 AccentColour diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs index ef2e02a791..fc1331551e 100644 --- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs +++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs @@ -91,7 +91,8 @@ namespace osu.Game.Rulesets.Mania.Objects { ret.Add(new HoldNoteTick { - StartTime = t + StartTime = t, + Column = Column }); } diff --git a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs b/osu.Game.Rulesets.Mania/UI/HitExplosion.cs index ae2a09c67e..c57833c623 100644 --- a/osu.Game.Rulesets.Mania/UI/HitExplosion.cs +++ b/osu.Game.Rulesets.Mania/UI/HitExplosion.cs @@ -1,8 +1,11 @@ -using osu.Framework.Graphics; +using OpenTK; +using OpenTK.Graphics; +using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Game.Rulesets.Mania.Judgements; using osu.Game.Rulesets.Mania.Objects; +using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables; namespace osu.Game.Rulesets.Mania.UI @@ -13,31 +16,36 @@ namespace osu.Game.Rulesets.Mania.UI public HitExplosion(DrawableHitObject judgedObject) { + bool isTick = judgedObject is DrawableHoldNoteTick; + Anchor = Anchor.TopCentre; Origin = Anchor.Centre; RelativeSizeAxes = Axes.Both; + Size = new Vector2(isTick ? 0.5f : 1); FillMode = FillMode.Fit; BlendingMode = BlendingMode.Additive; + Color4 accent = isTick ? Color4.White : judgedObject.AccentColour; + InternalChild = new CircularContainer { RelativeSizeAxes = Axes.Both, Masking = true, BorderThickness = 1, - BorderColour = judgedObject.AccentColour, + BorderColour = accent, EdgeEffect = new EdgeEffectParameters { Type = EdgeEffectType.Glow, - Colour = judgedObject.AccentColour, + Colour = accent, Radius = 10, Hollow = true }, Child = inner = new Box { RelativeSizeAxes = Axes.Both, - Colour = judgedObject.AccentColour, + Colour = accent, Alpha = 1, AlwaysPresent = true, } diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs index aceea7bea3..5697da537e 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs @@ -14,7 +14,6 @@ using osu.Framework.Allocation; using System.Linq; using System.Collections.Generic; using osu.Framework.Configuration; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Framework.Graphics.Shapes;