From acfa4a4aac01802101ce6af487ada902f61e7493 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 23 Mar 2017 14:52:18 +0900 Subject: [PATCH] JudgementText -> DrawableTaikoJudgementInfo. --- .../{JudgementText.cs => DrawableTaikoJudgementInfo.cs} | 8 ++++---- osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs | 6 +++--- osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename osu.Game.Modes.Taiko/UI/{JudgementText.cs => DrawableTaikoJudgementInfo.cs} (81%) diff --git a/osu.Game.Modes.Taiko/UI/JudgementText.cs b/osu.Game.Modes.Taiko/UI/DrawableTaikoJudgementInfo.cs similarity index 81% rename from osu.Game.Modes.Taiko/UI/JudgementText.cs rename to osu.Game.Modes.Taiko/UI/DrawableTaikoJudgementInfo.cs index 06368d6d2c..bb2935b528 100644 --- a/osu.Game.Modes.Taiko/UI/JudgementText.cs +++ b/osu.Game.Modes.Taiko/UI/DrawableTaikoJudgementInfo.cs @@ -12,13 +12,13 @@ namespace osu.Game.Modes.Taiko.UI /// /// Text that is shown as judgement when a hit object is hit or missed. /// - public class JudgementText : DrawableJudgementInfo + public class DrawableTaikoJudgementInfo : DrawableJudgementInfo { /// /// Creates a new judgement text. /// /// The judgement to visualise. - public JudgementText(TaikoJudgementInfo judgement) + public DrawableTaikoJudgementInfo(TaikoJudgementInfo judgement) : base(judgement) { } @@ -32,10 +32,10 @@ namespace osu.Game.Modes.Taiko.UI switch (Judgement.TaikoResult) { case TaikoHitResult.Good: - Colour = colours.Green; + Colour = colours.GreenLight; break; case TaikoHitResult.Great: - Colour = colours.Blue; + Colour = colours.BlueLight; break; } break; diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs index c92a2ae702..0ae6fd2c7b 100644 --- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs @@ -48,7 +48,7 @@ namespace osu.Game.Modes.Taiko.UI private readonly Container hitExplosionContainer; //private Container barLineContainer; - private readonly Container judgementContainer; + private readonly Container judgementContainer; private readonly Container hitObjectContainer; //private Container topLevelHitContainer; @@ -117,7 +117,7 @@ namespace osu.Game.Modes.Taiko.UI { RelativeSizeAxes = Axes.Both, }, - judgementContainer = new Container + judgementContainer = new Container { RelativeSizeAxes = Axes.Both, BlendingMode = BlendingMode.Additive @@ -186,7 +186,7 @@ namespace osu.Game.Modes.Taiko.UI float judgementOffset = judgedObject.Judgement.Result == HitResult.Hit ? judgedObject.Position.X : 0; - judgementContainer.Add(new JudgementText(judgedObject.Judgement) + judgementContainer.Add(new DrawableTaikoJudgementInfo(judgedObject.Judgement) { Anchor = judgedObject.Judgement.Result == HitResult.Hit ? Anchor.TopLeft : Anchor.BottomLeft, Origin = judgedObject.Judgement.Result == HitResult.Hit ? Anchor.BottomCentre : Anchor.TopCentre, diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj index 6c97ed3391..3534f06f92 100644 --- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -61,7 +61,7 @@ - +