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

v0.16.6

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,4 +15,4 @@ assignees: ''
 如果有必要，提供报错时的有关截图。/If applicable, add screenshots to help explain your problem.  
 
 ## 附件（可选）/Attachments (Optional)
-请将会**出现问题的文件**以及**日志文件**打包成一个 ZIP 后作为附件贴在 issue 内。/Please compress the problematic files and the log files into a single ZIP archive and attach it to this issue.
+请将会**出现问题的文件**以及**日志文件**打包成一个 ZIP 后作为附件贴在 issue 内，日志文件位于程序目录下的 `logs` 文件夹内。/Please compress the problematic files and the log files into a single ZIP archive and attach it to this issue. The log files are located in the `logs` folder under the program directory.

CHANGELOG.md

@@ -1,5 +1,61 @@
 # CHANGELOG
 
+## v0.16.6
+
+- 修复控件尺寸为0时导致的画面缩放错误
+
+## v0.16.5
+
+- 修复对于无 size 行的旧 atlas 格式读取错误
+- 修复托盘化之后无法联动显示窗口的问题
+
+## v0.16.4
+
+- 增加 apng 导出格式
+- 增加颜色拾取器面板
+- 增加程序皮肤（主题颜色）首选项
+- 优化部分使用体验
+
+## v0.16.3
+
+- 修复加载工作区时的顺序错误
+- 调整部分调试渲染的逻辑
+- 完善命中检测逻辑
+
+## v0.16.2
+
+- 修复批量添加时的添加顺序错误
+- 增加精确命中检测和插槽输出功能
+- 部分代码重构
+
+## v0.16.1
+
+- 修复 3.4 版本存在的附件残留问题
+
+## v0.16.0
+
+- 增加最小化至托盘图标功能
+- 调整部分参数项的顺序
+- 增加开机自启和自启文件设置
+- 切换桌面投影时自动设置预览分辨率为主屏幕分辨率
+- 修复 3.4 版本下可能存在的附件残留问题
+
+## v0.15.19
+
+- 模型重载后选中最后一个重载模型
+- 修复 3.4 版本可能的奇数顶点数组导致的越界崩溃问题
+- 移除参数自动记录中的背景图片路径
+- 增加测试性桌面投影功能
+
+## v0.15.18
+
+- 完善窗口日志颜色标记
+- 修复预览图背景颜色为透明
+- 修复面板高度首次还原错误
+- 增加托盘图标
+- 增加可选预览背景画面和填充模式
+- 增强支持的纹理格式（例如 webp）
+
 ## v0.15.17
 
 - 修改图标配色

NLog.Windows.Wpf/NLog.Windows.Wpf.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -7,7 +7,7 @@
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.15.4</Version>
+        <Version>0.16.0</Version>
         <UseWPF>true</UseWPF>
     </PropertyGroup>
 

NLog.Windows.Wpf/RichTextBoxRowColoringRule.cs

@@ -1,92 +1,53 @@
-// 
-// Copyright (c) 2004-2011 Jaroslaw Kowalski <jaak@jkowalski.net>
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions 
-// are met:
-// 
-// * Redistributions of source code must retain the above copyright notice, 
-//   this list of conditions and the following disclaimer. 
-// 
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution. 
-// 
-// * Neither the name of Jaroslaw Kowalski nor the names of its 
-//   contributors may be used to endorse or promote products derived from this
-//   software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-// THE POSSIBILITY OF SUCH DAMAGE.
-// 
-
+using NLog;
 using NLog.Conditions;
 using NLog.Config;
-using NLog;
-using System.ComponentModel;
+using NLog.Layouts;
 using System.Windows;
+
 namespace NLog.Windows.Wpf
 {
     [NLogConfigurationItem]
     public class RichTextBoxRowColoringRule
     {
-        static RichTextBoxRowColoringRule()
-        {
-            Default = new RichTextBoxRowColoringRule();
-        }
-
-        public RichTextBoxRowColoringRule()
-            : this(null, "Empty", "Empty", FontStyles.Normal, FontWeights.Normal)
-        {
-        }
-
-        public RichTextBoxRowColoringRule(string condition, string fontColor, string backColor, FontStyle fontStyle, FontWeight fontWeight)
-        {
-            Condition = condition;
-            FontColor = fontColor;
-            BackgroundColor = backColor;
-            Style = fontStyle;
-            Weight = fontWeight;
-        }
-
-        public RichTextBoxRowColoringRule(string condition, string fontColor, string backColor)
-        {
-            Condition = condition;
-            FontColor = fontColor;
-            BackgroundColor = backColor;
-            Style = FontStyles.Normal;
-            Weight = FontWeights.Normal;
-        }
-
         public static RichTextBoxRowColoringRule Default { get; private set; }
 
         [RequiredParameter]
         public ConditionExpression Condition { get; set; }
 
-        [DefaultValue("Empty")]
-        public string FontColor { get; set; }
+        public Layout FontColor { get; set; }
+        public Layout BackgroundColor { get; set; }
 
-        [DefaultValue("Empty")]
-        public string BackgroundColor { get; set; }
+        public FontStyle FontStyle { get; set; }
+        public FontWeight FontWeight { get; set; }
 
-        public FontStyle Style { get; set; }
+        static RichTextBoxRowColoringRule()
+        {
+            RichTextBoxRowColoringRule.Default = new RichTextBoxRowColoringRule();
+        }
 
-        public FontWeight Weight { get; set; }
+        public RichTextBoxRowColoringRule() : this(null, "Empty", "Empty", FontStyles.Normal, FontWeights.Normal) { }
+
+        public RichTextBoxRowColoringRule(string condition, string fontColor, string backColor)
+        {
+            this.Condition = (ConditionExpression)condition;
+            this.FontColor = Layout.FromString(fontColor);
+            this.BackgroundColor = Layout.FromString(backColor);
+            this.FontStyle = FontStyles.Normal;
+            this.FontWeight = FontWeights.Normal;
+        }
+
+        public RichTextBoxRowColoringRule(string condition, string fontColor, string backColor, FontStyle fontStyle, FontWeight fontWeight)
+        {
+            this.Condition = (ConditionExpression)condition;
+            this.FontColor = Layout.FromString(fontColor);
+            this.BackgroundColor = Layout.FromString(backColor);
+            this.FontStyle = fontStyle;
+            this.FontWeight = fontWeight;
+        }
 
         public bool CheckCondition(LogEventInfo logEvent)
         {
-            return true.Equals(Condition.Evaluate(logEvent));
+            return true.Equals(this.Condition.Evaluate(logEvent));
         }
     }
 }

NLog.Windows.Wpf/RichTextBoxTarget.cs

