From 34b17f31114729dff142b2e4814a171d1849ea13 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Thu, 17 Nov 2022 17:21:09 +0800 Subject: [PATCH] Add chart file resource. --- Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs | 4 ++-- Assets/Cryville/Crtr/Browsing/ResourceConverter.cs | 7 +++++-- .../Crtr/Extensions/Malody/MalodyChartConverter.cs | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs b/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs index 8e93d2b..2baf3c6 100644 --- a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs +++ b/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs @@ -133,8 +133,8 @@ namespace Cryville.Crtr.Browsing { if (!res.Valid) { Logger.Log("main", 3, "Resource", "Attempt to import invalid resource {0}", res); } - else if (res is ChartResource) { - var tres = (ChartResource)res; + else if (res is RawChartResource) { + var tres = (RawChartResource)res; var dir = new DirectoryInfo(_rootPath + "/charts/" + res.Name); if (!dir.Exists) dir.Create(); using (var writer = new StreamWriter(dir.FullName + "/.umgc")) { diff --git a/Assets/Cryville/Crtr/Browsing/ResourceConverter.cs b/Assets/Cryville/Crtr/Browsing/ResourceConverter.cs index 4274384..55e8d31 100644 --- a/Assets/Cryville/Crtr/Browsing/ResourceConverter.cs +++ b/Assets/Cryville/Crtr/Browsing/ResourceConverter.cs @@ -17,8 +17,8 @@ namespace Cryville.Crtr.Browsing { return string.Format("{0} ({1})", Name, ReflectionHelper.GetSimpleName(GetType())); } } - public class ChartResource : Resource { - public ChartResource(string name, Chart main, ChartMeta meta) : base(name) { + public class RawChartResource : Resource { + public RawChartResource(string name, Chart main, ChartMeta meta) : base(name) { Main = main; Meta = meta; } public Chart Main { get; private set; } @@ -32,6 +32,9 @@ namespace Cryville.Crtr.Browsing { public FileInfo Source { get; private set; } public override bool Valid { get { return Source.Exists; } } } + public class ChartResource : FileResource { + public ChartResource(string name, FileInfo src) : base(name, src) { } + } public class CoverResource : FileResource { public CoverResource(string name, FileInfo src) : base(name, src) { } } diff --git a/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs b/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs index eae0f18..8690452 100644 --- a/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs +++ b/Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs @@ -151,7 +151,7 @@ namespace Cryville.Crtr.Extensions.Malody { result.Add(new CoverResource(chartName, new FileInfo(file.DirectoryName + "/" + src.meta.background))); meta.cover = src.meta.background; } - result.Add(new ChartResource(chartName, chart, meta)); + result.Add(new RawChartResource(chartName, chart, meta)); return result; }