更新至v0.10.5

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v0.10.5
+
+- <20>޸<EFBFBD>һЩ<D2BB><D0A9><EFBFBD><EFBFBD>
+
+## v0.10.4
+
+- <20>޸<EFBFBD>һЩ<D2BB><D0A9><EFBFBD><EFBFBD>
+
 ## v0.10.3
 
 - <20><><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD>

SpineRuntimes/SpineRuntime38/SkeletonBinary.cs

@@ -129,8 +129,8 @@ namespace SpineRuntime38 {
 			if (skeletonData.hash.Length == 0) skeletonData.hash = null;
 			skeletonData.version = input.ReadString();
 			if (skeletonData.version.Length == 0) skeletonData.version = null;
-			if ("3.8.75" == skeletonData.version)
-					throw new Exception("Unsupported skeleton data, please export with a newer version of Spine.");
+			//if ("3.8.75" == skeletonData.version)
+			//		throw new Exception("Unsupported skeleton data, please export with a newer version of Spine.");
 			skeletonData.x = input.ReadFloat();
 			skeletonData.y = input.ReadFloat();
 			skeletonData.width = input.ReadFloat();

SpineRuntimes/SpineRuntime38/SkeletonJson.cs

@@ -100,8 +100,8 @@ namespace SpineRuntime38 {
 				var skeletonMap = (Dictionary<string, Object>)root["skeleton"];
 				skeletonData.hash = (string)skeletonMap["hash"];
 				skeletonData.version = (string)skeletonMap["spine"];
-				if ("3.8.75" == skeletonData.version)
-					throw new Exception("Unsupported skeleton data, please export with a newer version of Spine.");
+				//if ("3.8.75" == skeletonData.version)
+				//	throw new Exception("Unsupported skeleton data, please export with a newer version of Spine.");
 				skeletonData.x = GetFloat(skeletonMap, "x", 0);
 				skeletonData.y = GetFloat(skeletonMap, "y", 0);
 				skeletonData.width = GetFloat(skeletonMap, "width", 0);

SpineViewer/Controls/SpineListView.Designer.cs

@@ -49,7 +49,7 @@
             toolStripSeparator4 = new ToolStripSeparator();
             toolStripMenuItem_ChangeView = new ToolStripMenuItem();
             toolStripMenuItem_LargeIconView = new ToolStripMenuItem();
-            toolStripMenuItem_SmallIconView = new ToolStripMenuItem();
+            toolStripMenuItem_ListView = new ToolStripMenuItem();
             toolStripMenuItem_DetailsView = new ToolStripMenuItem();
             imageList_LargeIcon = new ImageList(components);
             imageList_SmallIcon = new ImageList(components);
@@ -58,6 +58,7 @@
             // 
             // listView
             // 
+            listView.Alignment = ListViewAlignment.Left;
             listView.AllowDrop = true;
             listView.Columns.AddRange(new ColumnHeader[] { columnHeader_Name });
             listView.ContextMenuStrip = contextMenuStrip;
@@ -110,6 +111,7 @@
             // toolStripMenuItem_Remove
             // 
             toolStripMenuItem_Remove.Name = "toolStripMenuItem_Remove";
+            toolStripMenuItem_Remove.ShortcutKeys = Keys.Delete;
             toolStripMenuItem_Remove.Size = new Size(328, 30);
             toolStripMenuItem_Remove.Text = "移除";
             toolStripMenuItem_Remove.Click += toolStripMenuItem_Remove_Click;
@@ -198,7 +200,7 @@
             // 
             // toolStripMenuItem_ChangeView
             // 
-            toolStripMenuItem_ChangeView.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItem_LargeIconView, toolStripMenuItem_SmallIconView, toolStripMenuItem_DetailsView });
+            toolStripMenuItem_ChangeView.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItem_LargeIconView, toolStripMenuItem_ListView, toolStripMenuItem_DetailsView });
             toolStripMenuItem_ChangeView.Name = "toolStripMenuItem_ChangeView";
             toolStripMenuItem_ChangeView.Size = new Size(328, 30);
             toolStripMenuItem_ChangeView.Text = "切换视图";