@@ -1,34 +1,27 @@
-using NLog.Config;
-using NLog.Layouts;
+using NLog;
+using NLog.Common;
+using NLog.Config;
 using NLog.Targets;
-using NLog;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
-using System.Windows;
 
 namespace NLog.Windows.Wpf
 {
-    // TODO: 完善日志实现
     [Target("RichTextBox")]
     public sealed class RichTextBoxTarget : TargetWithLayout
     {
-        private int lineCount;
-        private int _width = 500;
-        private int _height = 500;
-        private static readonly TypeConverter colorConverter = new ColorConverter();
+        public static ReadOnlyCollection<RichTextBoxRowColoringRule> DefaultRowColoringRules { get; } = CreateDefaultColoringRules();
 
-        static RichTextBoxTarget()
+        private static ReadOnlyCollection<RichTextBoxRowColoringRule> CreateDefaultColoringRules()
         {
-            var rules = new List<RichTextBoxRowColoringRule>()
+            return new List<RichTextBoxRowColoringRule>()
             {
                 new RichTextBoxRowColoringRule("level == LogLevel.Fatal", "White", "Red", FontStyles.Normal, FontWeights.Bold),
                 new RichTextBoxRowColoringRule("level == LogLevel.Error", "Red", "Empty", FontStyles.Italic, FontWeights.Bold),
@@ -36,221 +29,253 @@ namespace NLog.Windows.Wpf
                 new RichTextBoxRowColoringRule("level == LogLevel.Info", "Black", "Empty"),
                 new RichTextBoxRowColoringRule("level == LogLevel.Debug", "Gray", "Empty"),
                 new RichTextBoxRowColoringRule("level == LogLevel.Trace", "DarkGray", "Empty", FontStyles.Italic, FontWeights.Normal),
-            };
-
-            DefaultRowColoringRules = rules.AsReadOnly();
+            }.AsReadOnly();
         }
 
-        public RichTextBoxTarget()
-        {
-            WordColoringRules = new List<RichTextBoxWordColoringRule>();
-            RowColoringRules = new List<RichTextBoxRowColoringRule>();
-            ToolWindow = true;
-        }
-
-        private delegate void DelSendTheMessageToRichTextBox(string logMessage, RichTextBoxRowColoringRule rule);
-
-        private delegate void FormCloseDelegate();
-
-        public static ReadOnlyCollection<RichTextBoxRowColoringRule> DefaultRowColoringRules { get; private set; }
+        public RichTextBoxTarget() { }
 
         public string ControlName { get; set; }
 
-        public string FormName { get; set; }
+        public string WindowName { get; set; }
 
-        [DefaultValue(false)]
         public bool UseDefaultRowColoringRules { get; set; }
 
-        [ArrayParameter(typeof(RichTextBoxRowColoringRule), "row-coloring")]
-        public IList<RichTextBoxRowColoringRule> RowColoringRules { get; private set; }
-
-        [ArrayParameter(typeof(RichTextBoxWordColoringRule), "word-coloring")]
-        public IList<RichTextBoxWordColoringRule> WordColoringRules { get; private set; }
-
-        [DefaultValue(true)]
-        public bool ToolWindow { get; set; }
-
-        public bool ShowMinimized { get; set; }
-
-        public int Width
-        {
-            get { return _width; }
-            set { _width = value; }
-        }
-
-        public int Height
-        {
-            get { return _height; }
-            set { _height = value; }
-        }
-
         public bool AutoScroll { get; set; }
 
         public int MaxLines { get; set; }
 
-        internal Window TargetForm { get; set; }
+        [ArrayParameter(typeof(RichTextBoxRowColoringRule), "row-coloring")]
+        public IList<RichTextBoxRowColoringRule> RowColoringRules { get; } = new List<RichTextBoxRowColoringRule>();
 
-        internal RichTextBox TargetRichTextBox { get; set; }
+        [ArrayParameter(typeof(RichTextBoxWordColoringRule), "word-coloring")]
+        public IList<RichTextBoxWordColoringRule> WordColoringRules { get; } = new List<RichTextBoxWordColoringRule>();
 
-        internal bool CreatedForm { get; set; }
+        [NLogConfigurationIgnoreProperty]
+        public Window TargetWindow { get; set; }
+
+        [NLogConfigurationIgnoreProperty]
+        public RichTextBox TargetRichTextBox { get; set; }
 
         protected override void InitializeTarget()
         {
-            TargetRichTextBox = Application.Current.MainWindow.FindName(ControlName) as RichTextBox;
+            base.InitializeTarget();
+            if (TargetRichTextBox != null)
+                return;
 
-            if (TargetRichTextBox != null) return;
-            //this.TargetForm = FormHelper.CreateForm(this.FormName, this.Width, this.Height, false, this.ShowMinimized, this.ToolWindow);
-            //this.CreatedForm = true;
-
-            var openFormByName = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType().Name == FormName);
-            if (openFormByName != null)
+            if (WindowName == null)
             {
-                TargetForm = openFormByName;
-                if (string.IsNullOrEmpty(ControlName))
-                {
-                    // throw new NLogConfigurationException("Rich text box control name must be specified for " + GetType().Name + ".");
-                    Trace.WriteLine("Rich text box control name must be specified for " + GetType().Name + ".");
-                }
-
-                CreatedForm = false;
-                TargetRichTextBox = TargetForm.FindName(ControlName) as RichTextBox;
-
-                if (TargetRichTextBox == null)
-                {
-                    // throw new NLogConfigurationException("Rich text box control '" + ControlName + "' cannot be found on form '" + FormName + "'.");
-                    Trace.WriteLine("Rich text box control '" + ControlName + "' cannot be found on form '" + FormName + "'.");
-                }
+                HandleError("WindowName should be specified for {0}.{1}", GetType().Name, Name);
+                return;
             }
 
-            if (TargetRichTextBox == null)
+            if (string.IsNullOrEmpty(ControlName))
             {
-                TargetForm = new Window
-                {
-                    Name = FormName,
-                    Width = Width,
-                    Height = Height,
-                    WindowStyle = ToolWindow ? WindowStyle.ToolWindow : WindowStyle.None,
-                    WindowState = ShowMinimized ? WindowState.Minimized : WindowState.Normal,
-                    Title = "NLog Messages"
-                };
-                TargetForm.Show();
-
-                TargetRichTextBox = new RichTextBox { Name = ControlName };
-                var style = new Style(typeof(Paragraph));
-                TargetRichTextBox.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
-                style.Setters.Add(new Setter(Block.MarginProperty, new Thickness(0, 0, 0, 0)));
-                TargetRichTextBox.Resources.Add(typeof(Paragraph), style);
-                TargetForm.Content = TargetRichTextBox;
-
-                CreatedForm = true;
+                HandleError("Rich text box control name must be specified for {0}.{1}", GetType().Name, Name);
+                return;
             }
+
+            var targetWindow = Application.Current.Windows.OfType<Window>().FirstOrDefault(w => w.Name == WindowName);
+            if (targetWindow == null)
+            {
+                InternalLogger.Info("{0}: WindowName '{1}' not found", this, WindowName);
+                return;
+            }
+
+            var targetControl = targetWindow.FindName(ControlName) as RichTextBox;
+            if (targetControl == null)
+            {
+                InternalLogger.Info("{0}: WIndowName '{1}' does not contain ControlName '{2}'", this, WindowName, ControlName);
+                return;
+            }
+
+            AttachToControl(targetWindow, targetControl);
+        }
+
+        private static void HandleError(string message, params object[] args)
+        {
+            if (LogManager.ThrowExceptions)
+            {
+                throw new NLogConfigurationException(string.Format(message, args));
+            }
+            InternalLogger.Error(message, args);
+        }
+
+        private void AttachToControl(Window window, RichTextBox textboxControl)
+        {
+            InternalLogger.Info("{0}: Attaching target to textbox {1}.{2}", this, window.Name, textboxControl.Name);
+            DetachFromControl();
+            TargetWindow = window;
+            TargetRichTextBox = textboxControl;
+        }
+
+        private void DetachFromControl()
+        {
+            TargetWindow = null;
+            TargetRichTextBox = null;
         }
 
         protected override void CloseTarget()
         {
-            if (CreatedForm)
-            {
-                try
-                {
-                    TargetForm.Dispatcher.Invoke(() =>
-                    {
-                        TargetForm.Close();
-                        TargetForm = null;
-                    });
-                }
-                catch
-                {
-                }
-
-
-
-            }
+            DetachFromControl();
         }
 
         protected override void Write(LogEventInfo logEvent)
         {
-            RichTextBoxRowColoringRule matchingRule = RowColoringRules.FirstOrDefault(rr => rr.CheckCondition(logEvent));
-
-            if (UseDefaultRowColoringRules && matchingRule == null)
+            RichTextBox textbox = TargetRichTextBox;
+            if (textbox == null || textbox.Dispatcher.HasShutdownStarted || textbox.Dispatcher.HasShutdownFinished)
             {
-                foreach (var rr in DefaultRowColoringRules.Where(rr => rr.CheckCondition(logEvent)))
-                {
-                    matchingRule = rr;
-                    break;
-                }
+                //no last logged textbox
+                InternalLogger.Trace("{0}: Attached Textbox is {1}, skipping logging", this, textbox == null ? "null" : "disposed");
+                return;
             }
 
-            if (matchingRule == null)
-            {
-                matchingRule = RichTextBoxRowColoringRule.Default;
-            }
-
-            var logMessage = Layout.Render(logEvent);
-
-            if (Application.Current == null) return;
+            string logMessage = RenderLogEvent(Layout, logEvent);
+            RichTextBoxRowColoringRule matchingRule = FindMatchingRule(logEvent);
+            _ = DoSendMessageToTextbox(logMessage, matchingRule, logEvent);
+        }
 
