From 58d5a3fc377053f40f4197a90c18f0f0aca7bec5 Mon Sep 17 00:00:00 2001 From: Perfare Date: Sat, 24 Nov 2018 04:42:45 +0800 Subject: [PATCH] minor fixes --- AssetStudioGUI/AssetStudioGUIForm.cs | 3 +-- AssetStudioGUI/Studio.cs | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index bc725a5..b0c9859 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -8,7 +8,6 @@ using System.IO; using System.Threading; using System.Globalization; using System.Runtime.InteropServices; -using System.Text.RegularExpressions; using System.Diagnostics; using System.Drawing.Text; using OpenTK; @@ -1073,7 +1072,7 @@ namespace AssetStudioGUI var bitmap = SpriteHelper.GetImageFromSprite(m_Sprite); if (bitmap != null) { - assetItem.InfoText = $"Width: {imageTexture.Width}\nHeight: {imageTexture.Height}\n"; + assetItem.InfoText = $"Width: {bitmap.Width}\nHeight: {bitmap.Height}\n"; PreviewTexture(bitmap); } diff --git a/AssetStudioGUI/Studio.cs b/AssetStudioGUI/Studio.cs index 1bafd74..3a3a3fe 100644 --- a/AssetStudioGUI/Studio.cs +++ b/AssetStudioGUI/Studio.cs @@ -483,7 +483,10 @@ namespace AssetStudioGUI CollectNode(j, gameObjects); //跳过一些不需要导出的object if (gameObjects.All(x => x.m_SkinnedMeshRenderer == null && x.m_MeshFilter == null)) + { + Progress.Report(++k, count); continue; + } //处理非法文件名 var filename = FixFileName(j.Text); //每个文件存放在单独的文件夹