@@ -207,24 +209,24 @@
             // 
             toolStripMenuItem_LargeIconView.Name = "toolStripMenuItem_LargeIconView";
             toolStripMenuItem_LargeIconView.ShortcutKeys = Keys.Alt | Keys.D1;
-            toolStripMenuItem_LargeIconView.Size = new Size(223, 34);
+            toolStripMenuItem_LargeIconView.Size = new Size(241, 34);
             toolStripMenuItem_LargeIconView.Text = "大图标";
             toolStripMenuItem_LargeIconView.Click += toolStripMenuItem_LargeIconView_Click;
             // 
-            // toolStripMenuItem_SmallIconView
+            // toolStripMenuItem_ListView
             // 
-            toolStripMenuItem_SmallIconView.Name = "toolStripMenuItem_SmallIconView";
-            toolStripMenuItem_SmallIconView.ShortcutKeys = Keys.Alt | Keys.D2;
-            toolStripMenuItem_SmallIconView.Size = new Size(223, 34);
-            toolStripMenuItem_SmallIconView.Text = "小图标";
-            toolStripMenuItem_SmallIconView.Click += toolStripMenuItem_SmallIconView_Click;
+            toolStripMenuItem_ListView.Name = "toolStripMenuItem_ListView";
+            toolStripMenuItem_ListView.ShortcutKeys = Keys.Alt | Keys.D2;
+            toolStripMenuItem_ListView.Size = new Size(241, 34);
+            toolStripMenuItem_ListView.Text = "列表";
+            toolStripMenuItem_ListView.Click += toolStripMenuItem_ListView_Click;
             // 
             // toolStripMenuItem_DetailsView
             // 
             toolStripMenuItem_DetailsView.Name = "toolStripMenuItem_DetailsView";
             toolStripMenuItem_DetailsView.ShortcutKeys = Keys.Alt | Keys.D3;
-            toolStripMenuItem_DetailsView.Size = new Size(223, 34);
-            toolStripMenuItem_DetailsView.Text = "列表";
+            toolStripMenuItem_DetailsView.Size = new Size(241, 34);
+            toolStripMenuItem_DetailsView.Text = "详细信息";
             toolStripMenuItem_DetailsView.Click += toolStripMenuItem_DetailsView_Click;
             // 
             // imageList_LargeIcon
@@ -268,7 +270,7 @@
         private ToolStripSeparator toolStripSeparator3;
         private ToolStripMenuItem toolStripMenuItem_ChangeView;
         private ToolStripMenuItem toolStripMenuItem_LargeIconView;
-        private ToolStripMenuItem toolStripMenuItem_SmallIconView;
+        private ToolStripMenuItem toolStripMenuItem_ListView;
         private ToolStripMenuItem toolStripMenuItem_DetailsView;
         private ToolStripMenuItem toolStripMenuItem_MoveTop;
         private ToolStripMenuItem toolStripMenuItem_MoveBottom;

SpineViewer/Controls/SpineListView.cs

@@ -106,6 +106,16 @@ namespace SpineViewer.Controls
                         spines[i].IsSelected = listView.SelectedIndices.Contains(i);
                 }
             }
+
+            // BUG: 图标显示的时候没法自动刷新顺序, 只能切换视图刷新, 不知道什么原理
+            listView.BeginUpdate();
+            var tmp = listView.View;
+            listView.View = View.List;
+            listView.View = tmp;
+            listView.EndUpdate();
+
+            if (listView.SelectedItems.Count > 0)
+                listView.SelectedItems[0].EnsureVisible();
         }
 
         private void listView_ItemDrag(object sender, ItemDragEventArgs e)
@@ -220,7 +230,7 @@ namespace SpineViewer.Controls
 
             // 视图选项
             toolStripMenuItem_LargeIconView.Checked = listView.View == View.LargeIcon;
-            toolStripMenuItem_SmallIconView.Checked = listView.View == View.SmallIcon;
+            toolStripMenuItem_ListView.Checked = listView.View == View.List;
             toolStripMenuItem_DetailsView.Checked = listView.View == View.Details;
         }
 
