h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 01:47:33 +08:00
Code Issues Releases Wiki Activity

General cleanups.

Browse Source
This commit is contained in:
smoogipooo 2017-03-03 13:01:57 +09:00
parent d0894bbc9b
commit efb13b29d1
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Screens.Tournament
private double lastTime; private double lastTime;
private ScheduledDelegate delayedModeChangeDelegate; private ScheduledDelegate delayedStateChangeDelegate;
public ScrollingTeamContainer() public ScrollingTeamContainer()
{ {
@ -87,7 +87,7 @@ namespace osu.Game.Screens.Tournament
{ {
_scrollState = value; _scrollState = value;
delayedModeChangeDelegate?.Cancel(); delayedStateChangeDelegate?.Cancel();
switch (value) switch (value)
{ {
@ -103,7 +103,7 @@ namespace osu.Game.Screens.Tournament
speedTo(0f, 2000); speedTo(0f, 2000);
tracker.FadeIn(200); tracker.FadeIn(200);
delayedModeChangeDelegate = Delay(2300).Schedule(() => scrollState = ScrollState.Stopped); delayedStateChangeDelegate = Delay(2300).Schedule(() => scrollState = ScrollState.Stopped);
break; break;
case ScrollState.Stopped: case ScrollState.Stopped:
// Find closest to center // Find closest to center
@ -135,7 +135,7 @@ namespace osu.Game.Screens.Tournament
st.Selected = true; st.Selected = true;
OnSelected?.Invoke(st); OnSelected?.Invoke(st);
delayedModeChangeDelegate = Delay(10000).Schedule(() => scrollState = ScrollState.Idle); delayedStateChangeDelegate = Delay(10000).Schedule(() => scrollState = ScrollState.Idle);
break; break;
case ScrollState.Idle: case ScrollState.Idle:
resetSelected(); resetSelected();

14
osu.Game/Screens/Tournament/Tournament.cs
View File

@ -1,14 +0,0 @@
using osu.Game.Screens.Backgrounds;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace osu.Game.Screens.Tournament
{
public class Tournament : OsuScreen
{
protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault();
}
}

1
osu.Game/osu.Game.csproj
View File

@ -218,7 +218,6 @@
<Compile Include="Screens\Tournament\GroupsContainer.cs" /> <Compile Include="Screens\Tournament\GroupsContainer.cs" />
<Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" /> <Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
<Compile Include="Screens\Tournament\Team.cs" /> <Compile Include="Screens\Tournament\Team.cs" />
<Compile Include="Screens\Tournament\Tournament.cs" />
<Compile Include="Users\User.cs" /> <Compile Include="Users\User.cs" />
<Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" /> <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
<Compile Include="Database\BeatmapDatabase.cs" /> <Compile Include="Database\BeatmapDatabase.cs" />