+        private bool DoSendMessageToTextbox(string logMessage, RichTextBoxRowColoringRule rule, LogEventInfo logEvent)
+        {
+            RichTextBox textbox = TargetRichTextBox;
             try
             {
-                if (Application.Current.Dispatcher.CheckAccess() == false)
+                if (textbox != null && !textbox.Dispatcher.HasShutdownStarted && !textbox.Dispatcher.HasShutdownFinished)
                 {
-                    Application.Current.Dispatcher.Invoke(() => SendTheMessageToRichTextBox(logMessage, matchingRule));
-                }
-                else
-                {
-                    SendTheMessageToRichTextBox(logMessage, matchingRule);
+                    if (!textbox.Dispatcher.CheckAccess())
+                    {
+                        textbox.Dispatcher.BeginInvoke(() => SendTheMessageToRichTextBox(textbox, logMessage, rule, logEvent));
+                    }
+                    else
+                    {
+                        SendTheMessageToRichTextBox(textbox, logMessage, rule, logEvent);
+                    }
+                    return true;
                 }
             }
             catch (Exception ex)
             {
-                Debug.WriteLine(ex);
-            }
+                InternalLogger.Warn(ex, "{0}: Failed to append RichTextBox", this);
 
-        }
-
-
-        private static Color GetColorFromString(string color, Brush defaultColor)
-        {
-
-            if (color == "Empty")
-            {
-                return defaultColor is SolidColorBrush solidBrush ? solidBrush.Color : Colors.White;
-            }
-
-            return (Color)colorConverter.ConvertFromString(color);
-        }
-
-
-        private void SendTheMessageToRichTextBox(string logMessage, RichTextBoxRowColoringRule rule)
-        {
-            RichTextBox rtbx = TargetRichTextBox;
-
-            var tr = new TextRange(rtbx.Document.ContentEnd, rtbx.Document.ContentEnd);
-            tr.Text = logMessage + "\n";
-            tr.ApplyPropertyValue(TextElement.ForegroundProperty,
-                new SolidColorBrush(GetColorFromString(rule.FontColor, (Brush)tr.GetPropertyValue(TextElement.ForegroundProperty)))
-            );
-            tr.ApplyPropertyValue(TextElement.BackgroundProperty,
-                new SolidColorBrush(GetColorFromString(rule.BackgroundColor, (Brush)tr.GetPropertyValue(TextElement.BackgroundProperty)))
-            );
-            tr.ApplyPropertyValue(TextElement.FontStyleProperty, rule.Style);
-            tr.ApplyPropertyValue(TextElement.FontWeightProperty, rule.Weight);
-
-
-            if (MaxLines > 0)
-            {
-                lineCount++;
-                if (lineCount > MaxLines)
+                if (LogManager.ThrowExceptions)
                 {
-                    tr = new TextRange(rtbx.Document.ContentStart, rtbx.Document.ContentEnd);
-                    tr.Text.Remove(0, tr.Text.IndexOf('\n'));
-                    lineCount--;
+                    throw;
+                }
+            }
+            return false;
+        }
+
+        private RichTextBoxRowColoringRule FindMatchingRule(LogEventInfo logEvent)
+        {
+            //custom rules first
+            if (RowColoringRules.Count > 0)
+            {
+                foreach (RichTextBoxRowColoringRule coloringRule in RowColoringRules)
+                {
+                    if (coloringRule.CheckCondition(logEvent))
+                    {
+                        return coloringRule;
+                    }
                 }
             }
 
+            if (UseDefaultRowColoringRules && DefaultRowColoringRules != null)
+            {
+                foreach (RichTextBoxRowColoringRule coloringRule in DefaultRowColoringRules)
+                {
+                    if (coloringRule.CheckCondition(logEvent))
+                    {
+                        return coloringRule;
+                    }
+                }
+            }
+
+            return RichTextBoxRowColoringRule.Default;
+        }
+
+        private void SendTheMessageToRichTextBox(RichTextBox textBox, string logMessage, RichTextBoxRowColoringRule rule, LogEventInfo logEvent)
+        {
+            if (textBox == null) return;
+
+            var document = textBox.Document;
+
+            // 插入文本（带换行）
+            var tr = new TextRange(document.ContentEnd, document.ContentEnd)
+            {
+                Text = logMessage + Environment.NewLine
+            };
+
+            // 设置行级样式
+            var fgColor = rule.FontColor?.Render(logEvent);
+            var bgColor = rule.BackgroundColor?.Render(logEvent);
+
+            tr.ApplyPropertyValue(TextElement.ForegroundProperty,
+                string.IsNullOrEmpty(fgColor) || fgColor == "Empty"
+                    ? textBox.Foreground
+                    : new SolidColorBrush((Color)ColorConverter.ConvertFromString(fgColor)));
+
+            tr.ApplyPropertyValue(TextElement.BackgroundProperty,
+                string.IsNullOrEmpty(bgColor) || bgColor == "Empty"
+                    ? Brushes.Transparent
+                    : new SolidColorBrush((Color)ColorConverter.ConvertFromString(bgColor)));
+
+            tr.ApplyPropertyValue(TextElement.FontStyleProperty, rule.FontStyle);
+            tr.ApplyPropertyValue(TextElement.FontWeightProperty, rule.FontWeight);
+
+            // Word coloring（在刚插入的范围内做匹配）
+            if (WordColoringRules.Count > 0)
+            {
+                foreach (var wordRule in WordColoringRules)
+                {
+                    var pattern = wordRule.Regex?.Render(logEvent) ?? string.Empty;
+                    var text = wordRule.Text?.Render(logEvent) ?? string.Empty;
+                    var wholeWords = wordRule.WholeWords.RenderValue(logEvent);
+                    var ignoreCase = wordRule.IgnoreCase.RenderValue(logEvent);
+
+                    var regex = wordRule.ResolveRegEx(pattern, text, wholeWords, ignoreCase);
+                    var matches = regex.Matches(tr.Text);
+
+                    foreach (Match match in matches)
+                    {
+                        // 匹配到的部分范围
+                        var start = tr.Start.GetPositionAtOffset(match.Index, LogicalDirection.Forward);
+                        var endPos = tr.Start.GetPositionAtOffset(match.Index + match.Length, LogicalDirection.Backward);
+                        if (start == null || endPos == null) continue;
+
+                        var wordRange = new TextRange(start, endPos);
+
+                        var wordFg = wordRule.FontColor?.Render(logEvent);
+                        var wordBg = wordRule.BackgroundColor?.Render(logEvent);
+
+                        wordRange.ApplyPropertyValue(TextElement.ForegroundProperty,
+                            string.IsNullOrEmpty(wordFg) || wordFg == "Empty"
+                                ? tr.GetPropertyValue(TextElement.ForegroundProperty)
+                                : new SolidColorBrush((Color)ColorConverter.ConvertFromString(wordFg)));
+
+                        wordRange.ApplyPropertyValue(TextElement.BackgroundProperty,
+                            string.IsNullOrEmpty(wordBg) || wordBg == "Empty"
+                                ? tr.GetPropertyValue(TextElement.BackgroundProperty)
+                                : new SolidColorBrush((Color)ColorConverter.ConvertFromString(wordBg)));
+
+                        wordRange.ApplyPropertyValue(TextElement.FontStyleProperty, wordRule.FontStyle);
+                        wordRange.ApplyPropertyValue(TextElement.FontWeightProperty, wordRule.FontWeight);
+                    }
+                }
+            }
+
+            // 限制最大行数
+            if (MaxLines > 0)
+            {
+                while (document.Blocks.Count > MaxLines)
+                {
+                    document.Blocks.Remove(document.Blocks.FirstBlock);
+                }
+            }
+
+            // 自动滚动到最后
             if (AutoScroll)
             {
-                rtbx.ScrollToEnd();
+                textBox.ScrollToEnd();
             }
         }
     }
