sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-11 22:37:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Renaming + don't use List.

Browse Source
This commit is contained in:
smoogipooo 2017-03-23 12:53:38 +09:00
parent 39ff026b27
commit 7f33e10db0
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,8 @@ namespace osu.Game.Modes.Taiko.UI
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 }) RimKey = Key.D,
CentreKey = Key.F
}, },
new TaikoHalfDrum(true) new TaikoHalfDrum(true)
{ {
@ -41,7 +42,8 @@ namespace osu.Game.Modes.Taiko.UI
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 }) RimKey = Key.K,
CentreKey = Key.J
} }
}; };
} }
@ -52,17 +54,19 @@ namespace osu.Game.Modes.Taiko.UI
private class TaikoHalfDrum : Container private class TaikoHalfDrum : Container
{ {
/// <summary> /// <summary>
/// A list of keys which this half-drum accepts. /// The key to be used for the rim of the half-drum.
/// <para>
/// [0] => Inner key, [1] => Outer key
/// </para>
/// </summary> /// </summary>
public List<Key> Keys = new List<Key>(); public Key RimKey;
private Sprite outer; /// <summary>
private Sprite outerHit; /// The key to be used for the centre of the half-drum.
private Sprite inner; /// </summary>
private Sprite innerHit; public Key CentreKey;
private Sprite rim;
private Sprite rimHit;
private Sprite centre;
private Sprite centreHit;
public TaikoHalfDrum(bool flipped) public TaikoHalfDrum(bool flipped)
{ {
@ -70,13 +74,13 @@ namespace osu.Game.Modes.Taiko.UI
Children = new Drawable[] Children = new Drawable[]
{ {
outer = new Sprite rim = 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
}, },
outerHit = new Sprite rimHit = new Sprite
{ {
Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight, Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -84,14 +88,14 @@ namespace osu.Game.Modes.Taiko.UI
Alpha = 0, Alpha = 0,
BlendingMode = BlendingMode.Additive BlendingMode = BlendingMode.Additive
}, },
inner = new Sprite centre = 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)
}, },
innerHit = new Sprite centreHit = new Sprite
{ {
Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight, Anchor = flipped ? Anchor.CentreLeft : Anchor.CentreRight,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -106,13 +110,13 @@ namespace osu.Game.Modes.Taiko.UI
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures, OsuColour colours) private void load(TextureStore textures, OsuColour colours)
{ {
outer.Texture = textures.Get(@"Play/Taiko/taiko-drum-outer"); rim.Texture = textures.Get(@"Play/Taiko/taiko-drum-outer");
outerHit.Texture = textures.Get(@"Play/Taiko/taiko-drum-outer-hit"); rimHit.Texture = textures.Get(@"Play/Taiko/taiko-drum-outer-hit");
inner.Texture = textures.Get(@"Play/Taiko/taiko-drum-inner"); centre.Texture = textures.Get(@"Play/Taiko/taiko-drum-inner");
innerHit.Texture = textures.Get(@"Play/Taiko/taiko-drum-inner-hit"); centreHit.Texture = textures.Get(@"Play/Taiko/taiko-drum-inner-hit");
outerHit.Colour = colours.Blue; rimHit.Colour = colours.Blue;
innerHit.Colour = colours.Pink; centreHit.Colour = colours.Pink;
} }
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
@ -120,16 +124,16 @@ namespace osu.Game.Modes.Taiko.UI
if (args.Repeat) if (args.Repeat)
return false; return false;
if (args.Key == Keys[0]) if (args.Key == CentreKey)
{ {
innerHit.FadeIn(); centreHit.FadeIn();
innerHit.FadeOut(500, EasingTypes.OutQuint); centreHit.FadeOut(500, EasingTypes.OutQuint);
} }
if (args.Key == Keys[1]) if (args.Key == RimKey)
{ {
outerHit.FadeIn(); rimHit.FadeIn();
outerHit.FadeOut(500, EasingTypes.OutQuint); rimHit.FadeOut(500, EasingTypes.OutQuint);
} }
return false; return false;