From 3c91f335fc9eb736fc327d82ad05724b8a657311 Mon Sep 17 00:00:00 2001 From: ww-rm Date: Tue, 6 May 2025 19:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dskin=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SkeletonConverter/SkeletonConverter41.cs | 17 ++++++++++------- .../SkeletonConverter/SkeletonConverter42.cs | 16 ++++++++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter41.cs b/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter41.cs index 657d13a..bf25958 100644 --- a/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter41.cs +++ b/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter41.cs @@ -1319,7 +1319,6 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter } JsonArray ik = root["ik"].AsArray(); writer.WriteVarInt(ik.Count); - int flag = 0; for (int i = 0, n = ik.Count; i < n; i++) { JsonObject data = ik[i].AsObject(); @@ -1432,16 +1431,20 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter } JsonArray skins = root["skins"].AsArray(); - for (int i = 0; i < skins.Count; i++) + foreach (JsonObject sk in skins) { - var name = (string)skins[i]["name"]; - if (name == "default" && i != 0) + if ((string)sk["name"] == "default") { - skin2idx[(string)skins[0]["name"]] = skin2idx.Count; skin2idx["default"] = 0; - continue; + break; + } + } + foreach (JsonObject sk in skins) + { + if ((string)sk["name"] != "default") + { + skin2idx["default"] = skin2idx.Count; } - skin2idx[name] = skin2idx.Count; } bool hasDefault = false; diff --git a/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter42.cs b/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter42.cs index aba1a5c..67be33c 100644 --- a/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter42.cs +++ b/SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter42.cs @@ -1549,16 +1549,20 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter //mix-and-match的full-skins/boy这个skin，他的linkedmesh调用了后面的full-skins/boy JsonArray skins = root["skins"].AsArray(); - for (int i = 0; i < skins.Count; i++) + foreach (JsonObject sk in skins) { - var name = (string)skins[i]["name"]; - if (name == "default" && i != 0) + if ((string)sk["name"] == "default") { - skin2idx[(string)skins[0]["name"]] = skin2idx.Count; skin2idx["default"] = 0; - continue; + break; + } + } + foreach (JsonObject sk in skins) + { + if ((string)sk["name"] != "default") + { + skin2idx["default"] = skin2idx.Count; } - skin2idx[name] = skin2idx.Count; } bool hasDefault = false;