mirror of https://github.com/ppy/osu
Framework updates.
This commit is contained in:
parent
9a5874b063
commit
b9de26aa26
|
@ -1 +1 @@
|
|||
Subproject commit 6e7fa7ebe564e9bca957ea26ff2bee6038c2bf67
|
||||
Subproject commit 0ca3fe2b5d20f9aa71ef8a65cd9a676d5d3035e3
|
|
@ -181,6 +181,8 @@ private void onOsuLogo()
|
|||
|
||||
MenuState state;
|
||||
|
||||
public override bool HandleInput => state != MenuState.Exit;
|
||||
|
||||
public MenuState State
|
||||
{
|
||||
get
|
||||
|
@ -239,8 +241,6 @@ public MenuState State
|
|||
b.State = Button.ButtonState.Expanded;
|
||||
break;
|
||||
case MenuState.Exit:
|
||||
HandleInput = false;
|
||||
|
||||
buttonArea.FadeOut(200);
|
||||
|
||||
foreach (Button b in buttonsTopLevel)
|
||||
|
@ -587,9 +587,10 @@ private void trigger()
|
|||
//box.FlashColour(ColourHelper.Lighten2(colour, 0.7f), 200);
|
||||
}
|
||||
|
||||
public override bool HandleInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
HandleInput = state != ButtonState.Exploded && box.Scale.X >= 0.8f;
|
||||
iconText.Alpha = MathHelper.Clamp((box.Scale.X - 0.5f) / 0.3f, 0, 1);
|
||||
base.Update();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue