From 979181fc3b350725d0a947839bca668e327d84c1 Mon Sep 17 00:00:00 2001 From: ww-rm Date: Sat, 22 Mar 2025 21:12:47 +0800 Subject: [PATCH] small change --- .../SkeletonConverter/SkeletonConverter38.cs | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter38.cs b/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter38.cs index 7be5492..11dcb68 100644 --- a/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter38.cs +++ b/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter38.cs @@ -1227,35 +1227,6 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter writer.WriteVarInt(name2idx[name]); } - public override JsonObject ReadJson(string jsonPath) - { - // replace 3.8.75 to another version to avoid detection in official runtime - var root = base.ReadJson(jsonPath); - var skeleton = root["skeleton"].AsObject(); - var version = (string)skeleton["spine"]; - if (version == "3.8.75") skeleton["spine"] = "3.8.76"; - return root; - } - - public override void WriteJson(JsonObject root, string jsonPath) - { - // replace 3.8.75 to another version to avoid detection in official runtime - var skeleton = root["skeleton"].AsObject(); - var version = (string)skeleton["spine"]; - if (version == "3.8.75") skeleton["spine"] = "3.8.76"; - base.WriteJson(root, jsonPath); - } - - public override JsonObject ToVersion(JsonObject root, Version version) - { - root = version switch - { - Version.V38 => root.DeepClone().AsObject(), - _ => throw new NotImplementedException(), - }; - return root; - } - public void WriteFloatArray(JsonArray array, int n) { for (int i = 0; i < n; i++) @@ -1297,5 +1268,35 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter } } } + + public override JsonObject ReadJson(string jsonPath) + { + // replace 3.8.75 to another version to avoid detection in official runtime + var root = base.ReadJson(jsonPath); + var skeleton = root["skeleton"].AsObject(); + var version = (string)skeleton["spine"]; + if (version == "3.8.75") skeleton["spine"] = "3.8.76"; + return root; + } + + public override void WriteJson(JsonObject root, string jsonPath) + { + // replace 3.8.75 to another version to avoid detection in official runtime + var skeleton = root["skeleton"].AsObject(); + var version = (string)skeleton["spine"]; + if (version == "3.8.75") skeleton["spine"] = "3.8.76"; + base.WriteJson(root, jsonPath); + } + + public override JsonObject ToVersion(JsonObject root, Version version) + { + root = version switch + { + Version.V38 => root.DeepClone().AsObject(), + _ => throw new NotImplementedException(), + }; + return root; + } + } }