chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from Escartem/main

Browse Source 
Fixes
This commit is contained in:
yarik0chka
2024-05-01 19:33:35 +05:00
committed by GitHub
parent 054df3b752 494d005fa7
commit fa7512fbf6
3 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AssetStudio.GUI/MainForm.cs
View File

@@ -85,7 +85,7 @@ namespace AssetStudio.GUI
{ {
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
InitializeComponent(); InitializeComponent();
Text = $"YarikStudio v{Application.ProductVersion}"; Text = $"Studio v{Application.ProductVersion}";
InitializeExportOptions(); InitializeExportOptions();
InitializeProgressBar(); InitializeProgressBar();
InitializeLogger(); InitializeLogger();
@@ -308,7 +308,7 @@ namespace AssetStudio.GUI
} }
} }
Text = $"YarikStudio v{Application.ProductVersion} - {productName} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; Text = $"Studio v{Application.ProductVersion} - {productName} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}";
assetListView.VirtualListSize = visibleAssets.Count; assetListView.VirtualListSize = visibleAssets.Count;
@@ -1484,7 +1484,7 @@ namespace AssetStudio.GUI
public void ResetForm() public void ResetForm()
{ {
Text = $"YarikStudio v{Application.ProductVersion}"; Text = $"Studio v{Application.ProductVersion}";
assetsManager.Clear(); assetsManager.Clear();
assemblyLoader.Clear(); assemblyLoader.Clear();
exportableAssets.Clear(); exportableAssets.Clear();

13
AssetStudio.GUI/Studio.cs
View File

@@ -304,9 +304,18 @@ namespace AssetStudio.GUI
var preloadIndex = m_Container.Value.preloadIndex; var preloadIndex = m_Container.Value.preloadIndex;
var preloadSize = m_Container.Value.preloadSize; var preloadSize = m_Container.Value.preloadSize;
var preloadEnd = preloadIndex + preloadSize; var preloadEnd = preloadIndex + preloadSize;
for (int k = preloadIndex; k < preloadEnd; k++)
switch(preloadIndex)
{ {
containers.Add((m_AssetBundle.m_PreloadTable[k], m_Container.Key)); case int n when n < 0:
Logger.Warning($"preloadIndex {preloadIndex} is out of preloadTable range");
break;
default:
for (int k = preloadIndex; k < preloadEnd; k++)
{
containers.Add((m_AssetBundle.m_PreloadTable[k], m_Container.Key));
}
break;
} }
} }
} }

70
AssetStudio/OffsetStream.cs
View File

@@ -8,7 +8,6 @@ namespace AssetStudio
{ {
public class OffsetStream : Stream public class OffsetStream : Stream
{ {
private readonly Stream _baseStream; private readonly Stream _baseStream;
private long _offset; private long _offset;
@@ -81,34 +80,59 @@ namespace AssetStudio
else else
{ {
using var reader = new FileReader(path, this, true); using var reader = new FileReader(path, this, true);
var signature = reader.FileType switch
{
FileType.BundleFile => "UnityFS\x00",
FileType.MhyFile => "mhy",
FileType.Blb3File => "Blb\x03",
_ => throw new InvalidOperationException()
};
Logger.Verbose($"Parsed signature: {signature}"); var readSignature = reader.FileType;
var signature = "";
var signatureBytes = Encoding.UTF8.GetBytes(signature); if (readSignature == FileType.BundleFile ||
var buffer = ArrayPool<byte>.Shared.Rent((int)reader.Length); readSignature == FileType.MhyFile ||
while (Remaining > 0) readSignature == FileType.Blb3File)
{ {
var index = 0; switch (reader.FileType)
var absOffset = AbsolutePosition;
var read = Read(buffer);
while (index < read)
{ {
index = buffer.AsSpan(0, read).Search(signatureBytes, index); case FileType.BundleFile:
if (index == -1) break; signature = "UnityFS\x00";
var offset = absOffset + index; break;
Offset = offset; case FileType.MhyFile:
yield return offset; signature = "mhy";
index++; break;
case FileType.Blb3File:
signature = "Blb\x03";
break;
}
Logger.Verbose($"Parsed signature: {signature}");
var signatureBytes = Encoding.UTF8.GetBytes(signature);
var buffer = ArrayPool<byte>.Shared.Rent((int)reader.Length);
while (Remaining > 0)
{
var index = 0;
var absOffset = AbsolutePosition;
var read = Read(buffer);
while (index < read)
{
index = buffer.AsSpan(0, read).Search(signatureBytes, index);
if (index == -1) break;
var offset = absOffset + index;
Offset = offset;
yield return offset;
index++;
}
}
ArrayPool<byte>.Shared.Return(buffer);
} else
{
while (Remaining > 0)
{
Offset = AbsolutePosition;
yield return AbsolutePosition;
if (Offset == AbsolutePosition)
{
break;
}
} }
} }
ArrayPool<byte>.Shared.Return(buffer);
} }
} }
} }