@@ -303,8 +313,10 @@ namespace SpineViewer.Controls
             {
                 lock (Spines) { (spines[index - 1], spines[index]) = (spines[index], spines[index - 1]); }
                 var item = listView.Items[index];
+                listView.BeginUpdate();
                 listView.Items.RemoveAt(index);
                 listView.Items.Insert(index - 1, item);
+                listView.EndUpdate();
             }
         }
 
@@ -318,8 +330,10 @@ namespace SpineViewer.Controls
             {
                 lock (Spines) { (spines[index], spines[index + 1]) = (spines[index + 1], spines[index]); }
                 var item = listView.Items[index];
+                listView.BeginUpdate();
                 listView.Items.RemoveAt(index);
                 listView.Items.Insert(index + 1, item);
+                listView.EndUpdate();
             }
         }
 
@@ -400,9 +414,9 @@ namespace SpineViewer.Controls
             listView.View = View.LargeIcon;
         }
 
-        private void toolStripMenuItem_SmallIconView_Click(object sender, EventArgs e)
+        private void toolStripMenuItem_ListView_Click(object sender, EventArgs e)
         {
-            listView.View = View.SmallIcon;
+            listView.View = View.List;
         }
 
         private void toolStripMenuItem_DetailsView_Click(object sender, EventArgs e)

SpineViewer/MainForm.Designer.cs

@@ -95,7 +95,7 @@
             menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem_File, toolStripMenuItem_Function, toolStripMenuItem_Tool, toolStripMenuItem_Download, toolStripMenuItem_Help });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(1741, 32);
+            menuStrip.Size = new Size(1748, 32);
             menuStrip.TabIndex = 0;
             menuStrip.Text = "菜单";
             // 
@@ -164,7 +164,7 @@
             // toolStripMenuItem_ResetAnimation
             // 
             toolStripMenuItem_ResetAnimation.Name = "toolStripMenuItem_ResetAnimation";
-            toolStripMenuItem_ResetAnimation.Size = new Size(270, 34);
+            toolStripMenuItem_ResetAnimation.Size = new Size(242, 34);
             toolStripMenuItem_ResetAnimation.Text = "重置动画时间(&R)";
             toolStripMenuItem_ResetAnimation.Click += toolStripMenuItem_ResetAnimation_Click;
             // 
@@ -232,7 +232,7 @@
             rtbLog.Margin = new Padding(3, 2, 3, 2);
             rtbLog.Name = "rtbLog";
             rtbLog.ReadOnly = true;
-            rtbLog.Size = new Size(1721, 106);
+            rtbLog.Size = new Size(1728, 114);
             rtbLog.TabIndex = 0;
             rtbLog.Text = "";
             rtbLog.WordWrap = false;
@@ -254,8 +254,8 @@
             // 
             splitContainer_MainForm.Panel2.Controls.Add(rtbLog);
             splitContainer_MainForm.Panel2.Cursor = Cursors.Default;
-            splitContainer_MainForm.Size = new Size(1721, 958);
-            splitContainer_MainForm.SplitterDistance = 848;
+            splitContainer_MainForm.Size = new Size(1728, 997);
+            splitContainer_MainForm.SplitterDistance = 879;
             splitContainer_MainForm.TabIndex = 3;
             splitContainer_MainForm.TabStop = false;
             splitContainer_MainForm.SplitterMoved += splitContainer_SplitterMoved;
@@ -277,8 +277,8 @@
             // 
             splitContainer_Functional.Panel2.Controls.Add(groupBox_Preview);
             splitContainer_Functional.Panel2.Cursor = Cursors.Default;
-            splitContainer_Functional.Size = new Size(1721, 848);
-            splitContainer_Functional.SplitterDistance = 744;
+            splitContainer_Functional.Size = new Size(1728, 879);
+            splitContainer_Functional.SplitterDistance = 747;
             splitContainer_Functional.TabIndex = 2;
             splitContainer_Functional.TabStop = false;
             splitContainer_Functional.SplitterMoved += splitContainer_SplitterMoved;
@@ -300,8 +300,8 @@
             // 
             splitContainer_Information.Panel2.Controls.Add(splitContainer_Config);
             splitContainer_Information.Panel2.Cursor = Cursors.Default;
