From f5aef9486f17a33e171800553279b2ecddcd626e Mon Sep 17 00:00:00 2001 From: Perfare Date: Wed, 7 Nov 2018 17:15:54 +0800 Subject: [PATCH] Fixed bug --- AssetStudio/AssetStudioForm.cs | 2 +- AssetStudio/StudioClasses/AssetsFile.cs | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/AssetStudio/AssetStudioForm.cs b/AssetStudio/AssetStudioForm.cs index 198da75..04111d4 100644 --- a/AssetStudio/AssetStudioForm.cs +++ b/AssetStudio/AssetStudioForm.cs @@ -217,7 +217,7 @@ namespace AssetStudio classesListView.EndUpdate(); } - var types = exportableAssets.Select(x => x.Type).Distinct().ToArray(); + var types = exportableAssets.Select(x => x.Type).Distinct().OrderBy(x => x.ToString()).ToArray(); foreach (var type in types) { var typeItem = new ToolStripMenuItem diff --git a/AssetStudio/StudioClasses/AssetsFile.cs b/AssetStudio/StudioClasses/AssetsFile.cs index 9c9c754..a056fe4 100644 --- a/AssetStudio/StudioClasses/AssetsFile.cs +++ b/AssetStudio/StudioClasses/AssetsFile.cs @@ -199,20 +199,14 @@ namespace AssetStudio } buildType = Regex.Replace(unityVersion, @"\d", "").Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries); - var firstVersion = int.Parse(unityVersion.Split('.')[0]); - version = Regex.Matches(unityVersion, @"\d").Cast().Select(m => int.Parse(m.Value)).ToArray(); - if (firstVersion > 5)//2017 and up - { - var nversion = new int[version.Length - 3]; - nversion[0] = firstVersion; - Array.Copy(version, 4, nversion, 1, version.Length - 4); - version = nversion; - } + var versionSplit = Regex.Replace(unityVersion, @"\D", ".").Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries); + version = versionSplit.Select(int.Parse).ToArray(); valid = true; } catch { + // ignored } }