Taiko_Stuff/TakoTako
1
0
Fork 0
mirror of synced 2024-11-12 00:40:48 +01:00
Code Releases Activity

Fixed saving/loading issues

Browse Source
This commit is contained in:
Fluto 2022-02-08 20:34:52 +11:00
parent f65641ac5f
commit 0b8edad069
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
TakoTako/MusicPatch.cs
View File

@ -128,7 +128,7 @@ public class MusicPatch
{
var data = GetCustomSaveData();
var savePath = SaveFilePath;
var json = JsonConvert.SerializeObject(data);
var json = JsonConvert.SerializeObject((CustomMusicSaveDataBodySerializable) data);
using Stream fs = new FileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.None, 4096, FileOptions.WriteThrough);
using StreamWriter streamWriter = new StreamWriter(fs);
@ -282,7 +282,7 @@ public class MusicPatch
foreach (var item in conversionStatus.Items)
{
var directory = Path.Combine(musicDirectory, item.FolderName);
var dataPath = Path.Combine(directory, "data.json");
var dataPath = Path.Combine(directory, SongDataFileName);
if (!File.Exists(dataPath))
{
Log.LogError($"Cannot find {dataPath}");
@ -1699,19 +1699,33 @@ public class MusicPatch
public class CustomMusicSaveDataBodySerializable
{
[JsonProperty("m")] public Dictionary<int, MusicInfoExSerializable> CustomTrackToMusicInfoEx = new();
[JsonProperty("CustomTrackToMusicInfoEx")]
public Dictionary<int, MusicInfoExSerializable> CustomTrackToMusicInfoEx_v0
{
set => CustomTrackToMusicInfoEx = value;
}
[JsonProperty("r")] public Dictionary<int, EnsoRecordInfoSerializable[]> CustomTrackToEnsoRecordInfo = new();
[JsonProperty("CustomTrackToEnsoRecordInfo")]
public Dictionary<int, EnsoRecordInfoSerializable[]> CustomTrackToEnsoRecordInfo_v0
{
set => CustomTrackToEnsoRecordInfo = value;
}
public static explicit operator CustomMusicSaveDataBodySerializable(CustomMusicSaveDataBody m)
{
var result = new CustomMusicSaveDataBodySerializable();
foreach (var musicInfoEx in m.CustomTrackToMusicInfoEx)
result.CustomTrackToMusicInfoEx[musicInfoEx.Key] = musicInfoEx.Value;
foreach (var ensoRecord in m.CustomTrackToEnsoRecordInfo)
{
var array = new EnsoRecordInfoSerializable[ensoRecord.Value.Length];
for (var i = 0; i < ensoRecord.Value.Length; i++)
array[i] = ensoRecord.Value[i];
result.CustomTrackToEnsoRecordInfo[ensoRecord.Key] = array;
}
@ -1723,11 +1737,13 @@ public class MusicPatch
var result = new CustomMusicSaveDataBody();
foreach (var musicInfoEx in m.CustomTrackToMusicInfoEx)
result.CustomTrackToMusicInfoEx[musicInfoEx.Key] = musicInfoEx.Value;
foreach (var ensoRecord in m.CustomTrackToEnsoRecordInfo)
{
var array = new EnsoRecordInfo[ensoRecord.Value.Length];
for (var i = 0; i < ensoRecord.Value.Length; i++)
array[i] = ensoRecord.Value[i];
result.CustomTrackToEnsoRecordInfo[ensoRecord.Key] = array;
}
@ -1753,7 +1769,7 @@ public class MusicPatch
[JsonProperty("isNew")]
private bool isNew_v0
{
set => favorite = value;
set => isNew = value;
}
public static implicit operator MusicInfoEx(MusicInfoExSerializable m) => new()