sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'taiko_playfield_2' into taiko_barlines

Browse Source
This commit is contained in:
smoogipooo
2017-03-23 09:13:24 +09:00
parent 2cb6757f14 9c325ddd33
commit 75a51fbcc7
5 changed files with 12 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,15 +41,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
@ -95,11 +95,6 @@ namespace osu.Desktop.VisualTests.Tests
protected override void UpdateState(ArmedState state) protected override void UpdateState(ArmedState state)
{ {
} }
protected override void Update()
{
// Doesn't move
}
} }
} }
} }

20
osu.Game.Modes.Taiko/UI/HitTarget.cs
View File

@ -39,35 +39,27 @@ namespace osu.Game.Modes.Taiko.UI
new Box new Box
{ {
Name = "Bar Upper", Name = "Bar Upper",
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Y = border_offset, Y = border_offset,
Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset), Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),
Alpha = 0.1f Alpha = 0.1f
}, },
new CircularContainer new CircularContainer
{ {
Name = "Finisher Ring", Name = "Finisher Ring",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(finisher_diameter), Size = new Vector2(finisher_diameter),
Masking = true,
BorderColour = Color4.White, BorderColour = Color4.White,
BorderThickness = 2, BorderThickness = 2,
Alpha = 0.1f, Alpha = 0.1f,
Children = new[] Children = new[]
{ {
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
AlwaysPresent = true AlwaysPresent = true
} }
@ -76,22 +68,18 @@ namespace osu.Game.Modes.Taiko.UI
new CircularContainer new CircularContainer
{ {
Name = "Normal Ring", Name = "Normal Ring",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(normal_diameter), Size = new Vector2(normal_diameter),
Masking = true,
BorderColour = Color4.White, BorderColour = Color4.White,
BorderThickness = 2, BorderThickness = 2,
Alpha = 0.5f, Alpha = 0.5f,
Children = new[] Children = new[]
{ {
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
AlwaysPresent = true AlwaysPresent = true
} }
@ -100,14 +88,10 @@ namespace osu.Game.Modes.Taiko.UI
new Box new Box
{ {
Name = "Bar Lower", Name = "Bar Lower",
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Y = -border_offset, Y = -border_offset,
Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset), Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),
Alpha = 0.1f Alpha = 0.1f
}, },
}; };

15
osu.Game.Modes.Taiko/UI/InputDrum.cs
View File

@ -29,25 +29,18 @@ namespace osu.Game.Modes.Taiko.UI
new TaikoHalfDrum(false) new TaikoHalfDrum(false)
{ {
Name = "Left Half", Name = "Left Half",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Keys = new List<Key>(new[] { Key.F, Key.D }) Keys = new List<Key>(new[] { Key.F, Key.D })
}, },
new TaikoHalfDrum(true) new TaikoHalfDrum(true)
{ {
Name = "Right Half", Name = "Right Half",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Position = new Vector2(-1f, 0), Position = new Vector2(-1f, 0),
Keys = new List<Key>(new[] { Key.J, Key.K }) Keys = new List<Key>(new[] { Key.J, Key.K })
} }
}; };
@ -81,25 +74,20 @@ namespace osu.Game.Modes.Taiko.UI
{ {
Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight, Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}, },
outerHit = new Sprite outerHit = new Sprite
{ {
Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight, Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
BlendingMode = BlendingMode.Additive BlendingMode = BlendingMode.Additive
}, },
inner = new Sprite inner = new Sprite
{ {
Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight, Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = new Vector2(0.7f) Size = new Vector2(0.7f)
}, },
@ -107,12 +95,9 @@ namespace osu.Game.Modes.Taiko.UI
{ {
Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight, Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = new Vector2(0.7f), Size = new Vector2(0.7f),
Alpha = 0, Alpha = 0,
BlendingMode = BlendingMode.Additive BlendingMode = BlendingMode.Additive
} }
}; };

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

@ -40,31 +40,24 @@ namespace osu.Game.Modes.Taiko.UI
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
new BufferedContainer new BufferedContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
BlurSigma = new Vector2(10), BlurSigma = new Vector2(10),
CacheDrawnFrameBuffer = true, CacheDrawnFrameBuffer = true,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = new Vector2(3), Size = new Vector2(3),
BlendingMode = BlendingMode.Additive, BlendingMode = BlendingMode.Additive,
Children = new[] Children = new[]
{ {
glowText = new OsuSpriteText glowText = new OsuSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = "Venera", Font = "Venera",
TextSize = 22f, TextSize = 22f,
} }
@ -74,7 +67,6 @@ namespace osu.Game.Modes.Taiko.UI
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = "Venera", Font = "Venera",
TextSize = 22f, TextSize = 22f,
} }
@ -97,14 +89,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;

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

@ -39,6 +39,7 @@ namespace osu.Game.Modes.Taiko.UI
BorderThickness = 1; BorderThickness = 1;
Alpha = 0.15f; Alpha = 0.15f;
Masking = true;
Children = new[] Children = new[]
{ {
@ -55,12 +56,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;
} }