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

Apply newline additions

Browse Source
This commit is contained in:
Dean Herbert
2019-04-01 12:16:05 +09:00
parent 7d6a08d6da
commit 612db31c38
108 changed files with 359 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -156,9 +156,11 @@ namespace osu.Game.Screens.Menu
{
case GlobalAction.Back:
return goBack();
case GlobalAction.Select:
logo?.Click();
return true;
default:
return false;
}
@ -174,9 +176,11 @@ namespace osu.Game.Screens.Menu
State = ButtonSystemState.Initial;
sampleBack?.Play();
return true;
case ButtonSystemState.Play:
backButton.Click();
return true;
default:
return false;
}
@ -188,12 +192,15 @@ namespace osu.Game.Screens.Menu
{
default:
return true;
case ButtonSystemState.Initial:
State = ButtonSystemState.TopLevel;
return true;
case ButtonSystemState.TopLevel:
buttonsTopLevel.First().Click();
return false;
case ButtonSystemState.Play:
buttonsPlay.First().Click();
return false;
@ -259,12 +266,14 @@ namespace osu.Game.Screens.Menu
logo.ScaleTo(1, 800, Easing.OutExpo);
}, buttonArea.Alpha * 150);
break;
case ButtonSystemState.TopLevel:
case ButtonSystemState.Play:
switch (lastState)
{
case ButtonSystemState.TopLevel: // coming from toplevel to play
break;
case ButtonSystemState.Initial:
logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.None;
@ -287,6 +296,7 @@ namespace osu.Game.Screens.Menu
game?.Toolbar.Show();
}, 200);
break;
default:
logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.None;
@ -296,6 +306,7 @@ namespace osu.Game.Screens.Menu
}
break;
case ButtonSystemState.EnteringMode:
logoTracking = true;
break;

1
osu.Game/Screens/Menu/LogoVisualisation.cs
View File

@ -118,6 +118,7 @@ namespace osu.Game.Screens.Menu
base.Update();
float decayFactor = (float)Time.Elapsed * decay_per_milisecond;
for (int i = 0; i < bars_per_visualiser; i++)
{
//3% of extra bar length to make it a little faster when bar is almost at it's minimum