-}
+}

NLog.Windows.Wpf/RichTextBoxWordColoringRule.cs

@@ -1,119 +1,59 @@
-// 
-// Copyright (c) 2004-2011 Jaroslaw Kowalski <jaak@jkowalski.net>
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions 
-// are met:
-// 
-// * Redistributions of source code must retain the above copyright notice, 
-//   this list of conditions and the following disclaimer. 
-// 
-// * Redistributions in binary form must reproduce the above copyright notice,
-//   this list of conditions and the following disclaimer in the documentation
-//   and/or other materials provided with the distribution. 
-// 
-// * Neither the name of Jaroslaw Kowalski nor the names of its 
-//   contributors may be used to endorse or promote products derived from this
-//   software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-// THE POSSIBILITY OF SUCH DAMAGE.
-// 
-
+using NLog.Config;
+using NLog.Layouts;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
 using System.Windows;
-using NLog.Config;
 
 namespace NLog.Windows.Wpf
 {
-	[NLogConfigurationItem]
+    [NLogConfigurationItem]
     public class RichTextBoxWordColoringRule
     {
-        private Regex compiledRegex;
+        public Layout Regex { get; set; }
+        public Layout Text { get; set; }
+        public Layout<bool> WholeWords { get; set; }
+        public Layout<bool> IgnoreCase { get; set; }
 
-        public RichTextBoxWordColoringRule()
+        public Layout FontColor { get; set; }
+        public Layout BackgroundColor { get; set; }
+
+        public FontStyle FontStyle { get; set; }
+        public FontWeight FontWeight { get; set; }
+
+        internal Regex ResolveRegEx(string pattern, string text, bool wholeWords, bool ignoreCase)
         {
-            FontColor = "Empty";
-            BackgroundColor = "Empty";
+            if (string.IsNullOrEmpty(pattern) && text != null)
+            {
+                pattern = System.Text.RegularExpressions.Regex.Escape(text);
+                if (wholeWords)
+                    pattern = "\b" + pattern + "\b";
+            }
+
+            RegexOptions options = RegexOptions.None;
+            if (ignoreCase)
+                options |= RegexOptions.IgnoreCase;
+
+            return new Regex(pattern, options);   // RegEx-Cache
         }
 
+        public RichTextBoxWordColoringRule() : this(null, "Empty", "Empty", FontStyles.Normal, FontWeights.Normal) { }
+
         public RichTextBoxWordColoringRule(string text, string fontColor, string backgroundColor)
         {
-            Text = text;
-            FontColor = fontColor;
-            BackgroundColor = backgroundColor;
-            Style = FontStyles.Normal;
-            Weight = FontWeights.Normal;
+            this.Text = text;
+            this.FontColor = Layout.FromString(fontColor);
+            this.BackgroundColor = Layout.FromString(backgroundColor);
+            this.FontStyle = FontStyles.Normal;
+            this.FontWeight = FontWeights.Normal;
         }
 
         public RichTextBoxWordColoringRule(string text, string textColor, string backgroundColor, FontStyle fontStyle, FontWeight fontWeight)
         {
-            Text = text;
-            FontColor = textColor;
-            BackgroundColor = backgroundColor;
-            Style = fontStyle;
-            Weight = fontWeight;
+            this.Text = text;
+            this.FontColor = Layout.FromString(textColor);
+            this.BackgroundColor = Layout.FromString(backgroundColor);
+            this.FontStyle = fontStyle;
+            this.FontWeight = fontWeight;
         }
-
-        public string Regex { get; set; }
-
-        public string Text { get; set; }
-
-        [DefaultValue(false)]
-        public bool WholeWords { get; set; }
-
-        [DefaultValue(false)]
-        public bool IgnoreCase { get; set; }
-
-        public FontStyle Style { get; set; }
-
-        public FontWeight Weight { get; set; }
-
-        public Regex CompiledRegex
-        {
-            get
-            {
-                if (compiledRegex == null)
-                {
-                    string regexpression = Regex;
-                    if (regexpression == null && Text != null)
-                    {
-                        regexpression = System.Text.RegularExpressions.Regex.Escape(Text);
-                        if (WholeWords)
-                        {
-                            regexpression = "\b" + regexpression + "\b";
-                        }
-                    }
-
-                    RegexOptions regexOptions = RegexOptions.Compiled;
-                    if (IgnoreCase)
-                    {
-                        regexOptions |= RegexOptions.IgnoreCase;
-                    }
-
-                    compiledRegex = new Regex(regexpression, regexOptions);
-                }
-
-                return compiledRegex;
-            }
-        }
-
-        [DefaultValue("Empty")]
-        public string FontColor { get; set; }
-
-        [DefaultValue("Empty")]
-        public string BackgroundColor { get; set; }
     }
 }

