diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs b/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs index dec2a3c..d74e2fe 100644 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs +++ b/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs @@ -1,5 +1,6 @@ using Cryville.Common; using Cryville.Common.Unity.UI; +using Newtonsoft.Json; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; @@ -100,9 +101,15 @@ namespace Cryville.Crtr.Browsing { public class MetaInfo { public string name { get; set; } public string author { get; set; } + [JsonRequired] + public string data { get; set; } + } + public class SongMetaInfo { + public string name { get; set; } + public string author { get; set; } } public class ChartMeta : MetaInfo { - public MetaInfo song { get; set; } + public SongMetaInfo song { get; set; } public float length { get; set; } public string ruleset { get; set; } public int note_count { get; set; } diff --git a/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs b/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs index 8690452..7364de4 100644 --- a/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs +++ b/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs @@ -33,7 +33,7 @@ namespace Cryville.Crtr.Extensions.Malody { ChartMeta meta = new ChartMeta() { name = src.meta.version, author = src.meta.creator, - song = new MetaInfo() { + song = new SongMetaInfo() { name = src.meta.song.titleorg != null ? src.meta.song.titleorg : src.meta.song.title, author = src.meta.song.artistorg != null ? src.meta.song.artistorg : src.meta.song.artist, }, diff --git a/Assets/Cryville/Crtr/Ruleset.cs b/Assets/Cryville/Crtr/Ruleset.cs index a978380..73adf81 100644 --- a/Assets/Cryville/Crtr/Ruleset.cs +++ b/Assets/Cryville/Crtr/Ruleset.cs @@ -18,14 +18,11 @@ namespace Cryville.Crtr { [JsonRequired] public string @base; - [JsonRequired] - public string pdt; - [JsonIgnore] public PdtRuleset Root { get; private set; } public void LoadPdt(DirectoryInfo dir) { - using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + pdt + ".pdt", Encoding.UTF8)) { + using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) { var src = pdtreader.ReadToEnd(); Root = new RulesetInterpreter(src, null).Interpret(); } diff --git a/Assets/Cryville/Crtr/Skin.cs b/Assets/Cryville/Crtr/Skin.cs index 52bd1b1..bcf895f 100644 --- a/Assets/Cryville/Crtr/Skin.cs +++ b/Assets/Cryville/Crtr/Skin.cs @@ -19,9 +19,6 @@ namespace Cryville.Crtr { [JsonRequired] public string ruleset; - - [JsonRequired] - public string pdt; public List frames = new List(); @@ -29,7 +26,7 @@ namespace Cryville.Crtr { public PdtSkin Root { get; private set; } public void LoadPdt(DirectoryInfo dir) { - using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + pdt + ".pdt", Encoding.UTF8)) { + using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) { var src = pdtreader.ReadToEnd(); Root = new SkinInterpreter(src, null).Interpret(); }