1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 13:42:59 +08:00

Make tick explosions white and lower scale.

This commit is contained in:
smoogipooo 2017-09-11 14:35:18 +09:00
parent 2c3131d391
commit e8efdcf188
5 changed files with 14 additions and 10 deletions

View File

@ -16,7 +16,6 @@ using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Mania.Judgements; using osu.Game.Rulesets.Mania.Judgements;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using OpenTK.Graphics;
namespace osu.Desktop.Tests.Visual namespace osu.Desktop.Tests.Visual
{ {

View File

@ -58,9 +58,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
} }
} }
}; };
// Set the default glow
AccentColour = Color4.White;
} }
public override Color4 AccentColour public override Color4 AccentColour

View File

@ -91,7 +91,8 @@ namespace osu.Game.Rulesets.Mania.Objects
{ {
ret.Add(new HoldNoteTick ret.Add(new HoldNoteTick
{ {
StartTime = t StartTime = t,
Column = Column
}); });
} }

View File

@ -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.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Rulesets.Mania.Judgements; using osu.Game.Rulesets.Mania.Judgements;
using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Rulesets.Mania.UI namespace osu.Game.Rulesets.Mania.UI
@ -13,31 +16,36 @@ namespace osu.Game.Rulesets.Mania.UI
public HitExplosion(DrawableHitObject<ManiaHitObject, ManiaJudgement> judgedObject) public HitExplosion(DrawableHitObject<ManiaHitObject, ManiaJudgement> judgedObject)
{ {
bool isTick = judgedObject is DrawableHoldNoteTick;
Anchor = Anchor.TopCentre; Anchor = Anchor.TopCentre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Size = new Vector2(isTick ? 0.5f : 1);
FillMode = FillMode.Fit; FillMode = FillMode.Fit;
BlendingMode = BlendingMode.Additive; BlendingMode = BlendingMode.Additive;
Color4 accent = isTick ? Color4.White : judgedObject.AccentColour;
InternalChild = new CircularContainer InternalChild = new CircularContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true, Masking = true,
BorderThickness = 1, BorderThickness = 1,
BorderColour = judgedObject.AccentColour, BorderColour = accent,
EdgeEffect = new EdgeEffectParameters EdgeEffect = new EdgeEffectParameters
{ {
Type = EdgeEffectType.Glow, Type = EdgeEffectType.Glow,
Colour = judgedObject.AccentColour, Colour = accent,
Radius = 10, Radius = 10,
Hollow = true Hollow = true
}, },
Child = inner = new Box Child = inner = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = judgedObject.AccentColour, Colour = accent,
Alpha = 1, Alpha = 1,
AlwaysPresent = true, AlwaysPresent = true,
} }

View File

@ -14,7 +14,6 @@ using osu.Framework.Allocation;
using System.Linq; using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;