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

Merge branch 'master' into modselect

Browse Source
This commit is contained in:
Huo Yaoyuan
2017-03-07 16:10:53 +08:00
parent 27edc9971e 533868a608
commit b56d6c767b
212 changed files with 2573 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -105,25 +105,19 @@ namespace osu.Game.Overlays.Mods
if (mod == value) return;
mod = value;
if (mod is MultiMod)
{
mods = ((MultiMod)mod).Mods;
}
else
{
mods = new Mod[] { mod };
}
Mods = (mod as MultiMod)?.Mods ?? new[] { mod };
createIcons();
if (mods.Length > 0)
if (Mods.Length > 0)
{
displayMod(mods[0]);
displayMod(Mods[0]);
}
}
}
private Mod[] mods;
public Mod[] Mods => mods; // the mods from Mod, only multiple if Mod is a MultiMod
public Mod[] Mods { get; private set; }
// the mods from Mod, only multiple if Mod is a MultiMod
public Mod SelectedMod => Mods.ElementAtOrDefault(selectedIndex);
@ -178,7 +172,7 @@ namespace osu.Game.Overlays.Mods
iconsContainer.Clear();
if (Mods.Length > 1)
{
iconsContainer.Add(new[]
iconsContainer.Add(new ModIcon[]
{
new ModIcon
{