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

Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design

Browse Source 
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
This commit is contained in:
smoogipoo
2019-03-29 15:08:21 +09:00
parent 7239ebf5de a1fa497ec0
commit 2967c876ea
250 changed files with 1693 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
View File

@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Leaderboards;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring;
@ -55,9 +54,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly ModsInfoColumn modsInfo;
private APIScoreInfo score;
private ScoreInfo score;
public APIScoreInfo Score
public ScoreInfo Score
{
get => score;
set

4
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -3,9 +3,9 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Online.API.Requests.Responses;
using System.Collections.Generic;
using System.Linq;
using osu.Game.Scoring;
namespace osu.Game.Overlays.BeatmapSet.Scores
{
@ -48,7 +48,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
};
}
public IEnumerable<APIScoreInfo> Scores
public IEnumerable<ScoreInfo> Scores
{
set
{

9
osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
View File

@ -10,10 +10,10 @@ using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
using osuTK;
using System.Collections.Generic;
using System.Linq;
using osu.Game.Scoring;
namespace osu.Game.Overlays.BeatmapSet.Scores
{
@ -83,10 +83,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
}
private GetScoresRequest getScoresRequest;
private IEnumerable<ScoreInfo> scores;
private IEnumerable<APIScoreInfo> scores;
public IEnumerable<APIScoreInfo> Scores
public IEnumerable<ScoreInfo> Scores
{
get => scores;
set
@ -122,7 +121,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private void updateDisplay()
{
scoreTable.Scores = Enumerable.Empty<APIScoreInfo>();
scoreTable.Scores = Enumerable.Empty<ScoreInfo>();
loading = false;