mirror of https://github.com/ppy/osu
Merge branch 'taiko-touch-ddkk-new' of https://github.com/OpenSauce04/osu into taiko-touch-ddkk-new
This commit is contained in:
commit
3c13d64d1e
|
@ -40,7 +40,7 @@ public partial class DrumTouchInputArea : VisibilityContainer
|
||||||
private QuarterCircle leftRim = null!;
|
private QuarterCircle leftRim = null!;
|
||||||
private QuarterCircle rightRim = null!;
|
private QuarterCircle rightRim = null!;
|
||||||
|
|
||||||
private Bindable<TaikoTouchControlScheme> configTouchControlScheme = new Bindable<TaikoTouchControlScheme>();
|
private readonly Bindable<TaikoTouchControlScheme> configTouchControlScheme = new Bindable<TaikoTouchControlScheme>();
|
||||||
|
|
||||||
[Resolved]
|
[Resolved]
|
||||||
private OsuColour colours { get; set; } = null!;
|
private OsuColour colours { get; set; } = null!;
|
||||||
|
@ -222,10 +222,12 @@ private Color4 getColourFromTaikoAction(TaikoAction handledAction)
|
||||||
#pragma warning disable format
|
#pragma warning disable format
|
||||||
switch (handledAction)
|
switch (handledAction)
|
||||||
{
|
{
|
||||||
case TaikoAction.LeftRim: return colours.Blue;
|
case TaikoAction.LeftRim:
|
||||||
case TaikoAction.LeftCentre: return colours.Red;
|
case TaikoAction.RightRim:
|
||||||
case TaikoAction.RightCentre: return colours.Red;
|
return colours.Blue;
|
||||||
case TaikoAction.RightRim: return colours.Blue;
|
case TaikoAction.LeftCentre:
|
||||||
|
case TaikoAction.RightCentre:
|
||||||
|
return colours.Red;
|
||||||
}
|
}
|
||||||
#pragma warning restore format
|
#pragma warning restore format
|
||||||
return colours.Red;
|
return colours.Red;
|
||||||
|
|
Loading…
Reference in New Issue