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

Timeshift -> Playlists at a code level

Browse Source
This commit is contained in:
Dean Herbert
2020-12-25 13:11:21 +09:00
parent 4e21bd0108
commit a1384942b1
27 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ namespace osu.Game.Screens.Menu
public Action OnSolo;
public Action OnSettings;
public Action OnMultiplayer;
public Action OnTimeshift;
public Action OnPlaylists;
public const float BUTTON_WIDTH = 140f;
public const float WEDGE_WIDTH = 20;
@ -125,7 +125,7 @@ namespace osu.Game.Screens.Menu
{
buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@ -175,7 +175,7 @@ namespace osu.Game.Screens.Menu
OnMultiplayer?.Invoke();
}
private void onTimeshift()
private void onPlaylists()
{
if (!api.IsLoggedIn)
{
@ -193,7 +193,7 @@ namespace osu.Game.Screens.Menu
return;
}
OnTimeshift?.Invoke();
OnPlaylists?.Invoke();
}
private void updateIdleState(bool isIdle)

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

@ -18,7 +18,7 @@ using osu.Game.Overlays;
using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Multi.RealtimeMultiplayer;
using osu.Game.Screens.Multi.Timeshift;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.Select;
namespace osu.Game.Screens.Menu
@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
},
OnSolo = onSolo,
OnMultiplayer = () => this.Push(new RealtimeMultiplayer()),
OnTimeshift = () => this.Push(new TimeshiftMultiplayer()),
OnPlaylists = () => this.Push(new PlaylistsMultiplayer()),
OnExit = confirmAndExit,
}
}