Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"

This reverts commit 3e2e2a7000, reversing
changes made to d94801b6c6.
This commit is contained in:
smoogipoo
2018-11-19 17:52:31 +09:00
parent 11b13d1a5f
commit bcdaee7d39
3 changed files with 3 additions and 53 deletions

View File

@ -14,7 +14,6 @@ using osu.Framework.Input.Bindings;
using osu.Framework.Logging;
using osu.Framework.Threading;
using osu.Game.Graphics;
using osu.Game.Input;
using osu.Game.Input.Bindings;
using osu.Game.Overlays;
using OpenTK;
@ -65,8 +64,6 @@ namespace osu.Game.Screens.Menu
private SampleChannel sampleBack;
private IdleTracker idleTracker;
public ButtonSystem()
{
RelativeSizeAxes = Axes.Both;
@ -105,10 +102,9 @@ namespace osu.Game.Screens.Menu
private OsuGame game;
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuGame game, IdleTracker idleTracker)
private void load(AudioManager audio, OsuGame game)
{
this.game = game;
this.idleTracker = idleTracker;
sampleBack = audio.Sample.Get(@"Menu/button-back-select");
}
@ -270,8 +266,8 @@ namespace osu.Game.Screens.Menu
protected override void Update()
{
if (idleTracker?.IdleTime > 6000 && State != ButtonSystemState.Exit)
State = ButtonSystemState.Initial;
//if (OsuGame.IdleTime > 6000 && State != MenuState.Exit)
// State = MenuState.Initial;
base.Update();