mirror of
https://github.com/aelurum/AssetStudio.git
synced 2025-05-27 22:00:23 -04:00
Add fullSize
This commit is contained in:
parent
7ddbf3ce3e
commit
d0486d855a
@ -114,7 +114,7 @@ namespace Unity_Studio
|
|||||||
if (UnityStudio.assetsfileandstream.TryGetValue(Path.GetFileName(m_Source), out estream))
|
if (UnityStudio.assetsfileandstream.TryGetValue(Path.GetFileName(m_Source), out estream))
|
||||||
{
|
{
|
||||||
estream.Position = m_Offset;
|
estream.Position = m_Offset;
|
||||||
m_AudioData = estream.ReadBytes((int) m_Size);
|
m_AudioData = estream.ReadBytes((int)m_Size);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -183,7 +183,9 @@ namespace Unity_Studio
|
|||||||
|
|
||||||
if (m_Name != "") { preloadData.Text = m_Name; }
|
if (m_Name != "") { preloadData.Text = m_Name; }
|
||||||
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
|
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() });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -758,7 +758,9 @@ namespace Unity_Studio
|
|||||||
|
|
||||||
if (m_Name != "") { preloadData.Text = m_Name; }
|
if (m_Name != "") { preloadData.Text = m_Name; }
|
||||||
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
|
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() });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@ namespace Unity_Studio
|
|||||||
public ushort Type2;
|
public ushort Type2;
|
||||||
|
|
||||||
public string TypeString;
|
public string TypeString;
|
||||||
|
public int fullSize;
|
||||||
public string InfoText;
|
public string InfoText;
|
||||||
public string extension;
|
public string extension;
|
||||||
|
|
||||||
|
@ -362,6 +362,7 @@ namespace Unity_Studio
|
|||||||
|
|
||||||
asset.uniqueID = i.ToString(assetIDfmt);
|
asset.uniqueID = i.ToString(assetIDfmt);
|
||||||
|
|
||||||
|
asset.fullSize = asset.Size;
|
||||||
asset.sourceFile = this;
|
asset.sourceFile = this;
|
||||||
|
|
||||||
preloadTable.Add(asset.m_PathID, asset);
|
preloadTable.Add(asset.m_PathID, asset);
|
||||||
|
@ -735,7 +735,7 @@ namespace Unity_Studio
|
|||||||
{
|
{
|
||||||
int xdiff = reverseSort ? b.Text.CompareTo(a.Text) : a.Text.CompareTo(b.Text);
|
int xdiff = reverseSort ? b.Text.CompareTo(a.Text) : a.Text.CompareTo(b.Text);
|
||||||
if (xdiff != 0) return xdiff;
|
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;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
@ -743,13 +743,13 @@ namespace Unity_Studio
|
|||||||
{
|
{
|
||||||
int xdiff = reverseSort ? b.TypeString.CompareTo(a.TypeString) : a.TypeString.CompareTo(b.TypeString);
|
int xdiff = reverseSort ? b.TypeString.CompareTo(a.TypeString) : a.TypeString.CompareTo(b.TypeString);
|
||||||
if (xdiff != 0) return xdiff;
|
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;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
visibleAssets.Sort(delegate (AssetPreloadData a, AssetPreloadData b)
|
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;
|
if (xdiff != 0) return xdiff;
|
||||||
return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.Text.CompareTo(b.Text);
|
return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.Text.CompareTo(b.Text);
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user