1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00

Make HitExplosion circular again, keep it masked to the stage.

This commit is contained in:
smoogipooo 2017-05-24 15:48:47 +09:00
parent 56fe97a147
commit 7afa1766e1
2 changed files with 11 additions and 12 deletions

View File

@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Taiko.UI
/// <summary>
/// A circle explodes from the hit target to indicate a hitobject has been hit.
/// </summary>
internal class HitExplosion : Container
internal class HitExplosion : CircularContainer
{
public readonly TaikoJudgement Judgement;
@ -30,11 +30,10 @@ namespace osu.Game.Rulesets.Taiko.UI
Judgement = judgement;
RelativeSizeAxes = Axes.Y;
Width = TaikoPlayfield.HIT_TARGET_OFFSET + TaikoHitObject.DEFAULT_CIRCLE_DIAMETER;
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Anchor = Anchor.CentreLeft;
Origin = Anchor.CentreLeft;
Size = new Vector2(TaikoPlayfield.HIT_TARGET_OFFSET + TaikoHitObject.DEFAULT_CIRCLE_DIAMETER);
RelativePositionAxes = Axes.Both;
@ -63,7 +62,7 @@ namespace osu.Game.Rulesets.Taiko.UI
{
base.LoadComplete();
ScaleTo(new Vector2(2f, 1), 1000, EasingTypes.OutQuint);
ScaleTo(3f, 1000, EasingTypes.OutQuint);
FadeOut(500);
Expire();
@ -74,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.UI
/// </summary>
public void VisualiseSecondHit()
{
ResizeTo(new Vector2(TaikoPlayfield.HIT_TARGET_OFFSET + TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER, 1), 50);
ResizeTo(new Vector2(TaikoPlayfield.HIT_TARGET_OFFSET + TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER), 50);
}
}
}

View File

@ -90,11 +90,6 @@ namespace osu.Game.Rulesets.Taiko.UI
Margin = new MarginPadding { Left = left_area_size },
Children = new Drawable[]
{
hitExplosionContainer = new Container<HitExplosion>
{
RelativeSizeAxes = Axes.Y,
BlendingMode = BlendingMode.Additive
},
new Container
{
Name = "Masked elements",
@ -103,6 +98,11 @@ namespace osu.Game.Rulesets.Taiko.UI
Masking = true,
Children = new Drawable[]
{
hitExplosionContainer = new Container<HitExplosion>
{
RelativeSizeAxes = Axes.Y,
BlendingMode = BlendingMode.Additive,
},
barLineContainer = new Container<DrawableBarLine>
{
RelativeSizeAxes = Axes.Both,