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

Beatmap -> BeatmapInfo + add foreign key

Browse Source
This commit is contained in:
smoogipoo
2018-11-28 17:26:39 +09:00
parent 2ee181daf7
commit ed02847752
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Online/API/Requests/Responses/APIScore.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"beatmap")] [JsonProperty(@"beatmap")]
private BeatmapInfo beatmap private BeatmapInfo beatmap
{ {
set => Beatmap = value; set => BeatmapInfo = value;
} }
[JsonProperty(@"beatmapset")] [JsonProperty(@"beatmapset")]
@ -67,10 +67,10 @@ namespace osu.Game.Online.API.Requests.Responses
set set
{ {
// extract the set ID to its correct place. // extract the set ID to its correct place.
Beatmap.BeatmapSet = new BeatmapSetInfo { OnlineBeatmapSetID = value.ID }; BeatmapInfo.BeatmapSet = new BeatmapSetInfo { OnlineBeatmapSetID = value.ID };
value.ID = 0; value.ID = 0;
Beatmap.Metadata = value; BeatmapInfo.Metadata = value;
} }
} }
@ -110,7 +110,7 @@ namespace osu.Game.Online.API.Requests.Responses
public void ApplyBeatmap(BeatmapInfo beatmap) public void ApplyBeatmap(BeatmapInfo beatmap)
{ {
Beatmap = beatmap; BeatmapInfo = beatmap;
ApplyRuleset(beatmap.Ruleset); ApplyRuleset(beatmap.Ruleset);
} }

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

@ -34,7 +34,7 @@ namespace osu.Game.Scoring.Legacy
var version = sr.ReadInt32(); var version = sr.ReadInt32();
currentBeatmap = GetBeatmap(sr.ReadString()).Beatmap; currentBeatmap = GetBeatmap(sr.ReadString()).Beatmap;
score.Beatmap = currentBeatmap.BeatmapInfo; score.BeatmapInfo = currentBeatmap.BeatmapInfo;
score.User = new User { Username = sr.ReadString() }; score.User = new User { Username = sr.ReadString() };
score.MD5Hash = sr.ReadString(); score.MD5Hash = sr.ReadString();

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

@ -65,7 +65,9 @@ namespace osu.Game.Scoring
[JsonIgnore] [JsonIgnore]
public Replay Replay; public Replay Replay;
public BeatmapInfo Beatmap; public int BeatmapInfoID { get; set; }
public BeatmapInfo BeatmapInfo;
public long OnlineScoreID; public long OnlineScoreID;

2
osu.Game/Screens/Play/Player.cs
View File

@ -275,7 +275,7 @@ namespace osu.Game.Screens.Play
var score = new Score var score = new Score
{ {
Beatmap = Beatmap.Value.BeatmapInfo, BeatmapInfo = Beatmap.Value.BeatmapInfo,
Ruleset = ruleset Ruleset = ruleset
}; };
ScoreProcessor.PopulateScore(score); ScoreProcessor.PopulateScore(score);