-            splitContainer_Information.Size = new Size(744, 848);
-            splitContainer_Information.SplitterDistance = 398;
+            splitContainer_Information.Size = new Size(747, 879);
+            splitContainer_Information.SplitterDistance = 399;
             splitContainer_Information.TabIndex = 1;
             splitContainer_Information.TabStop = false;
             splitContainer_Information.SplitterMoved += splitContainer_SplitterMoved;
@@ -313,7 +313,7 @@
             groupBox_SkelList.Dock = DockStyle.Fill;
             groupBox_SkelList.Location = new Point(0, 0);
             groupBox_SkelList.Name = "groupBox_SkelList";
-            groupBox_SkelList.Size = new Size(398, 848);
+            groupBox_SkelList.Size = new Size(399, 879);
             groupBox_SkelList.TabIndex = 0;
             groupBox_SkelList.TabStop = false;
             groupBox_SkelList.Text = "模型列表";
@@ -324,7 +324,7 @@
             spineListView.Location = new Point(3, 26);
             spineListView.Name = "spineListView";
             spineListView.PropertyGrid = propertyGrid_Spine;
-            spineListView.Size = new Size(392, 819);
+            spineListView.Size = new Size(393, 850);
             spineListView.TabIndex = 0;
             // 
             // propertyGrid_Spine
@@ -333,7 +333,7 @@
             propertyGrid_Spine.HelpVisible = false;
             propertyGrid_Spine.Location = new Point(3, 26);
             propertyGrid_Spine.Name = "propertyGrid_Spine";
-            propertyGrid_Spine.Size = new Size(336, 470);
+            propertyGrid_Spine.Size = new Size(338, 485);
             propertyGrid_Spine.TabIndex = 0;
             propertyGrid_Spine.ToolbarVisible = false;
             propertyGrid_Spine.PropertyValueChanged += propertyGrid_PropertyValueChanged;
@@ -355,8 +355,8 @@
             // 
             splitContainer_Config.Panel2.Controls.Add(groupBox_PreviewConfig);
             splitContainer_Config.Panel2.Cursor = Cursors.Default;
-            splitContainer_Config.Size = new Size(342, 848);
-            splitContainer_Config.SplitterDistance = 499;
+            splitContainer_Config.Size = new Size(344, 879);
+            splitContainer_Config.SplitterDistance = 514;
             splitContainer_Config.TabIndex = 0;
             splitContainer_Config.TabStop = false;
             splitContainer_Config.SplitterMoved += splitContainer_SplitterMoved;
@@ -368,7 +368,7 @@
             groupBox_SkelConfig.Dock = DockStyle.Fill;
             groupBox_SkelConfig.Location = new Point(0, 0);
             groupBox_SkelConfig.Name = "groupBox_SkelConfig";
-            groupBox_SkelConfig.Size = new Size(342, 499);
+            groupBox_SkelConfig.Size = new Size(344, 514);
             groupBox_SkelConfig.TabIndex = 0;
             groupBox_SkelConfig.TabStop = false;
             groupBox_SkelConfig.Text = "模型参数";
@@ -379,7 +379,7 @@
             groupBox_PreviewConfig.Dock = DockStyle.Fill;
             groupBox_PreviewConfig.Location = new Point(0, 0);
             groupBox_PreviewConfig.Name = "groupBox_PreviewConfig";
-            groupBox_PreviewConfig.Size = new Size(342, 345);
+            groupBox_PreviewConfig.Size = new Size(344, 361);
             groupBox_PreviewConfig.TabIndex = 1;
             groupBox_PreviewConfig.TabStop = false;
             groupBox_PreviewConfig.Text = "画面参数";
@@ -390,7 +390,7 @@
             propertyGrid_Previewer.HelpVisible = false;
             propertyGrid_Previewer.Location = new Point(3, 26);
             propertyGrid_Previewer.Name = "propertyGrid_Previewer";
-            propertyGrid_Previewer.Size = new Size(336, 316);
+            propertyGrid_Previewer.Size = new Size(338, 332);
             propertyGrid_Previewer.TabIndex = 1;
             propertyGrid_Previewer.ToolbarVisible = false;
             propertyGrid_Previewer.PropertyValueChanged += propertyGrid_PropertyValueChanged;
