Merge pull request #48 from ww-rm/dev/wf

Release v0.12.16

.github/workflows/dotnet-desktop.yml

@@ -1,46 +1,80 @@
 name: Build & Release
 
 on:
-  push:
+  pull_request:
-    tags:
+    branches:
-      - 'v*.*.*'
+      - release/wf
+    types:
+      - closed
 
 jobs:
   build-release:
+    if: ${{ github.event.pull_request.merged == true }}
     runs-on: windows-latest
     env:
       PROJECT_NAME: SpineViewer
-      VERSION: ${{ github.ref_name }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      
+        with:
+          fetch-tags: true
+
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: "8.0.x"
+
+      - name: Extract version from csproj
+        shell: pwsh
+        run: |
+          [xml]$proj = Get-Content "$env:PROJECT_NAME\$env:PROJECT_NAME.csproj"
+          $VERSION_NUM = $proj.Project.PropertyGroup.Version
+          $VERSION_TAG = "v$VERSION_NUM"
+          "VERSION=$VERSION_TAG" >> $env:GITHUB_ENV
+
+      - name: Check Version Tag
+        shell: pwsh
+        run: |
+          if (-not $env:VERSION) {
+            Write-Error "Version tag not found in csproj file."
+            exit 1
+          }
+          Write-Host "Version tag found: $env:VERSION"
+
+      - name: Tag merge commit
+        shell: pwsh
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag $env:VERSION
+          git push --tags
 
       - name: Publish FrameworkDependent version
+        shell: pwsh
         run: |
-          dotnet publish ${{ env.PROJECT_NAME }}/${{ env.PROJECT_NAME }}.csproj -c Release -r win-x64 --sc false -p:PublishSingleFile=true -o publish/${{ env.PROJECT_NAME }}-${{ env.VERSION }}
+          dotnet publish "$env:PROJECT_NAME\$env:PROJECT_NAME.csproj" -c Release -r win-x64 --sc false -o "publish\$env:PROJECT_NAME-$env:VERSION"
-      
+
       - name: Publish SelfContained version
+        shell: pwsh
         run: |
-          dotnet publish ${{ env.PROJECT_NAME }}/${{ env.PROJECT_NAME }}.csproj -c Release -r win-x64 --sc true -p:PublishSingleFile=true -o publish/${{ env.PROJECT_NAME }}-${{ env.VERSION }}-SelfContained
+          dotnet publish "$env:PROJECT_NAME\$env:PROJECT_NAME.csproj" -c Release -r win-x64 --sc true -o "publish\$env:PROJECT_NAME-$env:VERSION-SelfContained"
-      
+
       - name: Create release directory
-        run: mkdir release
+        shell: pwsh
-      
+        run: |
+          New-Item -ItemType Directory -Path release -Force | Out-Null
+
       - name: Compress FrameworkDependent version
         shell: pwsh
         run: |
-          Compress-Archive -Path "publish/${env:PROJECT_NAME}-${env:VERSION}" -DestinationPath "release/${env:PROJECT_NAME}-${env:VERSION}.zip" -Force
+          Compress-Archive -Path "publish\$env:PROJECT_NAME-$env:VERSION\*" -DestinationPath "release\$env:PROJECT_NAME-$env:VERSION.zip" -Force
-      
+
       - name: Compress SelfContained version
         shell: pwsh
         run: |
-          Compress-Archive -Path "publish/${env:PROJECT_NAME}-${env:VERSION}-SelfContained" -DestinationPath "release/${env:PROJECT_NAME}-${env:VERSION}-SelfContained.zip" -Force
+          Compress-Archive -Path "publish\$env:PROJECT_NAME-$env:VERSION-SelfContained\*" -DestinationPath "release\$env:PROJECT_NAME-$env:VERSION-SelfContained.zip" -Force
-      
+
       - name: Create GitHub Release
         id: create_release
         uses: actions/create-release@v1
@@ -51,7 +85,7 @@ jobs:
           release_name: Release ${{ env.VERSION }}
           draft: false
           prerelease: false
-      
+
       - name: Upload FrameworkDependent zip
         uses: actions/upload-release-asset@v1
         env:
@@ -61,7 +95,7 @@ jobs:
           asset_path: release/${{ env.PROJECT_NAME }}-${{ env.VERSION }}.zip
           asset_name: ${{ env.PROJECT_NAME }}-${{ env.VERSION }}.zip
           asset_content_type: application/zip
-      
+
       - name: Upload SelfContained zip
         uses: actions/upload-release-asset@v1
         env:

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v0.12.15
+
+- 修复附件类型枚举量字符串大小写问题
+
+## v0.12.14
+
+- 修复 v38 文件读取的小 bug
+
 ## v0.12.13
 
 - 导出文件名增加额外的随机字符串

SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter38.cs

@@ -51,6 +51,17 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
             [RotateMode.ChainScale] = "chainScale",
         };
 
