mirror of
https://github.com/ppy/osu.git
synced 2025-03-15 20:47:25 +08:00
Fix naming confusion.
This commit is contained in:
parent
f1f7a26dbd
commit
8e88d86639
@ -24,57 +24,57 @@ namespace osu.Desktop.VisualTests.Tests
|
||||
|
||||
private class TestTeamList : ITeamList
|
||||
{
|
||||
public IEnumerable<Team> Teams { get; } = new[]
|
||||
public IEnumerable<DrawingsTeam> Teams { get; } = new[]
|
||||
{
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "GB",
|
||||
FullName = "United Kingdom",
|
||||
Acronym = "UK"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "FR",
|
||||
FullName = "France",
|
||||
Acronym = "FRA"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "CN",
|
||||
FullName = "China",
|
||||
Acronym = "CHN"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "AU",
|
||||
FullName = "Australia",
|
||||
Acronym = "AUS"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "JP",
|
||||
FullName = "Japan",
|
||||
Acronym = "JPN"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "RO",
|
||||
FullName = "Romania",
|
||||
Acronym = "ROM"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "IT",
|
||||
FullName = "Italy",
|
||||
Acronym = "PIZZA"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "VE",
|
||||
FullName = "Venezuela",
|
||||
Acronym = "VNZ"
|
||||
},
|
||||
new Team
|
||||
new DrawingsTeam
|
||||
{
|
||||
FlagName = "US",
|
||||
FullName = "United States of America",
|
||||
|
@ -37,7 +37,7 @@ namespace osu.Game.Screens.Tournament
|
||||
private GroupContainer groupsContainer;
|
||||
private OsuSpriteText fullTeamNameText;
|
||||
|
||||
private readonly List<Team> allTeams = new List<Team>();
|
||||
private readonly List<DrawingsTeam> allTeams = new List<DrawingsTeam>();
|
||||
|
||||
private DrawingsConfigManager drawingsConfig;
|
||||
|
||||
@ -249,7 +249,7 @@ namespace osu.Game.Screens.Tournament
|
||||
reset(true);
|
||||
}
|
||||
|
||||
private void onTeamSelected(Team team)
|
||||
private void onTeamSelected(DrawingsTeam team)
|
||||
{
|
||||
groupsContainer.AddTeam(team);
|
||||
|
||||
@ -286,7 +286,7 @@ namespace osu.Game.Screens.Tournament
|
||||
teamsContainer.ClearTeams();
|
||||
allTeams.Clear();
|
||||
|
||||
foreach (Team t in TeamList.Teams)
|
||||
foreach (DrawingsTeam t in TeamList.Teams)
|
||||
{
|
||||
if (groupsContainer.ContainsTeam(t.FullName))
|
||||
continue;
|
||||
@ -322,7 +322,7 @@ namespace osu.Game.Screens.Tournament
|
||||
if (line.ToUpper().StartsWith("GROUP"))
|
||||
continue;
|
||||
|
||||
Team teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
|
||||
DrawingsTeam teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
|
||||
|
||||
if (teamToAdd == null)
|
||||
continue;
|
||||
|
@ -73,7 +73,7 @@ namespace osu.Game.Screens.Tournament
|
||||
};
|
||||
}
|
||||
|
||||
public void AddTeam(Team team)
|
||||
public void AddTeam(DrawingsTeam team)
|
||||
{
|
||||
GroupTeam gt = new GroupTeam(team);
|
||||
|
||||
@ -91,7 +91,7 @@ namespace osu.Game.Screens.Tournament
|
||||
return allTeams.Any(t => t.Team.FullName == fullName);
|
||||
}
|
||||
|
||||
public bool RemoveTeam(Team team)
|
||||
public bool RemoveTeam(DrawingsTeam team)
|
||||
{
|
||||
allTeams.RemoveAll(gt => gt.Team == team);
|
||||
|
||||
@ -122,12 +122,12 @@ namespace osu.Game.Screens.Tournament
|
||||
|
||||
private class GroupTeam : Container
|
||||
{
|
||||
public readonly Team Team;
|
||||
public readonly DrawingsTeam Team;
|
||||
|
||||
private readonly FillFlowContainer innerContainer;
|
||||
private readonly Sprite flagSprite;
|
||||
|
||||
public GroupTeam(Team team)
|
||||
public GroupTeam(DrawingsTeam team)
|
||||
{
|
||||
Team = team;
|
||||
|
||||
|
@ -64,7 +64,7 @@ namespace osu.Game.Screens.Tournament
|
||||
}
|
||||
}
|
||||
|
||||
public void AddTeam(Team team)
|
||||
public void AddTeam(DrawingsTeam team)
|
||||
{
|
||||
if (groups[currentGroup].TeamsCount == maxTeams)
|
||||
return;
|
||||
|
@ -22,9 +22,9 @@ namespace osu.Game.Screens.Tournament
|
||||
public class ScrollingTeamContainer : Container
|
||||
{
|
||||
public event Action OnScrollStarted;
|
||||
public event Action<Team> OnSelected;
|
||||
public event Action<DrawingsTeam> OnSelected;
|
||||
|
||||
private readonly List<Team> availableTeams = new List<Team>();
|
||||
private readonly List<DrawingsTeam> availableTeams = new List<DrawingsTeam>();
|
||||
|
||||
private readonly Container tracker;
|
||||
|
||||
@ -158,7 +158,7 @@ namespace osu.Game.Screens.Tournament
|
||||
}
|
||||
}
|
||||
|
||||
public void AddTeam(Team team)
|
||||
public void AddTeam(DrawingsTeam team)
|
||||
{
|
||||
if (availableTeams.Contains(team))
|
||||
return;
|
||||
@ -169,12 +169,12 @@ namespace osu.Game.Screens.Tournament
|
||||
scrollState = ScrollState.Idle;
|
||||
}
|
||||
|
||||
public void AddTeams(IEnumerable<Team> teams)
|
||||
public void AddTeams(IEnumerable<DrawingsTeam> teams)
|
||||
{
|
||||
if (teams == null)
|
||||
return;
|
||||
|
||||
foreach (Team t in teams)
|
||||
foreach (DrawingsTeam t in teams)
|
||||
AddTeam(t);
|
||||
}
|
||||
|
||||
@ -185,7 +185,7 @@ namespace osu.Game.Screens.Tournament
|
||||
scrollState = ScrollState.Idle;
|
||||
}
|
||||
|
||||
public void RemoveTeam(Team team)
|
||||
public void RemoveTeam(DrawingsTeam team)
|
||||
{
|
||||
availableTeams.Remove(team);
|
||||
|
||||
@ -270,7 +270,7 @@ namespace osu.Game.Screens.Tournament
|
||||
|
||||
private void addFlags()
|
||||
{
|
||||
foreach (Team t in availableTeams)
|
||||
foreach (DrawingsTeam t in availableTeams)
|
||||
{
|
||||
Add(new ScrollingTeam(t)
|
||||
{
|
||||
@ -320,7 +320,7 @@ namespace osu.Game.Screens.Tournament
|
||||
public const float WIDTH = 58;
|
||||
public const float HEIGHT = 41;
|
||||
|
||||
public Team Team;
|
||||
public DrawingsTeam Team;
|
||||
|
||||
private readonly Sprite flagSprite;
|
||||
private readonly Box outline;
|
||||
@ -340,7 +340,7 @@ namespace osu.Game.Screens.Tournament
|
||||
}
|
||||
}
|
||||
|
||||
public ScrollingTeam(Team team)
|
||||
public ScrollingTeam(DrawingsTeam team)
|
||||
{
|
||||
Team = team;
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
namespace osu.Game.Screens.Tournament.Teams
|
||||
{
|
||||
public class Team
|
||||
public class DrawingsTeam
|
||||
{
|
||||
/// <summary>
|
||||
/// The name of this team.
|
@ -7,6 +7,6 @@ namespace osu.Game.Screens.Tournament.Teams
|
||||
{
|
||||
public interface ITeamList
|
||||
{
|
||||
IEnumerable<Team> Teams { get; }
|
||||
IEnumerable<DrawingsTeam> Teams { get; }
|
||||
}
|
||||
}
|
||||
|
@ -20,11 +20,11 @@ namespace osu.Game.Screens.Tournament.Teams
|
||||
this.storage = storage;
|
||||
}
|
||||
|
||||
public IEnumerable<Team> Teams
|
||||
public IEnumerable<DrawingsTeam> Teams
|
||||
{
|
||||
get
|
||||
{
|
||||
var teams = new List<Team>();
|
||||
var teams = new List<DrawingsTeam>();
|
||||
|
||||
try
|
||||
{
|
||||
@ -52,7 +52,7 @@ namespace osu.Game.Screens.Tournament.Teams
|
||||
string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
|
||||
acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
|
||||
|
||||
teams.Add(new Team
|
||||
teams.Add(new DrawingsTeam
|
||||
{
|
||||
FlagName = flagName,
|
||||
FullName = teamName,
|
||||
|
@ -325,7 +325,7 @@
|
||||
<Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
|
||||
<Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
|
||||
<Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
|
||||
<Compile Include="Screens\Tournament\Teams\Team.cs" />
|
||||
<Compile Include="Screens\Tournament\Teams\DrawingsTeam.cs" />
|
||||
<Compile Include="Users\UpdateableAvatar.cs" />
|
||||
<Compile Include="Users\User.cs" />
|
||||
<Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
|
||||
|
Loading…
x
Reference in New Issue
Block a user