From d0486d855a4bcfd79e5499b46e26e94fbe9c1e91 Mon Sep 17 00:00:00 2001 From: Perfare Date: Fri, 10 Nov 2017 00:04:27 +0800 Subject: [PATCH] Add fullSize --- Unity Studio/Unity Classes/AudioClip.cs | 6 ++++-- Unity Studio/Unity Classes/Texture2D.cs | 4 +++- Unity Studio/Unity Studio Classes/AssetPreloadData.cs | 1 + Unity Studio/Unity Studio Classes/AssetsFile.cs | 1 + Unity Studio/UnityStudioForm.cs | 6 +++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Unity Studio/Unity Classes/AudioClip.cs b/Unity Studio/Unity Classes/AudioClip.cs index d03a782..0c927c2 100644 --- a/Unity Studio/Unity Classes/AudioClip.cs +++ b/Unity Studio/Unity Classes/AudioClip.cs @@ -114,7 +114,7 @@ namespace Unity_Studio if (UnityStudio.assetsfileandstream.TryGetValue(Path.GetFileName(m_Source), out estream)) { estream.Position = m_Offset; - m_AudioData = estream.ReadBytes((int) m_Size); + m_AudioData = estream.ReadBytes((int)m_Size); } else { @@ -183,7 +183,9 @@ namespace Unity_Studio if (m_Name != "") { preloadData.Text = m_Name; } else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; } - preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() }); + if (m_Source != null) + preloadData.fullSize = preloadData.Size + (int)m_Size; + preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.fullSize.ToString() }); } } } diff --git a/Unity Studio/Unity Classes/Texture2D.cs b/Unity Studio/Unity Classes/Texture2D.cs index ec397cd..4fc892c 100644 --- a/Unity Studio/Unity Classes/Texture2D.cs +++ b/Unity Studio/Unity Classes/Texture2D.cs @@ -758,7 +758,9 @@ namespace Unity_Studio if (m_Name != "") { preloadData.Text = m_Name; } else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; } - preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() }); + if (!string.IsNullOrEmpty(path)) + preloadData.fullSize = preloadData.Size + (int)size; + preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.fullSize.ToString() }); } } diff --git a/Unity Studio/Unity Studio Classes/AssetPreloadData.cs b/Unity Studio/Unity Studio Classes/AssetPreloadData.cs index 4bd58f1..b31d365 100644 --- a/Unity Studio/Unity Studio Classes/AssetPreloadData.cs +++ b/Unity Studio/Unity Studio Classes/AssetPreloadData.cs @@ -15,6 +15,7 @@ namespace Unity_Studio public ushort Type2; public string TypeString; + public int fullSize; public string InfoText; public string extension; diff --git a/Unity Studio/Unity Studio Classes/AssetsFile.cs b/Unity Studio/Unity Studio Classes/AssetsFile.cs index 1f36738..9cafdac 100644 --- a/Unity Studio/Unity Studio Classes/AssetsFile.cs +++ b/Unity Studio/Unity Studio Classes/AssetsFile.cs @@ -362,6 +362,7 @@ namespace Unity_Studio asset.uniqueID = i.ToString(assetIDfmt); + asset.fullSize = asset.Size; asset.sourceFile = this; preloadTable.Add(asset.m_PathID, asset); diff --git a/Unity Studio/UnityStudioForm.cs b/Unity Studio/UnityStudioForm.cs index 819d00c..4d8fd1f 100644 --- a/Unity Studio/UnityStudioForm.cs +++ b/Unity Studio/UnityStudioForm.cs @@ -735,7 +735,7 @@ namespace Unity_Studio { int xdiff = reverseSort ? b.Text.CompareTo(a.Text) : a.Text.CompareTo(b.Text); if (xdiff != 0) return xdiff; - return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.Size.CompareTo(b.Size); + return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.fullSize.CompareTo(b.fullSize); }); break; case 1: @@ -743,13 +743,13 @@ namespace Unity_Studio { int xdiff = reverseSort ? b.TypeString.CompareTo(a.TypeString) : a.TypeString.CompareTo(b.TypeString); if (xdiff != 0) return xdiff; - return secondSortColumn == 2 ? a.Size.CompareTo(b.Size) : a.Text.CompareTo(b.Text); + return secondSortColumn == 2 ? a.fullSize.CompareTo(b.fullSize) : a.Text.CompareTo(b.Text); }); break; case 2: visibleAssets.Sort(delegate (AssetPreloadData a, AssetPreloadData b) { - int xdiff = reverseSort ? b.Size.CompareTo(a.Size) : a.Size.CompareTo(b.Size); + int xdiff = reverseSort ? b.fullSize.CompareTo(a.fullSize) : a.fullSize.CompareTo(b.fullSize); if (xdiff != 0) return xdiff; return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.Text.CompareTo(b.Text); });