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

Fix post-merge issues

Browse Source
This commit is contained in:
smoogipoo
2018-12-22 15:35:22 +09:00
parent bdb6e03dfb
commit ac0e6f8d42
2 changed files with 6 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
View File

@ -3,16 +3,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.Leaderboards; using osu.Game.Online.Leaderboards;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets.Mods;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Users;
namespace osu.Game.Screens.Multi.Match.Components namespace osu.Game.Screens.Multi.Match.Components
{ {
@ -53,7 +50,7 @@ namespace osu.Game.Screens.Multi.Match.Components
return req; return req;
} }
protected override LeaderboardScore<RoomScore> CreateScoreVisualiser(RoomScore model, int index) => new MatchLeaderboardScore(model, index); protected override LeaderboardScore CreateDrawableScore(RoomScore model, int index) => new MatchLeaderboardScore(model, index);
private class GetRoomScoresRequest : APIRequest<List<RoomScore>> private class GetRoomScoresRequest : APIRequest<List<RoomScore>>
{ {
@ -68,7 +65,7 @@ namespace osu.Game.Screens.Multi.Match.Components
} }
} }
public class MatchLeaderboardScore : LeaderboardScore<RoomScore> public class MatchLeaderboardScore : LeaderboardScore
{ {
public MatchLeaderboardScore(RoomScore score, int rank) public MatchLeaderboardScore(RoomScore score, int rank)
: base(score, rank) : base(score, rank)
@ -81,20 +78,12 @@ namespace osu.Game.Screens.Multi.Match.Components
RankContainer.Alpha = 0; RankContainer.Alpha = 0;
} }
protected override User GetUser(RoomScore model) => model.User; protected override IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
protected override IEnumerable<Mod> GetMods(RoomScore model) => Enumerable.Empty<Mod>(); // Not implemented yet
protected override IEnumerable<(FontAwesome icon, string value, string name)> GetStatistics(RoomScore model) => new[]
{ {
(FontAwesome.fa_crosshairs, string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy), "Accuracy"), new LeaderboardScoreStatistic(FontAwesome.fa_crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy)),
(FontAwesome.fa_refresh, model.TotalAttempts.ToString(), "Total Attempts"), new LeaderboardScoreStatistic(FontAwesome.fa_refresh, "Total Attempts", ((RoomScore)model).TotalAttempts.ToString()),
(FontAwesome.fa_check, model.CompletedAttempts.ToString(), "Completed Beatmaps"), new LeaderboardScoreStatistic(FontAwesome.fa_check, "Completed Beatmaps", ((RoomScore)model).CompletedAttempts.ToString()),
}; };
protected override int GetTotalScore(RoomScore model) => model.TotalScore;
protected override ScoreRank GetRank(RoomScore model) => ScoreRank.S;
} }
public enum MatchLeaderboardScope public enum MatchLeaderboardScope

34
osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScore.cs
View File

@ -1,34 +0,0 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Game.Graphics;
using osu.Game.Online.Leaderboards;
using osu.Game.Rulesets.Mods;
using osu.Game.Scoring;
using osu.Game.Users;
namespace osu.Game.Screens.Select.Leaderboards
{
public class BeatmapLeaderboardScore : LeaderboardScore<ScoreInfo>
{
public BeatmapLeaderboardScore(ScoreInfo score, int rank)
: base(score, rank)
{
}
protected override User GetUser(ScoreInfo model) => model.User;
protected override IEnumerable<Mod> GetMods(ScoreInfo model) => model.Mods;
protected override IEnumerable<(FontAwesome icon, string value, string name)> GetStatistics(ScoreInfo model) => new[]
{
(FontAwesome.fa_link, model.MaxCombo.ToString(), "Max Combo"),
(FontAwesome.fa_crosshairs, string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy), "Accuracy")
};
protected override int GetTotalScore(ScoreInfo model) => model.TotalScore;
protected override ScoreRank GetRank(ScoreInfo model) => model.Rank;
}
}