From 79bfd6764ca689149d6df9410c75c7f7b701c2fa Mon Sep 17 00:00:00 2001 From: PopSlime Date: Fri, 18 Nov 2022 00:45:25 +0800 Subject: [PATCH] Update ruleset and skin format number. (2) --- Assets/Cryville/Crtr/ChartPlayer.cs | 4 ++-- Assets/Cryville/Crtr/Config/ConfigScene.cs | 2 +- Assets/Cryville/Crtr/Ruleset.cs | 2 ++ Assets/Cryville/Crtr/Skin.cs | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/Cryville/Crtr/ChartPlayer.cs b/Assets/Cryville/Crtr/ChartPlayer.cs index d76bffc..6671268 100644 --- a/Assets/Cryville/Crtr/ChartPlayer.cs +++ b/Assets/Cryville/Crtr/ChartPlayer.cs @@ -355,7 +355,7 @@ namespace Cryville.Crtr { skin = JsonConvert.DeserializeObject(reader.ReadToEnd(), new JsonSerializerSettings() { MissingMemberHandling = MissingMemberHandling.Error }); - if (skin.format != 2) throw new FormatException("Invalid skin file version"); + if (skin.format != Skin.CURRENT_FORMAT) throw new FormatException("Invalid skin file version"); } loadThread = new Thread(new ParameterizedThreadStart(Load)); @@ -553,7 +553,7 @@ namespace Cryville.Crtr { ruleset = JsonConvert.DeserializeObject(reader.ReadToEnd(), new JsonSerializerSettings() { MissingMemberHandling = MissingMemberHandling.Error }); - if (ruleset.format != 2) throw new FormatException("Invalid ruleset file version"); + if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version"); ruleset.LoadPdt(dir); pruleset = ruleset.Root; pruleset.Optimize(etor); diff --git a/Assets/Cryville/Crtr/Config/ConfigScene.cs b/Assets/Cryville/Crtr/Config/ConfigScene.cs index 5ab46dd..6cdbcfc 100644 --- a/Assets/Cryville/Crtr/Config/ConfigScene.cs +++ b/Assets/Cryville/Crtr/Config/ConfigScene.cs @@ -35,7 +35,7 @@ namespace Cryville.Crtr.Config { ruleset = JsonConvert.DeserializeObject(reader.ReadToEnd(), new JsonSerializerSettings() { MissingMemberHandling = MissingMemberHandling.Error }); - if (ruleset.format != 1) throw new FormatException("Invalid ruleset file version"); + if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version"); ruleset.LoadPdt(dir); } FileInfo cfgfile = new FileInfo( diff --git a/Assets/Cryville/Crtr/Ruleset.cs b/Assets/Cryville/Crtr/Ruleset.cs index 725c915..a9a7445 100644 --- a/Assets/Cryville/Crtr/Ruleset.cs +++ b/Assets/Cryville/Crtr/Ruleset.cs @@ -12,6 +12,8 @@ using SIdentifier = Cryville.Common.Identifier; namespace Cryville.Crtr { public class Ruleset : MetaInfo { + public const long CURRENT_FORMAT = 2; + [JsonRequired] public long format; diff --git a/Assets/Cryville/Crtr/Skin.cs b/Assets/Cryville/Crtr/Skin.cs index bcf895f..1f65607 100644 --- a/Assets/Cryville/Crtr/Skin.cs +++ b/Assets/Cryville/Crtr/Skin.cs @@ -12,6 +12,8 @@ using System.Text; namespace Cryville.Crtr { public class Skin : MetaInfo { + public const long CURRENT_FORMAT = 2; + [JsonRequired] public long format;