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

Merge branch 'master' into buttonsystem-entermode

Browse Source
This commit is contained in:
David Zhao
2019-07-03 15:54:34 +09:00
committed by GitHub
parent 6391d21af1 7c5e4c60c1
commit b2185cd3a2
544 changed files with 18898 additions and 4758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ namespace osu.Game.Screens.Menu
if (idleTracker != null) isIdle.BindTo(idleTracker.IsIdle);
sampleBack = audio.Sample.Get(@"Menu/button-back-select");
sampleBack = audio.Samples.Get(@"Menu/button-back-select");
}
private void onMulti()
@ -176,7 +176,7 @@ namespace osu.Game.Screens.Menu
private void updateIdleState(bool isIdle)
{
if (isIdle && State != ButtonSystemState.Exit)
if (isIdle && State != ButtonSystemState.Exit && State != ButtonSystemState.EnteringMode)
State = ButtonSystemState.Initial;
}