diff --git a/CHANGELOG.md b/CHANGELOG.md index 44467c5..000c187 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## v0.16.19 + +- 修复模型参数应用错误 +- 修复可能的壁纸嵌入失败 + ## v0.16.18 - 优化 PSD 文件大小 diff --git a/Spine/Spine.csproj b/Spine/Spine.csproj index 287a665..ba5ccf7 100644 --- a/Spine/Spine.csproj +++ b/Spine/Spine.csproj @@ -11,7 +11,7 @@ $(SolutionDir)out $(BaseOutputPath)\$(Configuration)\$(PlatformTarget) false - 0.16.18 + 0.16.19 diff --git a/SpineViewer/Models/SpineObjectModel.cs b/SpineViewer/Models/SpineObjectModel.cs index 5f5906c..930fcdc 100644 --- a/SpineViewer/Models/SpineObjectModel.cs +++ b/SpineViewer/Models/SpineObjectModel.cs @@ -503,13 +503,13 @@ public void ApplyObjectConfig(SpineObjectConfigModel m, SpineObjectConfigApplyFl _spineObject.SetSkinStatus(name, true); } - if (flag == SpineObjectConfigApplyFlag.SlotAttachement) + if (flag == SpineObjectConfigApplyFlag.All || flag == SpineObjectConfigApplyFlag.SlotAttachement) { foreach (var (slotName, attachmentName) in m.SlotAttachment) _spineObject.SetAttachment(slotName, attachmentName); } - if (flag == SpineObjectConfigApplyFlag.SlotVisibility) + if (flag == SpineObjectConfigApplyFlag.All || flag == SpineObjectConfigApplyFlag.SlotVisibility) { foreach (var slotName in m.DisabledSlots) _spineObject.SetSlotVisible(slotName, false); diff --git a/SpineViewer/Natives/User32.cs b/SpineViewer/Natives/User32.cs index c18723f..e453c79 100644 --- a/SpineViewer/Natives/User32.cs +++ b/SpineViewer/Natives/User32.cs @@ -292,7 +292,7 @@ public static nint GetWorkerW() // WorkerW behind the desktop icons. If it is already there, nothing // happens. SendMessageTimeout(progman, WM_SPAWN_WORKER, 0xD, 0x1, SMTO_NORMAL, 1000, out _); - SendMessageTimeout(progman, WM_SPAWN_WORKER, 0xD, 0x0, SMTO_NORMAL, 1000, out _); + //SendMessageTimeout(progman, WM_SPAWN_WORKER, 0xD, 0x0, SMTO_NORMAL, 1000, out _); // Spy++ output // ..... diff --git a/SpineViewer/SpineViewer.csproj b/SpineViewer/SpineViewer.csproj index 8f62c2d..362aefe 100644 --- a/SpineViewer/SpineViewer.csproj +++ b/SpineViewer/SpineViewer.csproj @@ -11,7 +11,7 @@ $(SolutionDir)out $(BaseOutputPath)\$(Configuration)\$(PlatformTarget) false - 0.16.18 + 0.16.19 WinExe true diff --git a/SpineViewer/Utils/WorkerWDebugger.cs b/SpineViewer/Utils/WorkerWDebugger.cs index 3751fe8..eb7fca4 100644 --- a/SpineViewer/Utils/WorkerWDebugger.cs +++ b/SpineViewer/Utils/WorkerWDebugger.cs @@ -50,12 +50,12 @@ public static void LogWorkerWSearchInfo() _logger.Debug("SendMessageTimeout(lParam=1) returned 0x{0:x8}", ret); _logger.Debug("ErrCode: 0x{0:x8}, ErrMsg: {1}", lastErr, lastErrMsg); - Marshal.SetLastPInvokeError(0); - ret = User32.SendMessageTimeout(progman, User32.WM_SPAWN_WORKER, 0xD, 0x0, User32.SMTO_NORMAL, 1000, out _); - lastErr = Marshal.GetLastPInvokeError(); - lastErrMsg = Marshal.GetLastPInvokeErrorMessage(); - _logger.Debug("SendMessageTimeout(lParam=0) returned 0x{0:x8}", ret); - _logger.Debug("ErrCode: 0x{0:x8}, ErrMsg: {1}", lastErr, lastErrMsg); + //Marshal.SetLastPInvokeError(0); + //ret = User32.SendMessageTimeout(progman, User32.WM_SPAWN_WORKER, 0xD, 0x0, User32.SMTO_NORMAL, 1000, out _); + //lastErr = Marshal.GetLastPInvokeError(); + //lastErrMsg = Marshal.GetLastPInvokeErrorMessage(); + //_logger.Debug("SendMessageTimeout(lParam=0) returned 0x{0:x8}", ret); + //_logger.Debug("ErrCode: 0x{0:x8}, ErrMsg: {1}", lastErr, lastErrMsg); // Spy++ output // ..... diff --git a/SpineViewerCLI/SpineViewerCLI.csproj b/SpineViewerCLI/SpineViewerCLI.csproj index 04ef253..65af9ee 100644 --- a/SpineViewerCLI/SpineViewerCLI.csproj +++ b/SpineViewerCLI/SpineViewerCLI.csproj @@ -11,7 +11,7 @@ $(SolutionDir)out $(BaseOutputPath)\$(Configuration)\$(PlatformTarget) false - 0.16.18 + 0.16.19 Exe