mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-06-03 00:58:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug if AudioClip data originally in the bundle, but bundle has been extracted

Browse Source
This commit is contained in:
Perfare 2016-08-07 08:17:14 +08:00
parent d7a5a44d41
commit 3f54abaa45
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Unity Studio/Unity Classes/AudioClip.cs
View File

@ -86,14 +86,7 @@ namespace Unity_Studio
m_3D = m_Legacy3D; m_3D = m_Legacy3D;
m_Source = a_Stream.ReadAlignedString(a_Stream.ReadInt32()); m_Source = a_Stream.ReadAlignedString(a_Stream.ReadInt32());
if (m_Source.Contains("archive:/"))//resS文件在bundle里
{
m_Source = m_Source.Replace("archive:/", "").Replace(preloadData.sourceFile.fileName + "/", "");
}
else
{
m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), m_Source.Replace("archive:/", "")); m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), m_Source.Replace("archive:/", ""));
}
m_Offset = a_Stream.ReadInt64(); m_Offset = a_Stream.ReadInt64();
m_Size = a_Stream.ReadInt64(); m_Size = a_Stream.ReadInt64();
m_CompressionFormat = a_Stream.ReadInt32(); m_CompressionFormat = a_Stream.ReadInt32();
@ -107,7 +100,8 @@ namespace Unity_Studio
{ {
a_Stream.Read(m_AudioData, 0, (int)m_Size); a_Stream.Read(m_AudioData, 0, (int)m_Size);
} }
else if (File.Exists(m_Source)) else if (File.Exists(m_Source) ||
File.Exists(m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), Path.GetFileName(m_Source))))
{ {
BinaryReader reader = new BinaryReader(File.OpenRead(m_Source)); BinaryReader reader = new BinaryReader(File.OpenRead(m_Source));
reader.BaseStream.Position = m_Offset; reader.BaseStream.Position = m_Offset;
@ -117,7 +111,7 @@ namespace Unity_Studio
else else
{ {
EndianStream estream = null; EndianStream estream = null;
if (UnityStudioForm.assetsfileandstream.TryGetValue(m_Source, out estream)) if (UnityStudioForm.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);