@@ -401,7 +401,7 @@
             groupBox_Preview.Dock = DockStyle.Fill;
             groupBox_Preview.Location = new Point(0, 0);
             groupBox_Preview.Name = "groupBox_Preview";
-            groupBox_Preview.Size = new Size(973, 848);
+            groupBox_Preview.Size = new Size(977, 879);
             groupBox_Preview.TabIndex = 1;
             groupBox_Preview.TabStop = false;
             groupBox_Preview.Text = "预览画面";
@@ -413,7 +413,7 @@
             spinePreviewer.Location = new Point(3, 26);
             spinePreviewer.Name = "spinePreviewer";
             spinePreviewer.PropertyGrid = propertyGrid_Previewer;
-            spinePreviewer.Size = new Size(967, 819);
+            spinePreviewer.Size = new Size(971, 850);
             spinePreviewer.SpineListView = spineListView;
             spinePreviewer.TabIndex = 0;
             spinePreviewer.MouseUp += spinePreviewer_MouseUp;
@@ -425,7 +425,7 @@
             panel_MainForm.Location = new Point(0, 32);
             panel_MainForm.Name = "panel_MainForm";
             panel_MainForm.Padding = new Padding(10, 5, 10, 10);
-            panel_MainForm.Size = new Size(1741, 973);
+            panel_MainForm.Size = new Size(1748, 1012);
             panel_MainForm.TabIndex = 4;
             // 
             // toolTip
@@ -436,7 +436,7 @@
             // 
             AutoScaleDimensions = new SizeF(11F, 24F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1741, 1005);
+            ClientSize = new Size(1748, 1044);
             Controls.Add(panel_MainForm);
             Controls.Add(menuStrip);
             Icon = (Icon)resources.GetObject("$this.Icon");

SpineViewer/Spine/Implementations/SkeletonConverter/SkeletonConverter38.cs

@@ -51,7 +51,9 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
         {
             JsonObject skeleton = [];
             skeleton["hash"] = reader.ReadString();
-            skeleton["spine"] = reader.ReadString();
+            var version = reader.ReadString();
+            if (version == "3.8.75") version = "3.8.76"; // replace 3.8.75 to another version to avoid detection in official runtime
+            skeleton["spine"] = version;
             skeleton["x"] = reader.ReadFloat();
             skeleton["y"] = reader.ReadFloat();
             skeleton["width"] = reader.ReadFloat();
@@ -842,7 +844,9 @@ namespace SpineViewer.Spine.Implementations.SkeletonConverter
         {
             JsonObject skeleton = root["skeleton"].AsObject();
             writer.WriteString((string)skeleton["hash"]);
-            writer.WriteString((string)skeleton["spine"]);
+            var version = (string)skeleton["spine"];
+            if (version == "3.8.75") version = "3.8.76"; // replace 3.8.75 to another version to avoid detection in official runtime
+            writer.WriteString(version);
             if (skeleton.TryGetPropertyValue("x", out var x)) writer.WriteFloat((float)x); else writer.WriteFloat(0);
             if (skeleton.TryGetPropertyValue("y", out var y)) writer.WriteFloat((float)y); else writer.WriteFloat(0);
             if (skeleton.TryGetPropertyValue("width", out var width)) writer.WriteFloat((float)width); else writer.WriteFloat(0);

SpineViewer/Spine/Spine.cs

@@ -120,8 +120,9 @@ namespace SpineViewer.Spine
             // try json format
             try
             {
-                if (JsonNode.Parse(input) is JsonObject root && root.TryGetPropertyValue("spine", out var node))
-                    versionString = (string)node;
+                if (JsonNode.Parse(input) is JsonObject root && root.TryGetPropertyValue("skeleton", out var node) &&
+                    node is JsonObject _skeleton && _skeleton.TryGetPropertyValue("spine", out var _version))
+                    versionString = (string)_version;
             }
             catch { }
 

SpineViewer/SpineViewer.csproj

@@ -8,7 +8,7 @@
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.10.3</Version>
+        <Version>0.10.5</Version>
         <OutputType>WinExe</OutputType>
         <UseWindowsForms>true</UseWindowsForms>
         <ApplicationIcon>appicon.ico</ApplicationIcon>