Merge pull request #115 from ww-rm/dev/wpf

v0.16.2

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v0.16.2
+
+- 修复批量添加时的添加顺序错误
+- 增加精确命中检测和插槽输出功能
+- 部分代码重构
+
+## v0.16.1
+
+- 修复 3.4 版本存在的附件残留问题
+
 ## v0.16.0
 
 - 增加最小化至托盘图标功能

Spine/Implementations/TextureLoader.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.SpineWrappers
+namespace Spine.Implementations
 {
     /// <summary>
     /// 实现不同版本的 TextureLoader

Spine/Implementations/V21/Animation21.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime21;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class Animation21(Animation innerObject) : IAnimation
     {

Spine/Implementations/V21/AnimationState21.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class AnimationState21(AnimationState innerObject, SpineObjectData21 data) : IAnimationState
     {
@@ -35,7 +35,7 @@ namespace Spine.Implementations.SpineWrappers.V21
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -64,7 +64,7 @@ namespace Spine.Implementations.SpineWrappers.V21
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -93,7 +93,7 @@ namespace Spine.Implementations.SpineWrappers.V21
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;

Spine/Implementations/V21/Attachments/Attachment21.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21.Attachments
+namespace Spine.Implementations.V21.Attachments
 {
     internal abstract class Attachment21(Attachment innerObject) : IAttachment
     {

Spine/Implementations/V21/Attachments/BoundingBoxAttachment21.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V21;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21.Attachments
+namespace Spine.Implementations.V21.Attachments
 {
     internal sealed class BoundingBoxAttachment21(BoundingBoxAttachment innerObject) : 
         Attachment21(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V21.Attachments
 
         public override BoundingBoxAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot21 st)
             {

Spine/Implementations/V21/Attachments/MeshAttachment21.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V21;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21.Attachments
+namespace Spine.Implementations.V21.Attachments
 {
     internal sealed class MeshAttachment21(MeshAttachment innerObject) : 
         Attachment21(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V21.Attachments
 
         public override MeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot21 st)
             {

Spine/Implementations/V21/Attachments/RegionAttachment21.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V21;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21.Attachments
+namespace Spine.Implementations.V21.Attachments
 {
     internal sealed class RegionAttachment21(RegionAttachment innerObject) : 
         Attachment21(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V21.Attachments
 
         public override RegionAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot21 st)
             {

Spine/Implementations/V21/Attachments/SkinnedMeshAttachment21.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V21;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21.Attachments
+namespace Spine.Implementations.V21.Attachments
 {
     internal sealed class SkinnedMeshAttachment21(SkinnedMeshAttachment innerObject) : 
         Attachment21(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V21.Attachments
 
         public override SkinnedMeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot21 st)
             {

Spine/Implementations/V21/Bone21.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class Bone21(Bone innerObject, Bone21? parent = null) : IBone
     {

Spine/Implementations/V21/Skeleton21.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Frozen;
 using System.Collections.Immutable;
-using Spine.SpineWrappers;
 using SpineRuntime21;
+using Spine.Interfaces;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class Skeleton21 : ISkeleton
     {
@@ -95,11 +95,6 @@ namespace Spine.Implementations.SpineWrappers.V21
         public void SetSlotsToSetupPose() => _o.SetSlotsToSetupPose();
         public void Update(float delta) => _o.Update(delta);
 
-        public void GetBounds(out float x, out float y, out float w, out float h)
-        {
-            _o.GetBounds(out x, out y, out w, out h);
-        }
-
         public override string ToString() => _o.ToString();
     }
 }

Spine/Implementations/V21/SkeletonClipping21.cs

@@ -1,5 +1,5 @@
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using Spine.Utils;
 using SpineRuntime21;
 using System;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class SkeletonClipping21 : ISkeletonClipping
     {

Spine/Implementations/V21/Skin21.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime21;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class Skin21 : ISkin
     {

Spine/Implementations/V21/Slot21.cs

@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
 using SpineRuntime21;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class Slot21 : ISlot
     {
@@ -39,7 +40,7 @@ namespace Spine.Implementations.SpineWrappers.V21
         public float A { get => _o.A; set => _o.A = value; }
         public IBone Bone => _bone;
 
-        public Spine.SpineWrappers.Attachments.IAttachment? Attachment
+        public IAttachment? Attachment
         { 
             get
             {

Spine/Implementations/V21/SpineObjectData21.cs

@@ -6,12 +6,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
 using SpineRuntime21;
-using Spine.Implementations.SpineWrappers.V21.Attachments;
+using Spine.Implementations.V21.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     [SpineImplementation(2, 1)]
     internal sealed class SpineObjectData21 : SpineObjectData
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V21
         private readonly ImmutableArray<IAnimation> _animations;
         private readonly FrozenDictionary<string, IAnimation> _animationsByName;
 
-        public SpineObjectData21(string skelPath, string atlasPath, Spine.SpineWrappers.TextureLoader textureLoader) 
+        public SpineObjectData21(string skelPath, string atlasPath, TextureLoader textureLoader) 
             : base(skelPath, atlasPath, textureLoader)
         {
             // 加载 atlas

Spine/Implementations/V21/TrackEntry21.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime21;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V21
+namespace Spine.Implementations.V21
 {
     internal sealed class TrackEntry21(TrackEntry innerObject, AnimationState21 animationState, SpineObjectData21 data): ITrackEntry
     {
@@ -34,7 +34,7 @@ namespace Spine.Implementations.SpineWrappers.V21
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -63,7 +63,7 @@ namespace Spine.Implementations.SpineWrappers.V21
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -92,7 +92,7 @@ namespace Spine.Implementations.SpineWrappers.V21
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;

Spine/Implementations/V34/Animation34.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime34;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class Animation34(Animation innerObject) : IAnimation
     {

Spine/Implementations/V34/AnimationState34.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class AnimationState34(AnimationState innerObject, SpineObjectData34 data) : IAnimationState
     {
@@ -36,7 +36,7 @@ namespace Spine.Implementations.SpineWrappers.V34
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -65,7 +65,7 @@ namespace Spine.Implementations.SpineWrappers.V34
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -94,7 +94,7 @@ namespace Spine.Implementations.SpineWrappers.V34
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;

Spine/Implementations/V34/Attachments/Attachment34.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34.Attachments
+namespace Spine.Implementations.V34.Attachments
 {
     internal abstract class Attachment34(Attachment innerObject) : IAttachment
     {

Spine/Implementations/V34/Attachments/BoundingBoxAttachment34.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V34;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34.Attachments
+namespace Spine.Implementations.V34.Attachments
 {
     internal sealed class BoundingBoxAttachment34(BoundingBoxAttachment innerObject) : 
         Attachment34(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V34.Attachments
 
         public override BoundingBoxAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot34 st)
             {

Spine/Implementations/V34/Attachments/MeshAttachment34.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V34;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34.Attachments
+namespace Spine.Implementations.V34.Attachments
 {
     internal sealed class MeshAttachment34(MeshAttachment innerObject) : 
         Attachment34(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V34.Attachments
 
         public override MeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot34 st)
             {

Spine/Implementations/V34/Attachments/PathAttachment34.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V34;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34.Attachments
+namespace Spine.Implementations.V34.Attachments
 {
     internal sealed class PathAttachment34(PathAttachment innerObject) : 
         Attachment34(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V34.Attachments
 
         public override PathAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot34 st)
             {

Spine/Implementations/V34/Attachments/RegionAttachment34.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V34;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34.Attachments
+namespace Spine.Implementations.V34.Attachments
 {
     internal sealed class RegionAttachment34(RegionAttachment innerObject) : 
         Attachment34(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V34.Attachments
 
         public override RegionAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot34 st)
             {

Spine/Implementations/V34/Bone34.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class Bone34(Bone innerObject, Bone34? parent = null) : IBone
     {

Spine/Implementations/V34/Skeleton34.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Frozen;
 using System.Collections.Immutable;
-using Spine.SpineWrappers;
 using SpineRuntime34;
+using Spine.Interfaces;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class Skeleton34 : ISkeleton
     {
@@ -95,12 +95,6 @@ namespace Spine.Implementations.SpineWrappers.V34
         public void SetSlotsToSetupPose() => _o.SetSlotsToSetupPose();
         public void Update(float delta) => _o.Update(delta);
 
-        public void GetBounds(out float x, out float y, out float w, out float h)
-        {
-            float[] _ = [];
-            _o.GetBounds(out x, out y, out w, out h);
-        }
-
         public override string ToString() => _o.ToString();
     }
 }

Spine/Implementations/V34/SkeletonClipping34.cs

@@ -1,5 +1,5 @@
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using Spine.Utils;
 using SpineRuntime34;
 using System;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class SkeletonClipping34 : ISkeletonClipping
     {

Spine/Implementations/V34/Skin34.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime34;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class Skin34 : ISkin
     {

Spine/Implementations/V34/Slot34.cs

@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
 using SpineRuntime34;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class Slot34 : ISlot
     {
@@ -46,7 +47,7 @@ namespace Spine.Implementations.SpineWrappers.V34
         public float A { get => _o.A; set => _o.A = value; }
         public IBone Bone => _bone;
 
-        public Spine.SpineWrappers.Attachments.IAttachment? Attachment
+        public IAttachment? Attachment
         { 
             get
             {

Spine/Implementations/V34/SpineObjectData34.cs

@@ -6,12 +6,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
 using SpineRuntime34;
-using Spine.Implementations.SpineWrappers.V34.Attachments;
+using Spine.Implementations.V34.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     [SpineImplementation(3, 4)]
     internal sealed class SpineObjectData34 : SpineObjectData
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V34
         private readonly ImmutableArray<IAnimation> _animations;
         private readonly FrozenDictionary<string, IAnimation> _animationsByName;
 
-        public SpineObjectData34(string skelPath, string atlasPath, Spine.SpineWrappers.TextureLoader textureLoader) 
+        public SpineObjectData34(string skelPath, string atlasPath, TextureLoader textureLoader) 
             : base(skelPath, atlasPath, textureLoader)
         {
             // 加载 atlas

Spine/Implementations/V34/TrackEntry34.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime34;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V34
+namespace Spine.Implementations.V34
 {
     internal sealed class TrackEntry34(TrackEntry innerObject, AnimationState34 animationState, SpineObjectData34 data): ITrackEntry
     {
@@ -34,7 +34,7 @@ namespace Spine.Implementations.SpineWrappers.V34
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -63,7 +63,7 @@ namespace Spine.Implementations.SpineWrappers.V34
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -92,7 +92,7 @@ namespace Spine.Implementations.SpineWrappers.V34
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;

Spine/Implementations/V35/Animation35.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime35;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class Animation35(Animation innerObject) : IAnimation
     {

Spine/Implementations/V35/AnimationState35.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class AnimationState35(AnimationState innerObject, SpineObjectData35 data) : IAnimationState
     {
@@ -27,7 +27,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -56,7 +56,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -85,7 +85,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -114,7 +114,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -143,7 +143,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V35/Attachments/Attachment35.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35.Attachments
+namespace Spine.Implementations.V35.Attachments
 {
     internal abstract class Attachment35(Attachment innerObject) : IAttachment
     {

Spine/Implementations/V35/Attachments/BoundingBoxAttachment35.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V35;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35.Attachments
+namespace Spine.Implementations.V35.Attachments
 {
     internal sealed class BoundingBoxAttachment35(BoundingBoxAttachment innerObject) : 
         Attachment35(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V35.Attachments
 
         public override BoundingBoxAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot35 st)
             {

Spine/Implementations/V35/Attachments/ClippingAttachment35.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V35;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35.Attachments
+namespace Spine.Implementations.V35.Attachments
 {
     internal sealed class ClippingAttachment35(ClippingAttachment innerObject) : 
         Attachment35(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V35.Attachments
 
         public override ClippingAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot35 st)
             {

Spine/Implementations/V35/Attachments/MeshAttachment35.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V35;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35.Attachments
+namespace Spine.Implementations.V35.Attachments
 {
     internal sealed class MeshAttachment35(MeshAttachment innerObject) : 
         Attachment35(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V35.Attachments
 
         public override MeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot35 st)
             {

Spine/Implementations/V35/Attachments/PathAttachment35.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V35;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35.Attachments
+namespace Spine.Implementations.V35.Attachments
 {
     internal sealed class PathAttachment35(PathAttachment innerObject) : 
         Attachment35(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V35.Attachments
 
         public override PathAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot35 st)
             {

Spine/Implementations/V35/Attachments/PointAttachment35.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V35;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35.Attachments
+namespace Spine.Implementations.V35.Attachments
 {
     internal sealed class PointAttachment35(PointAttachment innerObject) : 
         Attachment35(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V35.Attachments
 
         public override PointAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot35 st)
             {

Spine/Implementations/V35/Attachments/RegionAttachment35.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V35;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35.Attachments
+namespace Spine.Implementations.V35.Attachments
 {
     internal sealed class RegionAttachment35(RegionAttachment innerObject) : 
         Attachment35(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V35.Attachments
 
         public override RegionAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot35 st)
             {

Spine/Implementations/V35/Bone35.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class Bone35(Bone innerObject, Bone35? parent = null) : IBone
     {

Spine/Implementations/V35/Skeleton35.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Frozen;
 using System.Collections.Immutable;
-using Spine.SpineWrappers;
 using SpineRuntime35;
+using Spine.Interfaces;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class Skeleton35 : ISkeleton
     {
@@ -95,12 +95,6 @@ namespace Spine.Implementations.SpineWrappers.V35
         public void SetSlotsToSetupPose() => _o.SetSlotsToSetupPose();
         public void Update(float delta) => _o.Update(delta);
 
-        public void GetBounds(out float x, out float y, out float w, out float h)
-        {
-            float[] _ = [];
-            _o.GetBounds(out x, out y, out w, out h, ref _);
-        }
-
         public override string ToString() => _o.ToString();
     }
 }

Spine/Implementations/V35/SkeletonClipping35.cs

@@ -1,5 +1,5 @@
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using Spine.Utils;
 using SpineRuntime35;
 using System;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class SkeletonClipping35 : ISkeletonClipping
     {

Spine/Implementations/V35/Skin35.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime35;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class Skin35 : ISkin
     {

Spine/Implementations/V35/Slot35.cs

@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
 using SpineRuntime35;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class Slot35 : ISlot
     {
@@ -46,7 +47,7 @@ namespace Spine.Implementations.SpineWrappers.V35
         public float A { get => _o.A; set => _o.A = value; }
         public IBone Bone => _bone;
 
-        public Spine.SpineWrappers.Attachments.IAttachment? Attachment
+        public IAttachment? Attachment
         { 
             get
             {

Spine/Implementations/V35/SpineObjectData35.cs

@@ -6,12 +6,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
 using SpineRuntime35;
-using Spine.Implementations.SpineWrappers.V35.Attachments;
+using Spine.Implementations.V35.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     [SpineImplementation(3, 5)]
     internal sealed class SpineObjectData35 : SpineObjectData
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V35
         private readonly ImmutableArray<IAnimation> _animations;
         private readonly FrozenDictionary<string, IAnimation> _animationsByName;
 
-        public SpineObjectData35(string skelPath, string atlasPath, Spine.SpineWrappers.TextureLoader textureLoader) 
+        public SpineObjectData35(string skelPath, string atlasPath, TextureLoader textureLoader) 
             : base(skelPath, atlasPath, textureLoader)
         {
             // 加载 atlas

Spine/Implementations/V35/TrackEntry35.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime35;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V35
+namespace Spine.Implementations.V35
 {
     internal sealed class TrackEntry35(TrackEntry innerObject, AnimationState35 animationState, SpineObjectData35 data): ITrackEntry
     {
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -55,7 +55,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -84,7 +84,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -113,7 +113,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -142,7 +142,7 @@ namespace Spine.Implementations.SpineWrappers.V35
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V36/Animation36.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime36;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class Animation36(Animation innerObject) : IAnimation
     {

Spine/Implementations/V36/AnimationState36.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class AnimationState36(AnimationState innerObject, SpineObjectData36 data) : IAnimationState
     {
@@ -27,7 +27,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -56,7 +56,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -85,7 +85,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -114,7 +114,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -143,7 +143,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V36/Attachments/Attachment36.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36.Attachments
+namespace Spine.Implementations.V36.Attachments
 {
     internal abstract class Attachment36(Attachment innerObject) : IAttachment
     {

Spine/Implementations/V36/Attachments/BoundingBoxAttachment36.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V36;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36.Attachments
+namespace Spine.Implementations.V36.Attachments
 {
     internal sealed class BoundingBoxAttachment36(BoundingBoxAttachment innerObject) : 
         Attachment36(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V36.Attachments
 
         public override BoundingBoxAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot36 st)
             {

Spine/Implementations/V36/Attachments/ClippingAttachment36.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V36;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36.Attachments
+namespace Spine.Implementations.V36.Attachments
 {
     internal sealed class ClippingAttachment36(ClippingAttachment innerObject) : 
         Attachment36(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V36.Attachments
 
         public override ClippingAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot36 st)
             {

Spine/Implementations/V36/Attachments/MeshAttachment36.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V36;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36.Attachments
+namespace Spine.Implementations.V36.Attachments
 {
     internal sealed class MeshAttachment36(MeshAttachment innerObject) : 
         Attachment36(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V36.Attachments
 
         public override MeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot36 st)
             {

Spine/Implementations/V36/Attachments/PathAttachment36.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V36;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36.Attachments
+namespace Spine.Implementations.V36.Attachments
 {
     internal sealed class PathAttachment36(PathAttachment innerObject) : 
         Attachment36(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V36.Attachments
 
         public override PathAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot36 st)
             {

Spine/Implementations/V36/Attachments/PointAttachment36.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V36;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36.Attachments
+namespace Spine.Implementations.V36.Attachments
 {
     internal sealed class PointAttachment36(PointAttachment innerObject) : 
         Attachment36(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V36.Attachments
 
         public override PointAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot36 st)
             {

Spine/Implementations/V36/Attachments/RegionAttachment36.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V36;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36.Attachments
+namespace Spine.Implementations.V36.Attachments
 {
     internal sealed class RegionAttachment36(RegionAttachment innerObject) : 
         Attachment36(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V36.Attachments
 
         public override RegionAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot36 st)
             {

Spine/Implementations/V36/Bone36.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class Bone36(Bone innerObject, Bone36? parent = null) : IBone
     {

Spine/Implementations/V36/Skeleton36.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Frozen;
 using System.Collections.Immutable;
-using Spine.SpineWrappers;
 using SpineRuntime36;
+using Spine.Interfaces;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class Skeleton36 : ISkeleton
     {
@@ -95,12 +95,6 @@ namespace Spine.Implementations.SpineWrappers.V36
         public void SetSlotsToSetupPose() => _o.SetSlotsToSetupPose();
         public void Update(float delta) => _o.Update(delta);
 
-        public void GetBounds(out float x, out float y, out float w, out float h)
-        {
-            float[] _ = [];
-            _o.GetBounds(out x, out y, out w, out h, ref _);
-        }
-
         public override string ToString() => _o.ToString();
     }
 }

Spine/Implementations/V36/SkeletonClipping36.cs

@@ -1,5 +1,5 @@
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using Spine.Utils;
 using SpineRuntime36;
 using System;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class SkeletonClipping36 : ISkeletonClipping
     {

Spine/Implementations/V36/Skin36.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime36;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class Skin36 : ISkin
     {

Spine/Implementations/V36/Slot36.cs

@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
 using SpineRuntime36;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class Slot36 : ISlot
     {
@@ -46,7 +47,7 @@ namespace Spine.Implementations.SpineWrappers.V36
         public float A { get => _o.A; set => _o.A = value; }
         public IBone Bone => _bone;
 
-        public Spine.SpineWrappers.Attachments.IAttachment? Attachment
+        public IAttachment? Attachment
         { 
             get
             {

Spine/Implementations/V36/SpineObjectData36.cs

@@ -6,12 +6,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
 using SpineRuntime36;
-using Spine.Implementations.SpineWrappers.V36.Attachments;
+using Spine.Implementations.V36.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     [SpineImplementation(3, 6)]
     internal sealed class SpineObjectData36 : SpineObjectData
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V36
         private readonly ImmutableArray<IAnimation> _animations;
         private readonly FrozenDictionary<string, IAnimation> _animationsByName;
 
-        public SpineObjectData36(string skelPath, string atlasPath, Spine.SpineWrappers.TextureLoader textureLoader) 
+        public SpineObjectData36(string skelPath, string atlasPath, TextureLoader textureLoader) 
             : base(skelPath, atlasPath, textureLoader)
         {
             // 加载 atlas

Spine/Implementations/V36/TrackEntry36.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime36;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V36
+namespace Spine.Implementations.V36
 {
     internal sealed class TrackEntry36(TrackEntry innerObject, AnimationState36 animationState, SpineObjectData36 data): ITrackEntry
     {
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -55,7 +55,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -84,7 +84,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -113,7 +113,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -142,7 +142,7 @@ namespace Spine.Implementations.SpineWrappers.V36
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V37/Animation37.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime37;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class Animation37(Animation innerObject) : IAnimation
     {

Spine/Implementations/V37/AnimationState37.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class AnimationState37(AnimationState innerObject, SpineObjectData37 data) : IAnimationState
     {
@@ -27,7 +27,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -56,7 +56,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -85,7 +85,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -114,7 +114,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -143,7 +143,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V37/Attachments/Attachment37.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37.Attachments
+namespace Spine.Implementations.V37.Attachments
 {
     internal abstract class Attachment37(Attachment innerObject) : IAttachment
     {

Spine/Implementations/V37/Attachments/BoundingBoxAttachment37.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V37;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37.Attachments
+namespace Spine.Implementations.V37.Attachments
 {
     internal sealed class BoundingBoxAttachment37(BoundingBoxAttachment innerObject) : 
         Attachment37(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V37.Attachments
 
         public override BoundingBoxAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot37 st)
             {

Spine/Implementations/V37/Attachments/ClippingAttachment37.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V37;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37.Attachments
+namespace Spine.Implementations.V37.Attachments
 {
     internal sealed class ClippingAttachment37(ClippingAttachment innerObject) : 
         Attachment37(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V37.Attachments
 
         public override ClippingAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot37 st)
             {

Spine/Implementations/V37/Attachments/MeshAttachment37.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V37;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37.Attachments
+namespace Spine.Implementations.V37.Attachments
 {
     internal sealed class MeshAttachment37(MeshAttachment innerObject) : 
         Attachment37(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V37.Attachments
 
         public override MeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot37 st)
             {

Spine/Implementations/V37/Attachments/PathAttachment37.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V37;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37.Attachments
+namespace Spine.Implementations.V37.Attachments
 {
     internal sealed class PathAttachment37(PathAttachment innerObject) : 
         Attachment37(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V37.Attachments
 
         public override PathAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot37 st)
             {

Spine/Implementations/V37/Attachments/PointAttachment37.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V37;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37.Attachments
+namespace Spine.Implementations.V37.Attachments
 {
     internal sealed class PointAttachment37(PointAttachment innerObject) : 
         Attachment37(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V37.Attachments
 
         public override PointAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot37 st)
             {

Spine/Implementations/V37/Attachments/RegionAttachment37.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V37;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37.Attachments
+namespace Spine.Implementations.V37.Attachments
 {
     internal sealed class RegionAttachment37(RegionAttachment innerObject) : 
         Attachment37(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V37.Attachments
 
         public override RegionAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot37 st)
             {

Spine/Implementations/V37/Bone37.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class Bone37(Bone innerObject, Bone37? parent = null) : IBone
     {

Spine/Implementations/V37/Skeleton37.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Frozen;
 using System.Collections.Immutable;
-using Spine.SpineWrappers;
 using SpineRuntime37;
+using Spine.Interfaces;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class Skeleton37 : ISkeleton
     {
@@ -95,12 +95,6 @@ namespace Spine.Implementations.SpineWrappers.V37
         public void SetSlotsToSetupPose() => _o.SetSlotsToSetupPose();
         public void Update(float delta) => _o.Update(delta);
 
-        public void GetBounds(out float x, out float y, out float w, out float h)
-        {
-            float[] _ = [];
-            _o.GetBounds(out x, out y, out w, out h, ref _);
-        }
-
         public override string ToString() => _o.ToString();
     }
 }

Spine/Implementations/V37/SkeletonClipping37.cs

@@ -1,5 +1,5 @@
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using Spine.Utils;
 using SpineRuntime37;
 using System;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class SkeletonClipping37 : ISkeletonClipping
     {

Spine/Implementations/V37/Skin37.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime37;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class Skin37 : ISkin
     {

Spine/Implementations/V37/Slot37.cs

@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
 using SpineRuntime37;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class Slot37 : ISlot
     {
@@ -46,7 +47,7 @@ namespace Spine.Implementations.SpineWrappers.V37
         public float A { get => _o.A; set => _o.A = value; }
         public IBone Bone => _bone;
 
-        public Spine.SpineWrappers.Attachments.IAttachment? Attachment
+        public IAttachment? Attachment
         { 
             get
             {

Spine/Implementations/V37/SpineObjectData37.cs

@@ -6,12 +6,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
 using SpineRuntime37;
-using Spine.Implementations.SpineWrappers.V37.Attachments;
+using Spine.Implementations.V37.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     [SpineImplementation(3, 7)]
     internal sealed class SpineObjectData37 : SpineObjectData
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V37
         private readonly ImmutableArray<IAnimation> _animations;
         private readonly FrozenDictionary<string, IAnimation> _animationsByName;
 
-        public SpineObjectData37(string skelPath, string atlasPath, Spine.SpineWrappers.TextureLoader textureLoader)
+        public SpineObjectData37(string skelPath, string atlasPath, TextureLoader textureLoader)
             : base(skelPath, atlasPath, textureLoader)
         {
             // 加载 atlas

Spine/Implementations/V37/TrackEntry37.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime37;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V37
+namespace Spine.Implementations.V37
 {
     internal sealed class TrackEntry37(TrackEntry innerObject, AnimationState37 animationState, SpineObjectData37 data): ITrackEntry
     {
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -55,7 +55,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -84,7 +84,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -113,7 +113,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -142,7 +142,7 @@ namespace Spine.Implementations.SpineWrappers.V37
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V38/Animation38.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime38;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class Animation38(Animation innerObject) : IAnimation
     {

Spine/Implementations/V38/AnimationState38.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime38;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class AnimationState38(AnimationState innerObject, SpineObjectData38 data) : IAnimationState
     {
@@ -27,7 +27,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -56,7 +56,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -85,7 +85,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -114,7 +114,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -143,7 +143,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V38/Attachments/Attachment38.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38.Attachments
+namespace Spine.Implementations.V38.Attachments
 {
     internal abstract class Attachment38(Attachment innerObject) : IAttachment
     {

Spine/Implementations/V38/Attachments/BoundingBoxAttachment38.cs

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V38;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38.Attachments
+namespace Spine.Implementations.V38.Attachments
 {
     internal sealed class BoundingBoxAttachment38(BoundingBoxAttachment innerObject) : 
         Attachment38(innerObject), 
@@ -17,7 +19,7 @@ namespace Spine.Implementations.SpineWrappers.V38.Attachments
 
         public override BoundingBoxAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot38 st)
             {

Spine/Implementations/V38/Attachments/ClippingAttachment38.cs

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V38;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38.Attachments
+namespace Spine.Implementations.V38.Attachments
 {
     internal sealed class ClippingAttachment38(ClippingAttachment innerObject) : 
         Attachment38(innerObject), 
@@ -17,7 +19,7 @@ namespace Spine.Implementations.SpineWrappers.V38.Attachments
 
         public override ClippingAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot38 st)
             {

Spine/Implementations/V38/Attachments/MeshAttachment38.cs

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V38;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38.Attachments
+namespace Spine.Implementations.V38.Attachments
 {
     internal sealed class MeshAttachment38(MeshAttachment innerObject) : 
         Attachment38(innerObject), 
@@ -17,7 +19,7 @@ namespace Spine.Implementations.SpineWrappers.V38.Attachments
 
         public override MeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot38 st)
             {

Spine/Implementations/V38/Attachments/PathAttachment38.cs

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V38;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38.Attachments
+namespace Spine.Implementations.V38.Attachments
 {
     internal sealed class PathAttachment38(PathAttachment innerObject) : 
         Attachment38(innerObject), 
@@ -17,7 +19,7 @@ namespace Spine.Implementations.SpineWrappers.V38.Attachments
 
         public override PathAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot38 st)
             {

Spine/Implementations/V38/Attachments/PointAttachment38.cs

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V38;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38.Attachments
+namespace Spine.Implementations.V38.Attachments
 {
     internal sealed class PointAttachment38(PointAttachment innerObject) : 
         Attachment38(innerObject), 
@@ -17,7 +19,7 @@ namespace Spine.Implementations.SpineWrappers.V38.Attachments
 
         public override PointAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot38 st)
             {

Spine/Implementations/V38/Attachments/RegionAttachment38.cs

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V38;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38.Attachments
+namespace Spine.Implementations.V38.Attachments
 {
     internal sealed class RegionAttachment38(RegionAttachment innerObject) : 
         Attachment38(innerObject), 
@@ -17,7 +19,7 @@ namespace Spine.Implementations.SpineWrappers.V38.Attachments
 
         public override RegionAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot38 st)
             {

Spine/Implementations/V38/Bone38.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime38;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class Bone38(Bone innerObject, Bone38? parent = null) : IBone
     {

Spine/Implementations/V38/Skeleton38.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Frozen;
 using System.Collections.Immutable;
-using Spine.SpineWrappers;
 using SpineRuntime38;
+using Spine.Interfaces;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class Skeleton38 : ISkeleton
     {
@@ -95,12 +95,6 @@ namespace Spine.Implementations.SpineWrappers.V38
         public void SetSlotsToSetupPose() => _o.SetSlotsToSetupPose();
         public void Update(float delta) => _o.Update(delta);
 
-        public void GetBounds(out float x, out float y, out float w, out float h)
-        {
-            float[] _ = [];
-            _o.GetBounds(out x, out y, out w, out h, ref _);
-        }
-
         public override string ToString() => _o.ToString();
     }
 }

Spine/Implementations/V38/SkeletonClipping38.cs

@@ -1,5 +1,5 @@
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using Spine.Utils;
 using SpineRuntime38;
 using System;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class SkeletonClipping38 : ISkeletonClipping
     {

Spine/Implementations/V38/Skin38.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime38;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class Skin38 : ISkin
     {

Spine/Implementations/V38/Slot38.cs

@@ -5,11 +5,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class Slot38 : ISlot
     {
@@ -47,7 +48,7 @@ namespace Spine.Implementations.SpineWrappers.V38
         public float A { get => _o.A; set => _o.A = value; }
         public IBone Bone => _bone;
 
-        public Spine.SpineWrappers.Attachments.IAttachment? Attachment
+        public IAttachment? Attachment
         { 
             get
             {

Spine/Implementations/V38/SpineObjectData38.cs

@@ -6,13 +6,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Spine.Utils;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
 using SpineRuntime38;
 using SpineRuntime38.Attachments;
-using Spine.Implementations.SpineWrappers.V38.Attachments;
+using Spine.Implementations.V38.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     [SpineImplementation(3, 8)]
     internal sealed class SpineObjectData38 : SpineObjectData
@@ -27,7 +27,7 @@ namespace Spine.Implementations.SpineWrappers.V38
         private readonly ImmutableArray<IAnimation> _animations;
         private readonly FrozenDictionary<string, IAnimation> _animationsByName;
 
-        public SpineObjectData38(string skelPath, string atlasPath, Spine.SpineWrappers.TextureLoader textureLoader)
+        public SpineObjectData38(string skelPath, string atlasPath, TextureLoader textureLoader)
             : base(skelPath, atlasPath, textureLoader)
         {
             // 加载 atlas

Spine/Implementations/V38/TrackEntry38.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime38;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V38
+namespace Spine.Implementations.V38
 {
     internal sealed class TrackEntry38(TrackEntry innerObject, AnimationState38 animationState, SpineObjectData38 data): ITrackEntry
     {
@@ -26,7 +26,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -55,7 +55,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -84,7 +84,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -113,7 +113,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -142,7 +142,7 @@ namespace Spine.Implementations.SpineWrappers.V38
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(_animationState.GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(_animationState.GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V40/Animation40.cs

@@ -1,4 +1,4 @@
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime40;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.Implementations.SpineWrappers.V40
+namespace Spine.Implementations.V40
 {
     internal sealed class Animation40(Animation innerObject) : IAnimation
     {

Spine/Implementations/V40/AnimationState40.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
+using Spine.Interfaces;
 using SpineRuntime40;
 
-namespace Spine.Implementations.SpineWrappers.V40
+namespace Spine.Implementations.V40
 {
     internal sealed class AnimationState40(AnimationState innerObject, SpineObjectData40 data) : IAnimationState
     {
@@ -27,7 +27,7 @@ namespace Spine.Implementations.SpineWrappers.V40
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Start += f;
@@ -56,7 +56,7 @@ namespace Spine.Implementations.SpineWrappers.V40
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Interrupt += f;
@@ -85,7 +85,7 @@ namespace Spine.Implementations.SpineWrappers.V40
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.End += f;
@@ -114,7 +114,7 @@ namespace Spine.Implementations.SpineWrappers.V40
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Complete += f;
@@ -143,7 +143,7 @@ namespace Spine.Implementations.SpineWrappers.V40
                 if (value is null) return;
                 if (!_eventMapping.TryGetValue(value, out var f))
                 {
-                    _eventMapping[value] = f = (TrackEntry t) => value(GetTrackEntry(t));
+                    _eventMapping[value] = f = (t) => value(GetTrackEntry(t));
                     _eventCount[value] = 0;
                 }
                 _o.Dispose += f;

Spine/Implementations/V40/Attachments/Attachment40.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers;
-using Spine.SpineWrappers.Attachments;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime40;
 
-namespace Spine.Implementations.SpineWrappers.V40.Attachments
+namespace Spine.Implementations.V40.Attachments
 {
     internal abstract class Attachment40(Attachment innerObject) : IAttachment
     {

Spine/Implementations/V40/Attachments/BoundingBoxAttachment40.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V40;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime40;
 
-namespace Spine.Implementations.SpineWrappers.V40.Attachments
+namespace Spine.Implementations.V40.Attachments
 {
     internal sealed class BoundingBoxAttachment40(BoundingBoxAttachment innerObject) : 
         Attachment40(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V40.Attachments
 
         public override BoundingBoxAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot40 st)
             {

Spine/Implementations/V40/Attachments/ClippingAttachment40.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V40;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime40;
 
-namespace Spine.Implementations.SpineWrappers.V40.Attachments
+namespace Spine.Implementations.V40.Attachments
 {
     internal sealed class ClippingAttachment40(ClippingAttachment innerObject) : 
         Attachment40(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V40.Attachments
 
         public override ClippingAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot40 st)
             {

Spine/Implementations/V40/Attachments/MeshAttachment40.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Spine.SpineWrappers.Attachments;
+using Spine.Implementations.V40;
+using Spine.Interfaces;
+using Spine.Interfaces.Attachments;
 using SpineRuntime40;
 
-namespace Spine.Implementations.SpineWrappers.V40.Attachments
+namespace Spine.Implementations.V40.Attachments
 {
     internal sealed class MeshAttachment40(MeshAttachment innerObject) : 
         Attachment40(innerObject), 
@@ -16,7 +18,7 @@ namespace Spine.Implementations.SpineWrappers.V40.Attachments
 
         public override MeshAttachment InnerObject => _o;
 
-        public override int ComputeWorldVertices(Spine.SpineWrappers.ISlot slot, ref float[] worldVertices)
+        public override int ComputeWorldVertices(ISlot slot, ref float[] worldVertices)
         {
             if (slot is Slot40 st)
             {