Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## v0.16.19

- 修复模型参数应用错误
- 修复可能的壁纸嵌入失败

## v0.16.18

- 优化 PSD 文件大小
Expand Down
2 changes: 1 addition & 1 deletion Spine/Spine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
<OutputPath>$(BaseOutputPath)\$(Configuration)\$(PlatformTarget)</OutputPath>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<Version>0.16.18</Version>
<Version>0.16.19</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions SpineViewer/Models/SpineObjectModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion SpineViewer/Natives/User32.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
// .....
Expand Down
2 changes: 1 addition & 1 deletion SpineViewer/SpineViewer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
<OutputPath>$(BaseOutputPath)\$(Configuration)\$(PlatformTarget)</OutputPath>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<Version>0.16.18</Version>
<Version>0.16.19</Version>
<OutputType>WinExe</OutputType>
<UseWPF>true</UseWPF>
</PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions SpineViewer/Utils/WorkerWDebugger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
// .....
Expand Down
2 changes: 1 addition & 1 deletion SpineViewerCLI/SpineViewerCLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
<OutputPath>$(BaseOutputPath)\$(Configuration)\$(PlatformTarget)</OutputPath>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<Version>0.16.18</Version>
<Version>0.16.19</Version>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
Loading