diff --git a/Unity Studio/Unity Studio Classes/AssetsFile.cs b/Unity Studio/Unity Studio Classes/AssetsFile.cs index e3c238a..c0a31c5 100644 --- a/Unity Studio/Unity Studio Classes/AssetsFile.cs +++ b/Unity Studio/Unity Studio Classes/AssetsFile.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Text; +using System.Text.RegularExpressions; namespace Unity_Studio { @@ -31,7 +33,6 @@ namespace Unity_Studio private List classIDs = new List();//use for 5.5.0 public static string[] buildTypeSplit = { ".", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - public static string[] strverSplit = { ".", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "\n", "-", "_" }; #region cmmon string private static Dictionary baseStrings = new Dictionary() @@ -229,6 +230,7 @@ namespace Unity_Studio case 11: platformStr = "Xbox 360"; break; case 13: platformStr = "Android"; break; case 16: platformStr = "Google NaCl"; break; + case 19: platformStr = "CollabPreview"; break; case 21: platformStr = "WP8"; break; case 25: platformStr = "Linux"; break; case 29: platformStr = "Wii U"; break; @@ -329,8 +331,8 @@ namespace Unity_Studio #endregion buildType = m_Version.Split(buildTypeSplit, StringSplitOptions.RemoveEmptyEntries); - var strver = m_Version.Split(strverSplit, StringSplitOptions.RemoveEmptyEntries); - version = Array.ConvertAll(strver, int.Parse); + var strver = from Match m in Regex.Matches(m_Version, @"[0-9]") select m.Value; + version = Array.ConvertAll(strver.ToArray(), int.Parse); if (fileGen >= 14) { diff --git a/Unity Studio/Unity Studio Classes/UnityStudio.cs b/Unity Studio/Unity Studio Classes/UnityStudio.cs index 4342c5d..24c5422 100644 --- a/Unity Studio/Unity Studio Classes/UnityStudio.cs +++ b/Unity Studio/Unity Studio Classes/UnityStudio.cs @@ -155,7 +155,7 @@ namespace Unity_Studio { //make use of the bundle file version assetsFile.m_Version = b_File.versionEngine; - assetsFile.version = Array.ConvertAll((b_File.versionEngine.Split(AssetsFile.strverSplit, StringSplitOptions.RemoveEmptyEntries)), int.Parse); + assetsFile.version = Array.ConvertAll((from Match m in Regex.Matches(assetsFile.m_Version, @"[0-9]") select m.Value).ToArray(), int.Parse); assetsFile.buildType = b_File.versionEngine.Split(AssetsFile.buildTypeSplit, StringSplitOptions.RemoveEmptyEntries); } if (validAssetsFile)