+        private static readonly Dictionary<AttachmentType, string> AttachmentTypeJsonValue = new()
+        {
+            [AttachmentType.Region] = "region",
+            [AttachmentType.Boundingbox] = "bounding",
+            [AttachmentType.Mesh] = "mesh",
+            [AttachmentType.Linkedmesh] = "linkedmesh",
+            [AttachmentType.Path] = "path",
+            [AttachmentType.Point] = "point",
+            [AttachmentType.Clipping] = "clipping",
+        };
+
         private BinaryReader reader = null;
         private JsonObject root = null;
         private bool nonessential = false;
@@ -298,7 +309,7 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
             var name = reader.ReadStringRef() ?? keyName;
             var type = (AttachmentType)reader.ReadByte();
             attachment["name"] = name;
-            attachment["type"] = type.ToString();
+            attachment["type"] = AttachmentTypeJsonValue[type];
             switch (type)
             {
                 case AttachmentType.Region:
@@ -586,7 +597,7 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
                         ["compress"] = reader.ReadBoolean(),
                         ["stretch"] = reader.ReadBoolean(),
                     };
-                    if (frameCount > 1) ReadCurve(o);
+                    if (frameIdx < frameCount - 1) ReadCurve(o);
                     frames.Add(o);
                 }
             }
@@ -613,7 +624,7 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
                         ["scaleMix"] = reader.ReadFloat(),
                         ["shearMix"] = reader.ReadFloat(),
                     };
-                    if (frameCount > 1) ReadCurve(o);
+                    if (frameIdx < frameCount - 1) ReadCurve(o);
                     frames.Add(o);
                 }
             }

SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter41.cs

@@ -52,9 +52,9 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
         private static readonly Dictionary<AttachmentType, string> AttachmentTypeJsonValue = new()
         {
             [AttachmentType.Region] = "region",
-            [AttachmentType.Boundingbox] = "boundingBox",
+            [AttachmentType.Boundingbox] = "boundingbox",
             [AttachmentType.Mesh] = "mesh",
-            [AttachmentType.Linkedmesh] = "linkedMesh",
+            [AttachmentType.Linkedmesh] = "linkedmesh",
             [AttachmentType.Path] = "path",
             [AttachmentType.Point] = "point",
             [AttachmentType.Clipping] = "clipping",

SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter42.cs

@@ -52,7 +52,7 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
             [AttachmentType.Region] = "region",
             [AttachmentType.Boundingbox] = "bounding",
             [AttachmentType.Mesh] = "mesh",
-            [AttachmentType.Linkedmesh] = "linkedMesh",
+            [AttachmentType.Linkedmesh] = "linkedmesh",
             [AttachmentType.Path] = "path",
             [AttachmentType.Point] = "point",
             [AttachmentType.Clipping] = "clipping",

SpineViewer/Spine/SpineExporter/VideoExporter.cs

@@ -30,15 +30,6 @@ namespace SpineViewer.Spine.SpineExporter
         /// </summary>
         public bool KeepLast { get; set; } = true;
 
-        public override string? Validate()
-        {
-            if (base.Validate() is string error)
-                return error;
-            if (IsExportSingle && Duration < 0)
-                return Properties.Resources.negativeDuration;
-            return null;
-        }
-
         /// <summary>
         /// 生成单个模型的帧序列
         /// </summary>
@@ -93,8 +84,16 @@ namespace SpineViewer.Spine.SpineExporter
         /// </summary>
         protected IEnumerable<SFMLImageVideoFrame> GetFrames(SpineObject[] spinesToRender, BackgroundWorker? worker = null)
         {
-            // 导出单个时必须根据 Duration 决定导出时长
+            // 导出单个时取所有模型的所有轨道时长最大值
             var duration = Duration;
+            if (duration < 0)
+            {
+                duration = spinesToRender.Select(
+                    sp => sp.GetTrackIndices().Select(
+                        i => sp.GetAnimationDuration(sp.GetAnimation(i))
+                    ).DefaultIfEmpty(0).Max()
+                ).Max();
+            }
 
             float delta = 1f / FPS;
             int total = (int)(duration * FPS); // 完整帧的数量

SpineViewer/SpineViewer.csproj

@@ -7,7 +7,7 @@
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.12.13</Version>
+        <Version>0.12.16</Version>
         <OutputType>WinExe</OutputType>
         <UseWindowsForms>true</UseWindowsForms>
         <ApplicationIcon>appicon.ico</ApplicationIcon>