h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 20:32:55 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors.

Browse Source
This commit is contained in:
smoogipooo 2017-03-22 01:42:40 +09:00
parent b769c43660
commit e7a93073a4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
View File

@ -31,15 +31,15 @@ namespace osu.Desktop.VisualTests.Tests
private void addHitJudgement() private void addHitJudgement()
{ {
TaikoScoreResult score = RNG.Next(2) == 0 ? TaikoScoreResult.Good : TaikoScoreResult.Great; TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
playfield.OnJudgement(new DrawableTestHit(new TaikoHitObject()) playfield.OnJudgement(new DrawableTestHit(new TaikoHitObject())
{ {
X = RNG.NextSingle(score == TaikoScoreResult.Good ? -0.1f : -0.05f, score == TaikoScoreResult.Good ? 0.1f : 0.05f), X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
Judgement = new TaikoJudgementInfo Judgement = new TaikoJudgementInfo
{ {
Result = HitResult.Hit, Result = HitResult.Hit,
Score = score, TaikoResult = hitResult,
TimeOffset = 0, TimeOffset = 0,
ComboAtHit = 1, ComboAtHit = 1,
SecondHit = RNG.Next(10) == 0 SecondHit = RNG.Next(10) == 0

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

@ -97,14 +97,14 @@ namespace osu.Game.Modes.Taiko.UI
movementDirection = 1; movementDirection = 1;
break; break;
case HitResult.Hit: case HitResult.Hit:
switch (Judgement.Score) switch (Judgement.TaikoResult)
{ {
case TaikoScoreResult.Good: case TaikoHitResult.Good:
judgementColour = colours.Green; judgementColour = colours.Green;
judgementText = "GOOD"; judgementText = "GOOD";
textContainer.Scale = new Vector2(0.45f); textContainer.Scale = new Vector2(0.45f);
break; break;
case TaikoScoreResult.Great: case TaikoHitResult.Great:
judgementColour = colours.Blue; judgementColour = colours.Blue;
judgementText = "GREAT"; judgementText = "GREAT";
break; break;

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

@ -55,12 +55,12 @@ namespace osu.Game.Modes.Taiko.UI
if (Judgement.SecondHit) if (Judgement.SecondHit)
Size *= 1.5f; Size *= 1.5f;
switch (Judgement.Score) switch (Judgement.TaikoResult)
{ {
case TaikoScoreResult.Good: case TaikoHitResult.Good:
innerFill.Colour = colours.Green; innerFill.Colour = colours.Green;
break; break;
case TaikoScoreResult.Great: case TaikoHitResult.Great:
innerFill.Colour = colours.Blue; innerFill.Colour = colours.Blue;
break; break;
} }