I have nothing to gatekeep, i have nothing special...
This commit is contained in:
@@ -85,7 +85,7 @@ namespace AssetStudio.GUI
|
|||||||
{
|
{
|
||||||
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
|
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
Text = $"Studio v{Application.ProductVersion}";
|
Text = $"YarikStudio v{Application.ProductVersion}";
|
||||||
InitializeExportOptions();
|
InitializeExportOptions();
|
||||||
InitializeProgressBar();
|
InitializeProgressBar();
|
||||||
InitializeLogger();
|
InitializeLogger();
|
||||||
@@ -308,7 +308,7 @@ namespace AssetStudio.GUI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Text = $"Studio v{Application.ProductVersion} - {productName} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}";
|
Text = $"YarikStudio 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 = $"Studio v{Application.ProductVersion}";
|
Text = $"YarikStudio v{Application.ProductVersion}";
|
||||||
assetsManager.Clear();
|
assetsManager.Clear();
|
||||||
assemblyLoader.Clear();
|
assemblyLoader.Clear();
|
||||||
exportableAssets.Clear();
|
exportableAssets.Clear();
|
||||||
|
|||||||
@@ -73,11 +73,31 @@ namespace AssetStudio.GUI
|
|||||||
extractedCount += ExtractBlkFile(reader, savePath);
|
extractedCount += ExtractBlkFile(reader, savePath);
|
||||||
else if (reader.FileType == FileType.BlockFile)
|
else if (reader.FileType == FileType.BlockFile)
|
||||||
extractedCount += ExtractBlockFile(reader, savePath);
|
extractedCount += ExtractBlockFile(reader, savePath);
|
||||||
|
else if (reader.FileType == FileType.Blb3File)
|
||||||
|
extractedCount += ExtractBlb3File(reader, savePath);
|
||||||
else
|
else
|
||||||
reader.Dispose();
|
reader.Dispose();
|
||||||
return extractedCount;
|
return extractedCount;
|
||||||
}
|
}
|
||||||
|
private static int ExtractBlb3File(FileReader reader, string savePath)
|
||||||
|
{
|
||||||
|
StatusStripUpdate($"Decompressing {reader.FileName} ...");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var bundleFile = new Blb3File(reader, reader.FullPath);
|
||||||
|
reader.Dispose();
|
||||||
|
if (bundleFile.fileList.Count > 0)
|
||||||
|
{
|
||||||
|
var extractPath = Path.Combine(savePath, reader.FileName + "_unpacked");
|
||||||
|
return ExtractStreamFile(extractPath, bundleFile.fileList);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (InvalidCastException)
|
||||||
|
{
|
||||||
|
Logger.Error($"Game type mismatch, Expected {nameof(Mr0k)} but got {Game.Name} ({Game.GetType().Name}) !!");
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
private static int ExtractBundleFile(FileReader reader, string savePath)
|
private static int ExtractBundleFile(FileReader reader, string savePath)
|
||||||
{
|
{
|
||||||
StatusStripUpdate($"Decompressing {reader.FileName} ...");
|
StatusStripUpdate($"Decompressing {reader.FileName} ...");
|
||||||
|
|||||||
@@ -19,6 +19,12 @@
|
|||||||
<None Update="Keys.json">
|
<None Update="Keys.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
<None Update="oo2core_9_win64.dll">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
<None Update="UnityPlayer.dll">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -429,8 +429,8 @@ namespace AssetStudio
|
|||||||
case FileType.BundleFile:
|
case FileType.BundleFile:
|
||||||
LoadBundleFile(subReader, reader.FullPath, offset, false);
|
LoadBundleFile(subReader, reader.FullPath, offset, false);
|
||||||
break;
|
break;
|
||||||
case FileType.BlbFile:
|
case FileType.Blb3File:
|
||||||
LoadBlbFile(subReader, reader.FullPath, offset, false);
|
LoadBlb3File(subReader, reader.FullPath, offset, false);
|
||||||
break;
|
break;
|
||||||
case FileType.MhyFile:
|
case FileType.MhyFile:
|
||||||
LoadMhyFile(subReader, reader.FullPath, offset, false);
|
LoadMhyFile(subReader, reader.FullPath, offset, false);
|
||||||
@@ -528,7 +528,7 @@ namespace AssetStudio
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadBlbFile(FileReader reader, string originalPath = null, long originalOffset = 0, bool log = true)
|
private void LoadBlb3File(FileReader reader, string originalPath = null, long originalOffset = 0, bool log = true)
|
||||||
{
|
{
|
||||||
if (log)
|
if (log)
|
||||||
{
|
{
|
||||||
@@ -536,7 +536,7 @@ namespace AssetStudio
|
|||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var blbFile = new BlbFile(reader, reader.FullPath);
|
var blbFile = new Blb3File(reader, reader.FullPath);
|
||||||
foreach (var file in blbFile.fileList)
|
foreach (var file in blbFile.fileList)
|
||||||
{
|
{
|
||||||
var dummyPath = Path.Combine(Path.GetDirectoryName(reader.FullPath), file.fileName);
|
var dummyPath = Path.Combine(Path.GetDirectoryName(reader.FullPath), file.fileName);
|
||||||
|
|||||||
@@ -3,28 +3,70 @@ using System.Buffers;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace AssetStudio
|
namespace AssetStudio
|
||||||
{
|
{
|
||||||
public class BlbFile
|
public class Blb3File
|
||||||
{
|
{
|
||||||
private List<BundleFile.StorageBlock> m_BlocksInfo;
|
private List<BundleFile.StorageBlock> m_BlocksInfo;
|
||||||
private List<BundleFile.Node> m_DirectoryInfo;
|
private List<BundleFile.Node> m_DirectoryInfo;
|
||||||
|
private byte[] Header;
|
||||||
|
|
||||||
|
private static string ModuleName = "UnityPlayer.dll";
|
||||||
|
private static IntPtr Module = IntPtr.Zero;
|
||||||
|
|
||||||
public BundleFile.Header m_Header;
|
public BundleFile.Header m_Header;
|
||||||
public List<StreamFile> fileList;
|
public List<StreamFile> fileList;
|
||||||
public long Offset;
|
public long Offset;
|
||||||
|
|
||||||
|
|
||||||
public BlbFile(FileReader reader, string path)
|
[DllImport("kernel32.dll")]
|
||||||
|
static extern bool VirtualProtect(IntPtr lpAddress, uint dwSize, uint flNewProtect, out uint lpflOldProtect);
|
||||||
|
|
||||||
|
[DllImport("kernel32.dll")]
|
||||||
|
static extern IntPtr LoadLibrary(string lpFileName);
|
||||||
|
|
||||||
|
[DllImport("kernel32.dll")]
|
||||||
|
static extern IntPtr GetModuleHandle(string lpModuleName);
|
||||||
|
|
||||||
|
public delegate int DecryptBlb(ref byte buffer, ulong size, ref byte header, ulong headerSize, uint idk);
|
||||||
|
|
||||||
|
public static void Decrypt(byte[] header, Span<byte> buffer)
|
||||||
|
{
|
||||||
|
if (Module == IntPtr.Zero)
|
||||||
|
{
|
||||||
|
Module = LoadLibrary(ModuleName);
|
||||||
|
|
||||||
|
byte[] key1 = new byte[256] { 0x63, 0x7d, 0x75, 0x78, 0xf6, 0x6e, 0x69, 0xc2, 0x38, 0x08, 0x6d, 0x20, 0xf2, 0xda, 0xa5, 0x79, 0xda, 0x93, 0xdb, 0x6e, 0xee, 0x4c, 0x51, 0xe7, 0xb5, 0xcd, 0xb8, 0xb4, 0x80, 0xb9, 0x6c, 0xdf, 0x97, 0xdc, 0xb1, 0x05, 0x12, 0x1a, 0xd1, 0xeb, 0x1c, 0x8c, 0xcf, 0xda, 0x5d, 0xf5, 0x1f, 0x3a, 0x34, 0xf6, 0x11, 0xf0, 0x2c, 0xa3, 0x33, 0xad, 0x3f, 0x2b, 0xba, 0xd9, 0xd7, 0x1a, 0x8c, 0x4a, 0x49, 0xc2, 0x6e, 0x59, 0x5f, 0x2b, 0x1c, 0xe7, 0x1a, 0x72, 0x9c, 0xf8, 0x65, 0xae, 0x61, 0xcb, 0x03, 0x80, 0x52, 0xbe, 0x74, 0xa9, 0xe7, 0x0c, 0x32, 0x92, 0xe4, 0x62, 0x16, 0x11, 0x06, 0x90, 0xb0, 0x8e, 0xc8, 0x98, 0x27, 0x28, 0x55, 0xe2, 0x2d, 0x90, 0x68, 0x14, 0x3c, 0x51, 0xf1, 0xc7, 0x21, 0xd2, 0x32, 0xfc, 0xe6, 0xe8, 0x4e, 0x82, 0xc4, 0xcf, 0xa0, 0x5a, 0x6c, 0x82, 0x8d, 0xad, 0x4d, 0x8d, 0x91, 0x6f, 0xdb, 0x12, 0xc2, 0x90, 0x4c, 0x2e, 0xf4, 0xb6, 0xe8, 0xd0, 0x97, 0xfc, 0xf0, 0x10, 0xdd, 0x4f, 0xb6, 0xbf, 0x06, 0x1f, 0xde, 0x77, 0x22, 0x8f, 0x42, 0xc3, 0x95, 0x44, 0x40, 0x93, 0x98, 0xa9, 0xed, 0xa3, 0x82, 0xfb, 0x6a, 0x7a, 0x06, 0xc9, 0x3d, 0x38, 0x4a, 0xd6, 0x57, 0x79, 0x85, 0xde, 0x39, 0x60, 0xf8, 0x1e, 0xd4, 0xef, 0x4e, 0x51, 0xd9, 0xc7, 0x10, 0xb7, 0x7a, 0xb9, 0xe7, 0xed, 0xd8, 0x63, 0x72, 0x01, 0x20, 0x14, 0xbe, 0xd4, 0x87, 0x70, 0x45, 0x45, 0xa0, 0xef, 0x67, 0xb5, 0x9c, 0xd6, 0x20, 0xd9, 0xb9, 0xec, 0x8d, 0x62, 0x5a, 0x1c, 0xc3, 0x41, 0x01, 0x19, 0x7a, 0xf2, 0x8d, 0x3c, 0x68, 0x73, 0x73, 0xf7, 0x6d, 0x02, 0x22, 0xb8, 0xc6, 0x30, 0x7c, 0x50, 0x7b, 0xfe, 0x4b, 0x13, 0xb4, 0x9f, 0xb9, 0x60, 0xd7, 0xf4, 0x4c, 0xa9, 0x45, 0xe9 };
|
||||||
|
byte[] key2 = new byte[256] { 0x29, 0x23, 0xbe, 0x84, 0xe1, 0x6c, 0xd6, 0xae, 0x52, 0x90, 0x49, 0xf1, 0xf1, 0xbb, 0xe9, 0xeb, 0xb3, 0xa6, 0xdb, 0x3c, 0x87, 0x0c, 0x3e, 0x99, 0x24, 0x5e, 0x0d, 0x1c, 0x06, 0xb7, 0x47, 0xde, 0xb3, 0x12, 0x4d, 0xc8, 0x43, 0xbb, 0x8b, 0xa6, 0x1f, 0x03, 0x5a, 0x7d, 0x09, 0x38, 0x25, 0x1f, 0x5d, 0xd4, 0xcb, 0xfc, 0x96, 0xf5, 0x45, 0x3b, 0x13, 0x0d, 0x89, 0x0a, 0x1c, 0xdb, 0xae, 0x32, 0x20, 0x9a, 0x50, 0xee, 0x40, 0x78, 0x36, 0xfd, 0x12, 0x49, 0x32, 0xf6, 0x9e, 0x7d, 0x49, 0xdc, 0xad, 0x4f, 0x14, 0xf2, 0x44, 0x40, 0x66, 0xd0, 0x6b, 0xc4, 0x30, 0xb7, 0x32, 0x3b, 0xa1, 0x22, 0xf6, 0x22, 0x91, 0x9d, 0xe1, 0x8b, 0x1f, 0xda, 0xb0, 0xca, 0x99, 0x02, 0xb9, 0x72, 0x9d, 0x49, 0x2c, 0x80, 0x7e, 0xc5, 0x99, 0xd5, 0xe9, 0x80, 0xb2, 0xea, 0xc9, 0xcc, 0x53, 0xbf, 0x67, 0xd6, 0xbf, 0x14, 0xd6, 0x7e, 0x2d, 0xdc, 0x8e, 0x66, 0x83, 0xef, 0x57, 0x49, 0x61, 0xff, 0x69, 0x8f, 0x61, 0xcd, 0xd1, 0x1e, 0x9d, 0x9c, 0x16, 0x72, 0x72, 0xe6, 0x1d, 0xf0, 0x84, 0x4f, 0x4a, 0x77, 0x02, 0xd7, 0xe8, 0x39, 0x2c, 0x53, 0xcb, 0xc9, 0x12, 0x1e, 0x33, 0x74, 0x9e, 0x0c, 0xf4, 0xd5, 0xd4, 0x9f, 0xd4, 0xa4, 0x59, 0x7e, 0x35, 0xcf, 0x32, 0x22, 0xf4, 0xcc, 0xcf, 0xd3, 0x90, 0x2d, 0x48, 0xd3, 0x8f, 0x75, 0xe6, 0xd9, 0x1d, 0x2a, 0xe5, 0xc0, 0xf7, 0x2b, 0x78, 0x81, 0x87, 0x44, 0x0e, 0x5f, 0x50, 0x00, 0xd4, 0x61, 0x8d, 0xbe, 0x7b, 0x05, 0x15, 0x07, 0x3b, 0x33, 0x82, 0x1f, 0x18, 0x70, 0x92, 0xda, 0x64, 0x54, 0xce, 0xb1, 0x85, 0x3e, 0x69, 0x15, 0xf8, 0x46, 0x6a, 0x04, 0x96, 0x73, 0x0e, 0xd9, 0x16, 0x2f, 0x67, 0x68, 0xd4, 0xf7, 0x4a, 0x4a, 0xd0, 0x57, 0x68, 0x76 };
|
||||||
|
|
||||||
|
IntPtr key1Ptr = GetModuleHandle(ModuleName) + 0x1FF7090;
|
||||||
|
IntPtr key2Ptr = GetModuleHandle(ModuleName) + 0x1FF6F90;
|
||||||
|
|
||||||
|
OverrideBytes(key1Ptr, key1, 256);
|
||||||
|
OverrideBytes(key2Ptr, key2, 256);
|
||||||
|
}
|
||||||
|
IntPtr function_raw = Module + 0xFC730;
|
||||||
|
DecryptBlb decrypt = (DecryptBlb)Marshal.GetDelegateForFunctionPointer(function_raw, typeof(DecryptBlb));
|
||||||
|
|
||||||
|
ulong header_size = (ulong)header.Length;
|
||||||
|
ulong buffer_size = (ulong)buffer.Length;
|
||||||
|
|
||||||
|
|
||||||
|
decrypt(ref buffer[0], buffer_size > 128 ? 128 : buffer_size, ref header[0], header_size, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Blb3File(FileReader reader, string path)
|
||||||
{
|
{
|
||||||
Offset = reader.Position;
|
Offset = reader.Position;
|
||||||
reader.Endian = EndianType.LittleEndian;
|
reader.Endian = EndianType.LittleEndian;
|
||||||
|
|
||||||
var signature = reader.ReadStringToNull(4);
|
var signature = reader.ReadStringToNull(4);
|
||||||
Logger.Verbose($"Parsed signature {signature}");
|
Logger.Verbose($"Parsed signature {signature}");
|
||||||
if (signature != "Blb\x02")
|
if (signature != "Blb\x03")
|
||||||
throw new Exception("not a Blb file");
|
throw new Exception("not a Blb3 file");
|
||||||
|
|
||||||
var size = reader.ReadUInt32();
|
var size = reader.ReadUInt32();
|
||||||
m_Header = new BundleFile.Header
|
m_Header = new BundleFile.Header
|
||||||
@@ -38,13 +80,25 @@ namespace AssetStudio
|
|||||||
m_Header.uncompressedBlocksInfoSize = size;
|
m_Header.uncompressedBlocksInfoSize = size;
|
||||||
|
|
||||||
Logger.Verbose($"Header: {m_Header}");
|
Logger.Verbose($"Header: {m_Header}");
|
||||||
|
reader.ReadUInt32();
|
||||||
|
Header = reader.ReadBytes(16);
|
||||||
|
|
||||||
var header = reader.ReadBytes((int)m_Header.compressedBlocksInfoSize);
|
var header = reader.ReadBytes((int)m_Header.compressedBlocksInfoSize);
|
||||||
|
|
||||||
|
Decrypt(Header, header);
|
||||||
|
|
||||||
ReadBlocksInfoAndDirectory(header);
|
ReadBlocksInfoAndDirectory(header);
|
||||||
using var blocksStream = CreateBlocksStream(path);
|
using var blocksStream = CreateBlocksStream(path);
|
||||||
ReadBlocks(reader, blocksStream);
|
ReadBlocks(reader, blocksStream);
|
||||||
ReadFiles(blocksStream, path);
|
ReadFiles(blocksStream, path);
|
||||||
}
|
}
|
||||||
|
private static void OverrideBytes(IntPtr address, byte[] bytes, int length)
|
||||||
|
{
|
||||||
|
uint oldprotect;
|
||||||
|
VirtualProtect(address, (uint)length, 0x40, out oldprotect);
|
||||||
|
Marshal.Copy(bytes, 0, address, length);
|
||||||
|
VirtualProtect(address, (uint)length, oldprotect, out oldprotect);
|
||||||
|
}
|
||||||
|
|
||||||
private void ReadBlocksInfoAndDirectory(byte[] header)
|
private void ReadBlocksInfoAndDirectory(byte[] header)
|
||||||
{
|
{
|
||||||
@@ -82,6 +136,10 @@ namespace AssetStudio
|
|||||||
|
|
||||||
Logger.Verbose($"Block {i} Info: {m_BlocksInfo[i]}");
|
Logger.Verbose($"Block {i} Info: {m_BlocksInfo[i]}");
|
||||||
}
|
}
|
||||||
|
for (int i = m_BlocksInfo.Count - 1; i > 0; i--)
|
||||||
|
{
|
||||||
|
m_BlocksInfo[i].compressedSize = m_BlocksInfo[i].compressedSize - m_BlocksInfo[i - 1].compressedSize;
|
||||||
|
}
|
||||||
|
|
||||||
reader.Position = nodesInfoOffset;
|
reader.Position = nodesInfoOffset;
|
||||||
m_DirectoryInfo = new List<BundleFile.Node>();
|
m_DirectoryInfo = new List<BundleFile.Node>();
|
||||||
@@ -140,6 +198,40 @@ namespace AssetStudio
|
|||||||
reader.BaseStream.CopyTo(blocksStream, blockInfo.compressedSize);
|
reader.BaseStream.CopyTo(blocksStream, blockInfo.compressedSize);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case CompressionType.Oodle: //Oodle
|
||||||
|
{
|
||||||
|
{
|
||||||
|
var compressedSize = (int)blockInfo.compressedSize;
|
||||||
|
var uncompressedSize = (int)blockInfo.uncompressedSize;
|
||||||
|
|
||||||
|
var compressedBytes = ArrayPool<byte>.Shared.Rent(compressedSize);
|
||||||
|
var uncompressedBytes = ArrayPool<byte>.Shared.Rent(uncompressedSize);
|
||||||
|
|
||||||
|
var compressedBytesSpan = compressedBytes.AsSpan(0, compressedSize);
|
||||||
|
var uncompressedBytesSpan = uncompressedBytes.AsSpan(0, uncompressedSize);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
|
||||||
|
reader.Read(compressedBytesSpan);
|
||||||
|
|
||||||
|
Decrypt(Header, compressedBytesSpan);
|
||||||
|
|
||||||
|
var numWrite = OodleHelper.Decompress(compressedBytesSpan, uncompressedBytesSpan);
|
||||||
|
if (numWrite != uncompressedSize)
|
||||||
|
{
|
||||||
|
Logger.Warning($"Oodle decompression error, write {numWrite} bytes but expected {uncompressedSize} bytes");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
blocksStream.Write(uncompressedBytesSpan);
|
||||||
|
ArrayPool<byte>.Shared.Return(compressedBytes, true);
|
||||||
|
ArrayPool<byte>.Shared.Return(uncompressedBytes, true);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
case CompressionType.Lzma: //LZMA
|
case CompressionType.Lzma: //LZMA
|
||||||
{
|
{
|
||||||
SevenZipHelper.StreamDecompress(reader.BaseStream, blocksStream, blockInfo.compressedSize, blockInfo.uncompressedSize);
|
SevenZipHelper.StreamDecompress(reader.BaseStream, blocksStream, blockInfo.compressedSize, blockInfo.uncompressedSize);
|
||||||
@@ -154,21 +246,27 @@ namespace AssetStudio
|
|||||||
var compressedBytes = ArrayPool<byte>.Shared.Rent(compressedSize);
|
var compressedBytes = ArrayPool<byte>.Shared.Rent(compressedSize);
|
||||||
var uncompressedBytes = ArrayPool<byte>.Shared.Rent(uncompressedSize);
|
var uncompressedBytes = ArrayPool<byte>.Shared.Rent(uncompressedSize);
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var compressedBytesSpan = compressedBytes.AsSpan(0, compressedSize);
|
var compressedBytesSpan = compressedBytes.AsSpan(0, compressedSize);
|
||||||
var uncompressedBytesSpan = uncompressedBytes.AsSpan(0, uncompressedSize);
|
var uncompressedBytesSpan = uncompressedBytes.AsSpan(0, uncompressedSize);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
|
||||||
reader.Read(compressedBytesSpan);
|
reader.Read(compressedBytesSpan);
|
||||||
|
Decrypt(Header, compressedBytesSpan);
|
||||||
var numWrite = LZ4.Instance.Decompress(compressedBytesSpan, uncompressedBytesSpan);
|
var numWrite = LZ4.Instance.Decompress(compressedBytesSpan, uncompressedBytesSpan);
|
||||||
if (numWrite != uncompressedSize)
|
if (numWrite != uncompressedSize)
|
||||||
{
|
{
|
||||||
throw new IOException($"Lz4 decompression error, write {numWrite} bytes but expected {uncompressedSize} bytes");
|
Logger.Warning($"Lz4 decompression error, write {numWrite} bytes but expected {uncompressedSize} bytes");
|
||||||
}
|
}
|
||||||
blocksStream.Write(uncompressedBytesSpan);
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Logger.Error($"Lz4 decompression error {e.Message}");
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
blocksStream.Write(uncompressedBytesSpan);
|
||||||
ArrayPool<byte>.Shared.Return(compressedBytes, true);
|
ArrayPool<byte>.Shared.Return(compressedBytes, true);
|
||||||
ArrayPool<byte>.Shared.Return(uncompressedBytes, true);
|
ArrayPool<byte>.Shared.Return(uncompressedBytes, true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ namespace AssetStudio
|
|||||||
Zstd = 5,
|
Zstd = 5,
|
||||||
Lz4Lit4 = 4,
|
Lz4Lit4 = 4,
|
||||||
Lz4Lit5 = 5,
|
Lz4Lit5 = 5,
|
||||||
|
Oodle = 9,
|
||||||
}
|
}
|
||||||
|
|
||||||
public class BundleFile
|
public class BundleFile
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ namespace AssetStudio
|
|||||||
private static readonly byte[] zipMagic = { 0x50, 0x4B, 0x03, 0x04 };
|
private static readonly byte[] zipMagic = { 0x50, 0x4B, 0x03, 0x04 };
|
||||||
private static readonly byte[] zipSpannedMagic = { 0x50, 0x4B, 0x07, 0x08 };
|
private static readonly byte[] zipSpannedMagic = { 0x50, 0x4B, 0x07, 0x08 };
|
||||||
private static readonly byte[] mhy0Magic = { 0x6D, 0x68, 0x79, 0x30 };
|
private static readonly byte[] mhy0Magic = { 0x6D, 0x68, 0x79, 0x30 };
|
||||||
private static readonly byte[] blbMagic = { 0x42, 0x6C, 0x62, 0x02 };
|
private static readonly byte[] blb2Magic = { 0x42, 0x6C, 0x62, 0x02 };
|
||||||
|
private static readonly byte[] blb3Magic = { 0x42, 0x6C, 0x62, 0x03 };
|
||||||
private static readonly byte[] narakaMagic = { 0x15, 0x1E, 0x1C, 0x0D, 0x0D, 0x23, 0x21 };
|
private static readonly byte[] narakaMagic = { 0x15, 0x1E, 0x1C, 0x0D, 0x0D, 0x23, 0x21 };
|
||||||
private static readonly byte[] gunfireMagic = { 0x7C, 0x6D, 0x79, 0x72, 0x27, 0x7A, 0x73, 0x78, 0x3F };
|
private static readonly byte[] gunfireMagic = { 0x7C, 0x6D, 0x79, 0x72, 0x27, 0x7A, 0x73, 0x78, 0x3F };
|
||||||
|
|
||||||
@@ -86,11 +87,16 @@ namespace AssetStudio
|
|||||||
return FileType.MhyFile;
|
return FileType.MhyFile;
|
||||||
}
|
}
|
||||||
Logger.Verbose($"Parsed signature does not match with expected signature {Convert.ToHexString(mhy0Magic)}");
|
Logger.Verbose($"Parsed signature does not match with expected signature {Convert.ToHexString(mhy0Magic)}");
|
||||||
if (blbMagic.SequenceEqual(magic))
|
if (blb2Magic.SequenceEqual(magic))
|
||||||
{
|
{
|
||||||
return FileType.BlbFile;
|
return FileType.Blb2File;
|
||||||
}
|
}
|
||||||
Logger.Verbose($"Parsed signature does not match with expected signature {Convert.ToHexString(mhy0Magic)}");
|
Logger.Verbose($"Parsed signature does not match with expected signature {Convert.ToHexString(blb2Magic)}");
|
||||||
|
if (blb3Magic.SequenceEqual(magic))
|
||||||
|
{
|
||||||
|
return FileType.Blb3File;
|
||||||
|
}
|
||||||
|
Logger.Verbose($"Parsed signature does not match with expected signature {Convert.ToHexString(blb3Magic)}");
|
||||||
magic = ReadBytes(7);
|
magic = ReadBytes(7);
|
||||||
Position = 0;
|
Position = 0;
|
||||||
Logger.Verbose($"Parsed signature is {Convert.ToHexString(magic)}");
|
Logger.Verbose($"Parsed signature is {Convert.ToHexString(magic)}");
|
||||||
@@ -229,7 +235,7 @@ namespace AssetStudio
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (reader.FileType == FileType.BundleFile && game.Type.IsBlockFile() || reader.FileType == FileType.ENCRFile || reader.FileType == FileType.BlbFile)
|
if (reader.FileType == FileType.BundleFile && game.Type.IsBlockFile() || reader.FileType == FileType.ENCRFile || reader.FileType == FileType.Blb2File || reader.FileType == FileType.Blb3File)
|
||||||
{
|
{
|
||||||
Logger.Verbose("File might have multiple bundles !!");
|
Logger.Verbose("File might have multiple bundles !!");
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ namespace AssetStudio
|
|||||||
ZipFile,
|
ZipFile,
|
||||||
BlkFile,
|
BlkFile,
|
||||||
MhyFile,
|
MhyFile,
|
||||||
BlbFile,
|
Blb2File,
|
||||||
|
Blb3File,
|
||||||
ENCRFile,
|
ENCRFile,
|
||||||
BlockFile
|
BlockFile
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ namespace AssetStudio
|
|||||||
{
|
{
|
||||||
public class OffsetStream : Stream
|
public class OffsetStream : Stream
|
||||||
{
|
{
|
||||||
private const int BufferSize = 0x10000;
|
|
||||||
|
|
||||||
private readonly Stream _baseStream;
|
private readonly Stream _baseStream;
|
||||||
private long _offset;
|
private long _offset;
|
||||||
@@ -81,15 +80,35 @@ namespace AssetStudio
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
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 signatureBytes = Encoding.UTF8.GetBytes(signature);
|
||||||
|
var buffer = ArrayPool<byte>.Shared.Rent((int)reader.Length);
|
||||||
while (Remaining > 0)
|
while (Remaining > 0)
|
||||||
{
|
{
|
||||||
Offset = AbsolutePosition;
|
var index = 0;
|
||||||
yield return AbsolutePosition;
|
var absOffset = AbsolutePosition;
|
||||||
if (Offset == AbsolutePosition)
|
var read = Read(buffer);
|
||||||
|
while (index < read)
|
||||||
{
|
{
|
||||||
break;
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
25
AssetStudio/OodleHelper.cs
Normal file
25
AssetStudio/OodleHelper.cs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace AssetStudio;
|
||||||
|
public static class OodleHelper
|
||||||
|
{
|
||||||
|
[DllImport(@"oo2core_9_win64.dll")]
|
||||||
|
static extern int OodleLZ_Decompress(ref byte compressedBuffer, int compressedBufferSize, ref byte decompressedBuffer, int decompressedBufferSize, int fuzzSafe, int checkCRC, int verbosity, IntPtr rawBuffer, int rawBufferSize, IntPtr fpCallback, IntPtr callbackUserData, IntPtr decoderMemory, IntPtr decoderMemorySize, int threadPhase);
|
||||||
|
|
||||||
|
public static int Decompress(Span<byte> compressed, Span<byte> decompressed)
|
||||||
|
{
|
||||||
|
int numWrite = -1;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
numWrite = OodleLZ_Decompress(ref compressed[0], compressed.Length, ref decompressed[0], decompressed.Length, 1, 0, 0, 0, 0, 0, 0, 0, 0, 3);
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
throw new IOException($"Oodle decompression error, write {numWrite} bytes but expected {decompressed.Length} bytes");
|
||||||
|
}
|
||||||
|
|
||||||
|
return numWrite;
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
AssetStudio/UnityPlayer.dll
Normal file
BIN
AssetStudio/UnityPlayer.dll
Normal file
Binary file not shown.
BIN
AssetStudio/oo2core_9_win64.dll
Normal file
BIN
AssetStudio/oo2core_9_win64.dll
Normal file
Binary file not shown.
Reference in New Issue
Block a user