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

Merge branch 'master' into UserIDDBStore

Browse Source
This commit is contained in:
Dean Herbert
2019-03-01 11:07:30 +09:00
committed by GitHub
parent 9f9b2b1902 f4697a88e7
commit 6bccdd50ef
608 changed files with 6408 additions and 3285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Scoring/Legacy/LegacyScoreParser.cs
View File

@ -111,12 +111,14 @@ namespace osu.Game.Scoring.Legacy
byte[] properties = new byte[5];
if (replayInStream.Read(properties, 0, 5) != 5)
throw new IOException("input .lzma is too short");
long outSize = 0;
for (int i = 0; i < 8; i++)
{
int v = replayInStream.ReadByte();
if (v < 0)
throw new IOException("Can't Read 1");
outSize |= (long)(byte)v << (8 * i);
}
@ -264,6 +266,7 @@ namespace osu.Game.Scoring.Legacy
var convertible = currentRuleset.CreateConvertibleReplayFrame();
if (convertible == null)
throw new InvalidOperationException($"Legacy replay cannot be converted for the ruleset: {currentRuleset.Description}");
convertible.ConvertFrom(legacyFrame, currentBeatmap);
var frame = (ReplayFrame)convertible;

4
osu.Game/Scoring/ScoreInfo.cs
View File

@ -25,10 +25,10 @@ namespace osu.Game.Scoring
public ScoreRank Rank { get; set; }
[JsonProperty("total_score")]
public int TotalScore { get; set; }
public long TotalScore { get; set; }
[JsonProperty("accuracy")]
[Column(TypeName="DECIMAL(1,4)")]
[Column(TypeName = "DECIMAL(1,4)")]
public double Accuracy { get; set; }
[JsonProperty(@"pp")]

8
osu.Game/Scoring/ScoreRank.cs
View File

@ -9,20 +9,28 @@ namespace osu.Game.Scoring
{
[Description(@"F")]
F,
[Description(@"F")]
D,
[Description(@"C")]
C,
[Description(@"B")]
B,
[Description(@"A")]
A,
[Description(@"S")]
S,
[Description(@"SPlus")]
SH,
[Description(@"SS")]
X,
[Description(@"SSPlus")]
XH,
}