RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-20 04:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Badge -> Team

Browse Source
This commit is contained in:
DrabWeb 2017-03-15 08:09:44 -03:00
parent 56868e3c06
commit 7572947214
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -3,7 +3,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenTK; using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Game.Modes; using osu.Game.Modes;

1
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -12,6 +12,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Modes; using osu.Game.Modes;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics.Colour;
using osu.Game.Modes.Mods; using osu.Game.Modes.Mods;
using osu.Game.Users; using osu.Game.Users;

6
osu.Game/Users/Badge.cs → osu.Game/Users/Team.cs
View File

@ -7,16 +7,16 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Users namespace osu.Game.Users
{ {
public class Badge : IHasDrawableRepresentation<Sprite> public class Team : IHasDrawableRepresentation<Sprite>
{ {
public string Name; public string Name;
public Texture Texture; // TODO: Replace this with something better public Texture Flag; // TODO: Replace this with something better
public Sprite CreateDrawable() public Sprite CreateDrawable()
{ {
return new Sprite return new Sprite
{ {
Texture = Texture, Texture = Flag,
}; };
} }
} }

2
osu.Game/Users/User.cs
View File

@ -10,6 +10,6 @@ namespace osu.Game.Users
public int Id; public int Id;
public string Username; public string Username;
public Region Region; public Region Region;
public IEnumerable<Badge> Badges; public Team Team;
} }
} }

2
osu.Game/osu.Game.csproj
View File

@ -330,7 +330,7 @@
<Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" /> <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
<Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" /> <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
<Compile Include="Users\Region.cs" /> <Compile Include="Users\Region.cs" />
<Compile Include="Users\Badge.cs" /> <Compile Include="Users\Team.cs" />
<Compile Include="Modes\ScoreRank.cs" /> <Compile Include="Modes\ScoreRank.cs" />
<Compile Include="Users\Avatar.cs" /> <Compile Include="Users\Avatar.cs" />
<Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" /> <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />