Skip to content
This repository was archived by the owner on Sep 2, 2023. It is now read-only.

Commit 1a57f27

Browse files
author
Awbugl
committed
Fix PjskMusicMetas
1 parent cbb4966 commit 1a57f27

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Andreal/Data/Json/Pjsk/PjskMusicMetas.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public class PjskMusicMetas
1616

1717
[JsonProperty("music_time")] public double? MusicTime { get; set; }
1818

19-
[JsonProperty("event_rate")] public int EventRate { get; set; }
19+
[JsonProperty("event_rate")] public int? EventRate { get; set; }
2020

21-
[JsonProperty("base_score")] public double BaseScore { get; set; }
21+
[JsonProperty("base_score")] public double? BaseScore { get; set; }
2222

23-
[JsonProperty("fever_score")] public double FeverScore { get; set; }
23+
[JsonProperty("fever_score")] public double? FeverScore { get; set; }
2424
}

Andreal/Model/Pjsk/SongInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal class SongInfo
1616
[NonSerialized] private static Lazy<ConcurrentDictionary<string, SongInfo>> _songList = new();
1717

1818
[NonSerialized]
19-
private static readonly Dictionary<string, string> Abbreviations = new();
19+
private static readonly ConcurrentDictionary<string, string> Abbreviations = new();
2020

2121
static SongInfo()
2222
{
@@ -197,11 +197,11 @@ internal static void Insert(PjskMusics item, List<PjskMusicMetas> musicMetas, IE
197197
Lyricist = item.Lyricist,
198198
Composer = item.Composer,
199199
MusicTime = musicMetas.First().MusicTime ?? 0,
200-
EventRate = musicMetas.First().EventRate,
200+
EventRate = musicMetas.First().EventRate ?? 0,
201201
Levels = musicMetas.Select(i => i.Level).ToList(),
202202
Note = string.Join(" | ", musicMetas.Select(i => i.Combo)),
203-
BaseScore = string.Join(" | ", musicMetas.Select(i => i.BaseScore.ToString("0.000"))),
204-
FeverScore = string.Join(" | ", musicMetas.Select(i => i.FeverScore.ToString("0.000"))),
203+
BaseScore = string.Join(" | ", musicMetas.Select(i => (i.BaseScore ?? 0).ToString("0.000"))),
204+
FeverScore = string.Join(" | ", musicMetas.Select(i => (i.FeverScore ?? 0).ToString("0.000"))),
205205
AssetbundleName = item.AssetbundleName,
206206
PublishedAt = item.PublishedAt,
207207
Alias = alias ?? Array.Empty<string>()

0 commit comments

Comments
 (0)