Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Pull up data field in metadata.

Browse Source
This commit is contained in:
PopSlime
2022-11-17 23:31:44 +08:00
parent 5cdf10874e
commit 678e145271
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs
View File

@@ -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; }

2
Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs
View File

@@ -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,
},

5
Assets/Cryville/Crtr/Ruleset.cs
View File

@@ -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();
}

5
Assets/Cryville/Crtr/Skin.cs
View File

@@ -19,9 +19,6 @@ namespace Cryville.Crtr {
[JsonRequired]
public string ruleset;
[JsonRequired]
public string pdt;
public List<string> frames = new List<string>();
@@ -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();
}