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

Added mod selection overlay

Browse Source
This commit is contained in:
DrabWeb
2017-02-16 16:05:03 -04:00
parent d3335f778b
commit 0a58fc62db
13 changed files with 1541 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -29,6 +29,7 @@ using OpenTK.Input;
using System.Collections.Generic;
using osu.Framework.Graphics.Containers;
using osu.Framework.Threading;
using osu.Game.Overlays.Mods;
namespace osu.Game.Screens.Select
{
@ -44,6 +45,8 @@ namespace osu.Game.Screens.Select
private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 225);
private BeatmapInfoWedge beatmapInfoWedge;
private ModSelector modSelect;
private static readonly Vector2 background_blur = new Vector2(20);
private CancellationTokenSource initialAddSetsTask;
@ -132,6 +135,12 @@ namespace osu.Game.Screens.Select
Right = 20,
},
},
modSelect = new ModSelector
{
RelativeSizeAxes = Axes.Both,
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
},
footer = new Footer()
{
OnBack = Exit,
@ -139,7 +148,7 @@ namespace osu.Game.Screens.Select
}
};
footer.AddButton(@"mods", colours.Yellow, null);
footer.AddButton(@"mods", colours.Yellow, modSelect.ToggleVisibility);
footer.AddButton(@"random", colours.Green, carousel.SelectRandom);
footer.AddButton(@"options", colours.Blue, null);
@ -245,6 +254,12 @@ namespace osu.Game.Screens.Select
protected override bool OnExiting(GameMode next)
{
if (modSelect.State == Visibility.Visible)
{
modSelect.Hide();
return true;
}
beatmapInfoWedge.MoveToX(-100, 800, EasingTypes.InQuint);
beatmapInfoWedge.RotateTo(10, 800, EasingTypes.InQuint);