From 28fd11cf3ef4d1f3fc48603a1e87203f15e10669 Mon Sep 17 00:00:00 2001 From: ww-rm Date: Fri, 6 Jun 2025 22:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=A8=E9=AA=BC=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=B0=9D=E8=AF=95=E6=80=A7=E8=AF=BB=E5=8F=96=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpineWrappers/V21/SpineObjectData21.cs | 22 +++++++++++++++++-- .../SpineWrappers/V36/SpineObjectData36.cs | 22 +++++++++++++++++-- .../SpineWrappers/V37/SpineObjectData37.cs | 22 +++++++++++++++++-- .../SpineWrappers/V38/SpineObjectData38.cs | 22 +++++++++++++++++-- .../SpineWrappers/V40/SpineObjectData40.cs | 22 +++++++++++++++++-- .../SpineWrappers/V41/SpineObjectData41.cs | 22 +++++++++++++++++-- .../SpineWrappers/V42/SpineObjectData42.cs | 22 +++++++++++++++++-- 7 files changed, 140 insertions(+), 14 deletions(-) diff --git a/Spine/Implementations/SpineWrappers/V21/SpineObjectData21.cs b/Spine/Implementations/SpineWrappers/V21/SpineObjectData21.cs index abe247d..6959e60 100644 --- a/Spine/Implementations/SpineWrappers/V21/SpineObjectData21.cs +++ b/Spine/Implementations/SpineWrappers/V21/SpineObjectData21.cs @@ -35,9 +35,27 @@ namespace Spine.Implementations.SpineWrappers.V21 try { if (Utf8Validator.IsUtf8(skelPath)) - _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + } else - _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + } } catch (Exception ex) { diff --git a/Spine/Implementations/SpineWrappers/V36/SpineObjectData36.cs b/Spine/Implementations/SpineWrappers/V36/SpineObjectData36.cs index 159063c..f38bcd0 100644 --- a/Spine/Implementations/SpineWrappers/V36/SpineObjectData36.cs +++ b/Spine/Implementations/SpineWrappers/V36/SpineObjectData36.cs @@ -35,9 +35,27 @@ namespace Spine.Implementations.SpineWrappers.V36 try { if (Utf8Validator.IsUtf8(skelPath)) - _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + } else - _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + } } catch (Exception ex) { diff --git a/Spine/Implementations/SpineWrappers/V37/SpineObjectData37.cs b/Spine/Implementations/SpineWrappers/V37/SpineObjectData37.cs index 4fdfee2..8774bff 100644 --- a/Spine/Implementations/SpineWrappers/V37/SpineObjectData37.cs +++ b/Spine/Implementations/SpineWrappers/V37/SpineObjectData37.cs @@ -35,9 +35,27 @@ namespace Spine.Implementations.SpineWrappers.V37 try { if (Utf8Validator.IsUtf8(skelPath)) - _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + } else - _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + } } catch (Exception ex) { diff --git a/Spine/Implementations/SpineWrappers/V38/SpineObjectData38.cs b/Spine/Implementations/SpineWrappers/V38/SpineObjectData38.cs index b46076a..1138177 100644 --- a/Spine/Implementations/SpineWrappers/V38/SpineObjectData38.cs +++ b/Spine/Implementations/SpineWrappers/V38/SpineObjectData38.cs @@ -36,9 +36,27 @@ namespace Spine.Implementations.SpineWrappers.V38 try { if (Utf8Validator.IsUtf8(skelPath)) - _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + } else - _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + } } catch (Exception ex) { diff --git a/Spine/Implementations/SpineWrappers/V40/SpineObjectData40.cs b/Spine/Implementations/SpineWrappers/V40/SpineObjectData40.cs index 3c8370f..b3852f4 100644 --- a/Spine/Implementations/SpineWrappers/V40/SpineObjectData40.cs +++ b/Spine/Implementations/SpineWrappers/V40/SpineObjectData40.cs @@ -36,9 +36,27 @@ namespace Spine.Implementations.SpineWrappers.V40 try { if (Utf8Validator.IsUtf8(skelPath)) - _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + } else - _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + } } catch (Exception ex) { diff --git a/Spine/Implementations/SpineWrappers/V41/SpineObjectData41.cs b/Spine/Implementations/SpineWrappers/V41/SpineObjectData41.cs index 49ed2b7..b5755b0 100644 --- a/Spine/Implementations/SpineWrappers/V41/SpineObjectData41.cs +++ b/Spine/Implementations/SpineWrappers/V41/SpineObjectData41.cs @@ -36,9 +36,27 @@ namespace Spine.Implementations.SpineWrappers.V41 try { if (Utf8Validator.IsUtf8(skelPath)) - _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + } else - _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + } } catch (Exception ex) { diff --git a/Spine/Implementations/SpineWrappers/V42/SpineObjectData42.cs b/Spine/Implementations/SpineWrappers/V42/SpineObjectData42.cs index e826704..acd41ee 100644 --- a/Spine/Implementations/SpineWrappers/V42/SpineObjectData42.cs +++ b/Spine/Implementations/SpineWrappers/V42/SpineObjectData42.cs @@ -36,9 +36,27 @@ namespace Spine.Implementations.SpineWrappers.V42 try { if (Utf8Validator.IsUtf8(skelPath)) - _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + } else - _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + { + try + { + _skeletonData = new SkeletonBinary(_atlas).ReadSkeletonData(skelPath); + } + catch + { + _skeletonData = new SkeletonJson(_atlas).ReadSkeletonData(skelPath); + } + } } catch (Exception ex) {