README.en.md

@@ -8,28 +8,32 @@
 
 A simple and user-friendly Spine file viewer and exporter with multi-language support (Chinese/English/Japanese).
 
-![previewer](img/preview.webp)
+![previewer](https://github.com/user-attachments/assets/697ae86f-ddf0-445d-951c-cf04f5206e40)
+
+https://github.com/user-attachments/assets/37b6b730-088a-4352-827a-c338127a16f0
 
 ## Features
 
-* Supports multiple versions of Spine files.
-* Batch open files via drag-and-drop or copy-paste.
-* Batch preview functionality.
-* List-based multi-skeleton viewing and render order management.
-* Batch adjustment of skeleton parameters using multi-selection.
-* Multi-track animation settings.
-* Skin and custom slot attachment settings.
-* Custom slot visibility settings.
-* Debug rendering support.
-* View/model/track time scale adjustment.
-* Track alpha blending parameter settings.
-* Fullscreen preview mode.
-* Export to single frame/image sequence/animated GIF/video formats.
-* Automatic resolution batch export.
-* FFmpeg custom export support.
-* Program parameter saving.
-* File name extension association.
-* ...
+- Multiple versions of Spine files
+- Batch file opening via drag-and-drop or copy-paste
+- Batch preview
+- List-based multi-skeleton viewing and render order management
+- Multi-selection in lists for batch skeleton parameter settings
+- Multi-track animation settings
+- Skin and custom slot attachment settings
+- Custom slot visibility
+- Debug rendering
+- Playback speed adjustment for view/model/track timelines
+- Track alpha blending parameter settings
+- Fullscreen preview
+- Export to single frame, image sequence, animated GIF, or video file
+- Automatic resolution batch export
+- Custom export with FFmpeg
+- Program parameter saving
+- File extension association
+- Texture images in formats other than PNG
+- Launch at startup with persistent dynamic wallpaper
+- ......
 
 ### Supported Spine Versions
 
@@ -77,14 +81,14 @@ In the menu, go to "File" -> "Preferences..." -> "Language," select your desired
 
 The program is organized into a left-right layout:
 
-* **Left Panel:** Functionality panel.
-* **Right Panel:** Preview display.
+- **Left Panel:** Functionality panel.
+- **Right Panel:** Preview display.
 
 The left panel includes three sub-panels:
 
-* **Browse:** Preview the content of a specified folder without importing files into the program. This panel allows generating `.webp` previews for models or importing selected models.
-* **Model:** Lists imported models for rendering. Parameters and rendering order can be adjusted here, along with other model-related functionalities.
-* **Display:** Adjust parameters for the right-side preview display.
+- **Browse:** Preview the content of a specified folder without importing files into the program. This panel allows generating `.webp` previews for models or importing selected models.
+- **Model:** Lists imported models for rendering. Parameters and rendering order can be adjusted here, along with other model-related functionalities.
+- **Display:** Adjust parameters for the right-side preview display.
 
 Hover your mouse over buttons, labels, or input fields to see help text for most UI elements.
 
@@ -100,10 +104,10 @@ The Model panel supports right-click menus, some shortcuts, and batch adjustment
 
 For preview display adjustments:
 
-* **Left-click:** Select and drag models. Hold `Ctrl` for multi-selection, synchronized with the left-side list.
-* **Right-click:** Drag the entire display.
-* **Scroll wheel:** Zoom in/out. Hold `Ctrl` to scale selected models.
-* **Render selected-only mode:** In this mode, the preview only shows selected models, and selection status can only be changed via the left-side list.
+- **Left-click:** Select and drag models. Hold `Ctrl` for multi-selection, synchronized with the left-side list.
+- **Right-click:** Drag the entire display.
+- **Scroll wheel:** Zoom in/out. Hold `Ctrl` to scale selected models.
+- **Render selected-only mode:** In this mode, the preview only shows selected models, and selection status can only be changed via the left-side list.
 
 The buttons below the preview display allow time adjustments, serving as a simple playback control.
 
@@ -115,9 +119,17 @@ Use the right-click menu in the Model panel to export selected items.
 
 Key export parameters include:
 
-* **Output folder:** Optional. When not specified, output is saved to the respective model folder; otherwise, all output is saved to the provided folder.
-* **Export single:** By default, each model is exported independently. Selecting "Export single" renders all selected models in a single frame, producing a unified output.
-* **Auto resolution:** Ignores the preview resolution and viewport parameters, exporting output at the actual size of the content. For animations/videos, the output matches the size required for full visibility.
+- **Output folder:** Optional. When not specified, output is saved to the respective model folder; otherwise, all output is saved to the provided folder.
+- **Export single:** By default, each model is exported independently. Selecting "Export single" renders all selected models in a single frame, producing a unified output.
+- **Auto resolution:** Ignores the preview resolution and viewport parameters, exporting output at the actual size of the content. For animations/videos, the output matches the size required for full visibility.
+
+### Dynamic Wallpaper
+
+Dynamic wallpaper is implemented through desktop projection, allowing the content of the current preview to be projected onto the desktop in real time.
+
+You can enable or disable desktop projection from the program preferences or the right-click menu of the tray icon. After adjusting the model and display parameters, you can save the current configuration as a workspace file for convenient restoration later.
+
+If you want the wallpaper to stay active after startup, you can enable auto-start in the preferences and specify which workspace file should be loaded when the program launches.
 
 ### More Information
 
@@ -125,12 +137,12 @@ For detailed usage and documentation, see the [Wiki](https://github.com/ww-rm/Sp
 
 ## Acknowledgements
 
-* [spine-runtimes](https://github.com/EsotericSoftware/spine-runtimes)
-* [SFML.Net](https://github.com/SFML/SFML.Net)
-* [FFMpegCore](https://github.com/rosenbjerg/FFMpegCore)
-* [HandyControl](https://github.com/HandyOrg/HandyControl)
-* [NLog](https://github.com/NLog/NLog)
-* [SkiaSharp](https://github.com/mono/SkiaSharp)
+- [spine-runtimes](https://github.com/EsotericSoftware/spine-runtimes)
+- [SFML.Net](https://github.com/SFML/SFML.Net)
+- [FFMpegCore](https://github.com/rosenbjerg/FFMpegCore)
+- [HandyControl](https://github.com/HandyOrg/HandyControl)
+- [NLog](https://github.com/NLog/NLog)
+- [SkiaSharp](https://github.com/mono/SkiaSharp)
 
 ---
 

README.md

@@ -4,11 +4,15 @@
 [![GitHub Release](https://img.shields.io/github/v/release/ww-rm/SpineViewer?logo=github&logoColor=959da5&label=Release&labelColor=3f4850)](https://github.com/ww-rm/SpineViewer/releases)
 [![Downloads](https://img.shields.io/github/downloads/ww-rm/SpineViewer/total?logo=github&logoColor=959da5&label=Downloads&labelColor=3f4850)](https://github.com/ww-rm/SpineViewer/releases)
 
+![Languages](https://img.shields.io/badge/Languages-中文%20%7C%20English%20%7C%20日本語-blue)
+
 [中文](README.md) | [English](README.en.md)
 
-一个简单好用的 Spine 文件查看&导出程序, 支持中/英/日多语言界面.
+Spine 文件查看&导出程序, 同时也是支持 Spine 的动态壁纸程序.
 
-![previewer](img/preview.webp)
+![previewer](https://github.com/user-attachments/assets/697ae86f-ddf0-445d-951c-cf04f5206e40)
+
+https://github.com/user-attachments/assets/37b6b730-088a-4352-827a-c338127a16f0
 
 ## 功能
 
@@ -29,6 +33,8 @@
 - 支持 FFmpeg 自定义导出
 - 支持程序参数保存
 - 支持文件后缀关联
+- 支持非 png 格式的纹理图片格式
+- 支持开机自启常驻动态壁纸
 - ......
 
 ### Spine 版本支持
@@ -116,6 +122,14 @@
 - 导出单个. 默认是每个模型独立导出, 即对模型列表进行批量操作, 如果选择仅导出单个, 那么被导出的所有模型将在同一个画面上被渲染, 输出产物只有一份.
 - 自动分辨率. 该模式会忽略预览画面的分辨率和视区参数, 导出产物的分辨率与被导出内容的实际大小一致, 如果是动图或者视频则会与完整显示动画的必需大小一致.
 
+### 动态壁纸
+
+动态壁纸通过桌面投影实现, 可以将当前预览画面上的内容实时投影至桌面.
+
+在程序首选项或者托盘图标右键菜单中可以进行桌面投影的启用与否, 模型和画面参数调整完成后, 可以将当前参数保存为工作区文件, 方便之后恢复该配置.
+
+如果希望开机自启常驻壁纸, 也可以在首选项中启用开机自启, 并且设置启动后需要加载的工作区文件.
+
 ### 更多
 
 更为详细的使用方法和说明见 [Wiki](https://github.com/ww-rm/SpineViewer/wiki), 有使用上的问题或者 BUG 可以提个 [Issue](https://github.com/ww-rm/SpineViewer/issues).

SFMLRenderer/SFMLHwndHost.cs

@@ -64,10 +64,10 @@ namespace SFMLRenderer
             hs?.Dispose();
         }
 
-        private nint HwndMessageHook(nint hwnd, int msg, nint wParam, nint lParam, ref bool handled)
+        private IntPtr HwndMessageHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             _renderWindow?.DispatchEvents();
-            return nint.Zero;
+            return IntPtr.Zero;
         }
     }
 }

SFMLRenderer/SFMLRenderPanel.xaml.cs

@@ -240,8 +240,8 @@ namespace SFMLRenderer
             if (RenderWindow is null) return;
             float parentW = (float)sizeInfo.NewSize.Width;
             float parentH = (float)sizeInfo.NewSize.Height;
-            float renderW = (float)_hwndHost.ActualWidth;
-            float renderH = (float)_hwndHost.ActualHeight;
+            float renderW = _resolution.X;
+            float renderH = _resolution.Y;
             float scale = Math.Min(parentW / renderW, parentH / renderH); // 两方向取较小值, 保证 parent 覆盖 render
             renderW *= scale;
             renderH *= scale;

SFMLRenderer/SFMLRenderWindow.cs

@@ -0,0 +1,171 @@
+using SFML.Graphics;
+using SFML.System;
+using SFML.Window;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Threading;
+
+namespace SFMLRenderer
+{
+    public class SFMLRenderWindow : RenderWindow, ISFMLRenderer
+    {
+        private readonly DispatcherTimer _timer = new() { Interval = TimeSpan.FromMilliseconds(10) };
+
+        public SFMLRenderWindow(VideoMode mode, string title, Styles style) : base(mode, title, style) 
+        {
+            SetActive(false);
+            _timer.Tick += (s, e) => DispatchEvents();
+            _timer.Start();
+            RendererCreated?.Invoke(this, EventArgs.Empty);
+        }
+
+        public event EventHandler? RendererCreated;
+
+        public event EventHandler? RendererDisposing
+        {
+            add => throw new NotImplementedException();
+            remove => throw new NotImplementedException();
+        }
+
+        public event EventHandler<MouseMoveEventArgs>? CanvasMouseMove
+        {
+            add { MouseMoved += value; }
+            remove { MouseMoved -= value; }
+        }
+
+        public event EventHandler<MouseButtonEventArgs>? CanvasMouseButtonPressed
+        {
+            add { MouseButtonPressed += value; }
+            remove { MouseButtonPressed -= value; }
+        }
+
+        public event EventHandler<MouseButtonEventArgs>? CanvasMouseButtonReleased
+        {
+            add { MouseButtonReleased += value; }
+            remove { MouseButtonReleased -= value; }
+        }
+
+        public event EventHandler<MouseWheelScrollEventArgs>? CanvasMouseWheelScrolled
+        {
+            add { MouseWheelScrolled += value; }
+            remove { MouseWheelScrolled -= value; }
+        }
+
+        public Vector2u Resolution
+        { 
+            get => Size; 
+            set => Size = value; 
+        }
+
+        public Vector2f Center
+        {
+            get
+            {
+                using var view = GetView();
+                return view.Center;
+            }
+            set
+            {
+                using var view = GetView();
+                view.Center = value;
+                SetView(view);
+            }
+        }
+
+        public float Zoom
+        {
+            get
+            {
+                using var view = GetView();
+                return Math.Abs(Size.X / view.Size.X); // XXX: 仅使用宽度进行缩放计算
+            }
+            set
+            {
+                value = Math.Abs(value);
+                if (value <= 0) return;
+                using var view = GetView();
+                var signX = Math.Sign(view.Size.X);
+                var signY = Math.Sign(view.Size.Y);
+                var resolution = Size;
+                view.Size = new(resolution.X / value * signX, resolution.Y / value * signY);
+                SetView(view);
+            }
+        }
+
+        public float Rotation
+        {
+            get
+            {
+                using var view = GetView();
+                return view.Rotation;
+            }
+            set
+            {
+                using var view = GetView();
+                view.Rotation = value;
+                SetView(view);
+            }
+        }
+
+        public bool FlipX
+        {
+            get
+            {
+                using var view = GetView();
+                return view.Size.X < 0;
+            }
+            set
+            {
+                using var view = GetView();
+                var size = view.Size;
+                if (size.X > 0 && value || size.X < 0 && !value)
+                    size.X *= -1;
+                view.Size = size;
+                SetView(view);
+            }
+        }
+
+        public bool FlipY
+        {
+            get
+            {
+                using var view = GetView();
+                return view.Size.Y < 0;
+            }
+            set
+            {
+                using var view = GetView();
+                var size = view.Size;
+                if (size.Y > 0 && value || size.Y < 0 && !value)
+                    size.Y *= -1;
+                view.Size = size;
+                SetView(view);
+            }
+        }
+
+        public uint MaxFps
+        {
+            get => _maxFps;
+            set
+            {
+                SetFramerateLimit(value);
+                _maxFps = value;
+            }
+        }
+        private uint _maxFps = 0;
+
+        public bool VerticalSync
+        {
+            get => _verticalSync;
+            set
+            {
+                SetVerticalSyncEnabled(value);
+                _verticalSync = value;
+            }
+        }
+        private bool _verticalSync = false;
+    }
+}

SFMLRenderer/SFMLRenderer.csproj

@@ -7,7 +7,7 @@
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.15.4</Version>
+        <Version>0.16.6</Version>
         <UseWPF>true</UseWPF>
     </PropertyGroup>
 

Spine/Exporters/FFmpegVideoExporter.cs

@@ -28,6 +28,7 @@ namespace Spine.Exporters
         {
             Gif,
             Webp,
+            Apng,
             Mp4,
             Webm,
             Mkv,
@@ -41,31 +42,37 @@ namespace Spine.Exporters
         private VideoFormat _format = VideoFormat.Mp4;
 
         /// <summary>
-        /// 动图是否循环 [Gif/Webp]
+        /// [Gif/Webp/Apng] 动图是否循环
         /// </summary>
         public bool Loop { get => _loop; set => _loop = value; }
         private bool _loop = true;
 
         /// <summary>
-        /// 质量 [Webp]
+        /// [Webp] 质量
         /// </summary>
         public int Quality { get => _quality; set => _quality = Math.Clamp(value, 0, 100); }
         private int _quality = 75;
 
         /// <summary>
-        /// 无损压缩 [Webp]
+        /// [Webp] 无损压缩
         /// </summary>
         public bool Lossless { get => _lossless; set => _lossless = value; }
         private bool _lossless = false;
 
         /// <summary>
-        /// CRF [Mp4/Webm/Mkv]
+        /// [Apng] 预测器算法, 取值范围 0-5, 分别对应 none, sub, up, avg, paeth, mixed
+        /// </summary>
+        public int ApngPred { get => _apngPred; set => _apngPred = Math.Clamp(value, 0, 5); }
+        private int _apngPred = 5;
+
+        /// <summary>
+        /// [Mp4/Webm/Mkv] CRF
         /// </summary>
         public int Crf { get => _crf; set => _crf = Math.Clamp(value, 0, 63); }
         private int _crf = 23;
 
         /// <summary>
-        /// prores_ks 编码器的配置等级, -1 是自动, 越高质量越好, 只有 4 及以上才有透明通道 [Mov]
+        /// [Mov] prores_ks 编码器的配置等级, -1 是自动, 越高质量越好, 只有 4 及以上才有透明通道
         /// </summary>
         public int Profile { get => _profile; set => _profile = Math.Clamp(value, -1, 5); }
         private int _profile = 5;
@@ -93,6 +100,7 @@ namespace Spine.Exporters
             {
                 VideoFormat.Gif => SetGifOptions,
                 VideoFormat.Webp => SetWebpOptions,
+                VideoFormat.Apng => SetApngOptions,
                 VideoFormat.Mp4 => SetMp4Options,
                 VideoFormat.Webm => SetWebmOptions,
                 VideoFormat.Mkv => SetMkvOptions,
@@ -132,6 +140,13 @@ namespace Spine.Exporters
                 .WithCustomArgument(customArgs);
         }
 
+        private void SetApngOptions(FFMpegArgumentOptions options)
+        {
+            var customArgs = $"-vf unpremultiply=inplace=1 -plays {(_loop ? 0 : 1)} -pred {_apngPred}";
+            options.ForceFormat("apng").WithVideoCodec("apng").ForcePixelFormat("rgba")
+                .WithCustomArgument(customArgs);
+        }
+
         private void SetMp4Options(FFMpegArgumentOptions options)
         {
             // XXX: windows 默认播放器在播放 MP4 格式时对于 libx264 编码器只支持 yuv420p 的像素格式

Spine/Implementations/TextureLoader.cs

@@ -1,10 +1,13 @@
-using System;
+using NLog;
+using SFML.Graphics;
+using SkiaSharp;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Spine.SpineWrappers
+namespace Spine.Implementations
 {
     /// <summary>
     /// 实现不同版本的 TextureLoader
@@ -20,6 +23,8 @@ namespace Spine.SpineWrappers
         SpineRuntime41.TextureLoader,
         SpineRuntime42.TextureLoader
     {
+        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+
         /// <summary>
         /// 默认的全局纹理加载器
         /// </summary>
@@ -40,37 +45,38 @@ namespace Spine.SpineWrappers
         /// </summary>
         public bool ForceMipmap { get; set; }
 
-        private SFML.Graphics.Texture ReadTexture(string path)
+        private Texture ReadTexture(string path)
         {
-            if (ForcePremul)
+            if (!File.Exists(path))
             {
-                using var image = new SFML.Graphics.Image(path);
-                var width = image.Size.X;
-                var height = image.Size.Y;
-                var pixels = image.Pixels;
-                var size = width * height * 4;
-                for (int i = 0; i < size; i += 4)
-                {
-                    byte a = pixels[i + 3];
-                    if (a == 0)
-                    {
-                        pixels[i + 0] = 0;
-                        pixels[i + 1] = 0;
-                        pixels[i + 2] = 0;
-                    }
-                    else if (a != 255)
-                    {
-                        float f = a / 255f;
-                        pixels[i + 0] = (byte)(pixels[i + 0] * f);
-                        pixels[i + 1] = (byte)(pixels[i + 1] * f);
-                        pixels[i + 2] = (byte)(pixels[i + 2] * f);
-                    }
-                }
-                var tex = new SFML.Graphics.Texture(width, height);
-                tex.Update(pixels);
-                return tex;
+                _logger.Error($"Texture file not found, {path}");
+                throw new FileNotFoundException("Texture file not found", path);
             }
-            return new(path);
+
+            using var codec = SKCodec.Create(path, out var result);
+            if (codec is null || result != SKCodecResult.Success)
+            {
+                _logger.Error($"Failed to create codec '{path}', {result}");
+                throw new InvalidOperationException($"Failed to create codec '{path}', {result}");
+            }
+
+            var width = codec.Info.Width;
+            var height = codec.Info.Height;
+
+            // 判断是否需要强制预乘
+            var alphaType = ForcePremul ? SKAlphaType.Premul : SKAlphaType.Unpremul;
+            var info = new SKImageInfo(width, height, SKColorType.Rgba8888, alphaType);
+
+            result = codec.GetPixels(info, out var pixels);
+            if (result != SKCodecResult.Success)
+            {
+                _logger.Error($"Failed to decode image '{path}', {result}");
+                throw new InvalidOperationException($"Failed to decode image '{path}', {result}");
+            }
+
+            Texture tex = new((uint)width, (uint)height);
+            tex.Update(pixels);
+            return tex;
         }
 
         public virtual void Load(SpineRuntime21.AtlasPage page, string path)
@@ -106,6 +112,14 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime34.AtlasPage page, string path)
@@ -141,6 +155,14 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime35.AtlasPage page, string path)
@@ -176,6 +198,14 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime36.AtlasPage page, string path)
@@ -211,6 +241,14 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime37.AtlasPage page, string path)
@@ -246,6 +284,14 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime38.AtlasPage page, string path)
@@ -282,9 +328,13 @@ namespace Spine.SpineWrappers
 
             page.rendererObject = texture;
 
-            // 似乎是不需要设置的, 因为存在某些 png 和 atlas 大小不同的情况, 一般是有一些缩放, 如果设置了反而渲染异常
-            // page.width = (int)texture.Size.X;
-            // page.height = (int)texture.Size.Y;
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime40.AtlasPage page, string path)
@@ -320,6 +370,14 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime41.AtlasPage page, string path)
@@ -355,6 +413,14 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Load(SpineRuntime42.AtlasPage page, string path)
@@ -390,11 +456,19 @@ namespace Spine.SpineWrappers
             if (ForceMipmap) texture.GenerateMipmap();
 
             page.rendererObject = texture;
+
+            // 有些旧的 atlas 会省略 size 行, 这时需要在读取纹理时赋值
+            if (page.width <= 0 || page.height <= 0)
+            {
+                var texSize = texture.Size;
+                page.width = (int)texSize.X;
+                page.height = (int)texSize.Y;
+            }
         }
 
         public virtual void Unload(object texture)
         {
-            ((SFML.Graphics.Texture)texture).Dispose();
+            ((Texture)texture).Dispose();
         }
     }
 }

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
     {
@@ -52,6 +52,7 @@ namespace Spine.Implementations.SpineWrappers.V21
 
         public Skeleton InnerObject => _o;
 
+        public string Name => _o.Data.Name;
         public float R { get => _o.R; set => _o.R = value; }
         public float G { get => _o.G; set => _o.G = value; }
         public float B { get => _o.B; set => _o.B = value; }
@@ -95,11 +96,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
     {
@@ -52,6 +52,7 @@ namespace Spine.Implementations.SpineWrappers.V34
 
         public Skeleton InnerObject => _o;
 
+        public string Name => _o.Data.Name;
         public float R { get => _o.R; set => _o.R = value; }
         public float G { get => _o.G; set => _o.G = value; }
         public float B { get => _o.B; set => _o.B = value; }
@@ -95,12 +96,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
     {
@@ -52,6 +52,7 @@ namespace Spine.Implementations.SpineWrappers.V35
 
         public Skeleton InnerObject => _o;
 
+        public string Name => _o.Data.Name;
         public float R { get => _o.R; set => _o.R = value; }
         public float G { get => _o.G; set => _o.G = value; }
         public float B { get => _o.B; set => _o.B = value; }
@@ -95,12 +96,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
     {
@@ -52,6 +52,7 @@ namespace Spine.Implementations.SpineWrappers.V36
 
         public Skeleton InnerObject => _o;
 
+        public string Name => _o.Data.Name;
         public float R { get => _o.R; set => _o.R = value; }
         public float G { get => _o.G; set => _o.G = value; }
         public float B { get => _o.B; set => _o.B = value; }
@@ -95,12 +96,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
     {
@@ -52,6 +52,7 @@ namespace Spine.Implementations.SpineWrappers.V37
 
         public Skeleton InnerObject => _o;
 
+        public string Name => _o.Data.Name;
         public float R { get => _o.R; set => _o.R = value; }
         public float G { get => _o.G; set => _o.G = value; }
         public float B { get => _o.B; set => _o.B = value; }
@@ -95,12 +96,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
     {