ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select

This commit is contained in:
DrabWeb
2017-02-18 07:28:22 -04:00
parent 4ccfa380f5
commit 006fb5502d
12 changed files with 399 additions and 172 deletions

View File

@ -52,6 +52,12 @@ namespace osu.Game.Overlays.Mods
_selectedMod = -1;
}
else if (value <= -2)
{
_selectedMod = Mods.Length - 1;
}
iconsContainer.RotateTo(Selected ? 5f : 0f, 300, EasingTypes.OutElastic);
iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, EasingTypes.OutElastic);
for (int i = 0; i < icons.Length; i++)
{
// TODO: Find out how to fade between colours here (FadeColour makes the colours look different)
@ -74,8 +80,8 @@ namespace osu.Game.Overlays.Mods
private Color4 backgroundColour;
public new Color4 Colour
{
get
{
{
return backgroundColour;
}
set
@ -83,6 +89,21 @@ namespace osu.Game.Overlays.Mods
if (value == backgroundColour) return;
backgroundColour = value;
foreach (ModIcon icon in icons)
{
icon.Colour = value;
}
}
}
private Color4 selectedColour;
public Color4 SelectedColour
{
get
{
return selectedColour;
}
set
{
if (value == selectedColour) return;
selectedColour = value;
if (Selected) icons[0].Colour = value;
@ -92,6 +113,7 @@ namespace osu.Game.Overlays.Mods
private Mod[] mods;
public Mod[] Mods
{
get
{
return mods;
}