Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore

This commit is contained in:
DrabWeb
2017-03-13 09:33:25 -03:00
parent 5719c6656a
commit 9912f5f9e1
16 changed files with 183 additions and 98 deletions

View File

@ -12,18 +12,18 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Threading;
using osu.Game.Screens.Tournament.Teams;
using OpenTK;
using OpenTK.Graphics;
using osu.Game.Users;
namespace osu.Game.Screens.Tournament
{
public class ScrollingTeamContainer : Container
{
public event Action OnScrollStarted;
public event Action<Team> OnSelected;
public event Action<Region> OnSelected;
private readonly List<Team> availableTeams = new List<Team>();
private readonly List<Region> availableTeams = new List<Region>();
private Container tracker;
@ -151,7 +151,7 @@ namespace osu.Game.Screens.Tournament
}
}
public void AddTeam(Team team)
public void AddTeam(Region team)
{
if (availableTeams.Contains(team))
return;
@ -162,12 +162,12 @@ namespace osu.Game.Screens.Tournament
scrollState = ScrollState.Idle;
}
public void AddTeams(IEnumerable<Team> teams)
public void AddTeams(IEnumerable<Region> teams)
{
if (teams == null)
return;
foreach (Team t in teams)
foreach (Region t in teams)
AddTeam(t);
}
@ -178,7 +178,7 @@ namespace osu.Game.Screens.Tournament
scrollState = ScrollState.Idle;
}
public void RemoveTeam(Team team)
public void RemoveTeam(Region team)
{
availableTeams.Remove(team);
@ -319,7 +319,7 @@ namespace osu.Game.Screens.Tournament
public const float WIDTH = 58;
public const float HEIGHT = 41;
public Team Team;
public Region Team;
private Sprite flagSprite;
private Box outline;
@ -339,7 +339,7 @@ namespace osu.Game.Screens.Tournament
}
}
public ScrollingTeam(Team team)
public ScrollingTeam(Region team)
{
Team = team;