RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JudgementText -> DrawableTaikoJudgementInfo.

This commit is contained in:
Dean Herbert 2017-03-23 14:52:18 +09:00
parent 9a3fd8bcf1
commit acfa4a4aac
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Modes.Taiko/UI/JudgementText.cs → osu.Game.Modes.Taiko/UI/DrawableTaikoJudgementInfo.cs
View File

@ -12,13 +12,13 @@ namespace osu.Game.Modes.Taiko.UI
/// <summary> /// <summary>
/// Text that is shown as judgement when a hit object is hit or missed. /// Text that is shown as judgement when a hit object is hit or missed.
/// </summary> /// </summary>
public class JudgementText : DrawableJudgementInfo<TaikoJudgementInfo> public class DrawableTaikoJudgementInfo : DrawableJudgementInfo<TaikoJudgementInfo>
{ {
/// <summary> /// <summary>
/// Creates a new judgement text. /// Creates a new judgement text.
/// </summary> /// </summary>
/// <param name="judgement">The judgement to visualise.</param> /// <param name="judgement">The judgement to visualise.</param>
public JudgementText(TaikoJudgementInfo judgement) public DrawableTaikoJudgementInfo(TaikoJudgementInfo judgement)
: base(judgement) : base(judgement)
{ {
} }
@ -32,10 +32,10 @@ private void load(OsuColour colours)
switch (Judgement.TaikoResult) switch (Judgement.TaikoResult)
{ {
case TaikoHitResult.Good: case TaikoHitResult.Good:
Colour = colours.Green; Colour = colours.GreenLight;
break; break;
case TaikoHitResult.Great: case TaikoHitResult.Great:
Colour = colours.Blue; Colour = colours.BlueLight;
break; break;
} }
break; break;

6
osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
View File

@ -48,7 +48,7 @@ public class TaikoPlayfield : Playfield<TaikoHitObject, TaikoJudgementInfo>
private readonly Container<HitExplosion> hitExplosionContainer; private readonly Container<HitExplosion> hitExplosionContainer;
//private Container<DrawableBarLine> barLineContainer; //private Container<DrawableBarLine> barLineContainer;
private readonly Container<JudgementText> judgementContainer; private readonly Container<DrawableTaikoJudgementInfo> judgementContainer;
private readonly Container hitObjectContainer; private readonly Container hitObjectContainer;
//private Container topLevelHitContainer; //private Container topLevelHitContainer;
@ -117,7 +117,7 @@ public TaikoPlayfield()
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
judgementContainer = new Container<JudgementText> judgementContainer = new Container<DrawableTaikoJudgementInfo>
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
BlendingMode = BlendingMode.Additive BlendingMode = BlendingMode.Additive
@ -186,7 +186,7 @@ public override void OnJudgement(DrawableHitObject<TaikoHitObject, TaikoJudgemen
float judgementOffset = judgedObject.Judgement.Result == HitResult.Hit ? judgedObject.Position.X : 0; 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, Anchor = judgedObject.Judgement.Result == HitResult.Hit ? Anchor.TopLeft : Anchor.BottomLeft,
Origin = judgedObject.Judgement.Result == HitResult.Hit ? Anchor.BottomCentre : Anchor.TopCentre, Origin = judgedObject.Judgement.Result == HitResult.Hit ? Anchor.BottomCentre : Anchor.TopCentre,

2
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
View File

@ -61,7 +61,7 @@
<Compile Include="TaikoScoreProcessor.cs" /> <Compile Include="TaikoScoreProcessor.cs" />
<Compile Include="UI\HitTarget.cs" /> <Compile Include="UI\HitTarget.cs" />
<Compile Include="UI\InputDrum.cs" /> <Compile Include="UI\InputDrum.cs" />
<Compile Include="UI\JudgementText.cs" /> <Compile Include="UI\DrawableTaikoJudgementInfo.cs" />
<Compile Include="UI\HitExplosion.cs" /> <Compile Include="UI\HitExplosion.cs" />
<Compile Include="UI\TaikoHitRenderer.cs" /> <Compile Include="UI\TaikoHitRenderer.cs" />
<Compile Include="UI\TaikoPlayfield.cs" /> <Compile Include="UI\TaikoPlayfield.cs" />