diff --git a/Unity Studio/Unity Classes/Shader.cs b/Unity Studio/Unity Classes/Shader.cs index ad5b23b..2abece4 100644 --- a/Unity Studio/Unity Classes/Shader.cs +++ b/Unity Studio/Unity Classes/Shader.cs @@ -6,7 +6,6 @@ namespace Unity_Studio { public string m_Name; public byte[] m_Script; - public string m_PathName; public Shader(AssetPreloadData preloadData, bool readSwitch) { @@ -23,49 +22,29 @@ namespace Unity_Studio } m_Name = a_Stream.ReadAlignedString(a_Stream.ReadInt32()); - if ((sourceFile.version[0] == 5 && sourceFile.version[1] >= 5) || sourceFile.version[0] > 5) + + if (readSwitch) { - if (readSwitch) + if (sourceFile.version[0] == 5 && sourceFile.version[1] >= 5 || sourceFile.version[0] > 5) { string str; if ((str = preloadData.ViewStruct()) != null) { - m_Script = Encoding.UTF8.GetBytes(preloadData.ViewStruct()); + m_Script = Encoding.UTF8.GetBytes(str); } else m_Script = Encoding.UTF8.GetBytes("Serialized Shader can't be read"); } else { - if (m_Name != "") { preloadData.Text = m_Name; } - else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; } - preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() }); + m_Script = a_Stream.ReadBytes(a_Stream.ReadInt32()); } } else { - int m_Script_size = a_Stream.ReadInt32(); - - if (readSwitch) //asset is read for preview or export - { - m_Script = new byte[m_Script_size]; - a_Stream.Read(m_Script, 0, m_Script_size); - - if (m_Script[0] == 93) { m_Script = SevenZip.Compression.LZMA.SevenZipHelper.Decompress(m_Script); } - if (m_Script[0] == 60 || (m_Script[0] == 239 && m_Script[1] == 187 && m_Script[2] == 191 && m_Script[3] == 60)) { preloadData.extension = ".xml"; } - } - else - { - byte lzmaTest = a_Stream.ReadByte(); - - a_Stream.Position += m_Script_size - 1; - - if (m_Name != "") { preloadData.Text = m_Name; } - else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; } - preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() }); - } - a_Stream.AlignStream(4); - m_PathName = a_Stream.ReadAlignedString(a_Stream.ReadInt32()); + if (m_Name != "") { preloadData.Text = m_Name; } + else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; } + preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() }); } } } diff --git a/Unity Studio/Unity Classes/TextAsset.cs b/Unity Studio/Unity Classes/TextAsset.cs index 71a3687..a3c67ef 100644 --- a/Unity Studio/Unity Classes/TextAsset.cs +++ b/Unity Studio/Unity Classes/TextAsset.cs @@ -10,7 +10,6 @@ namespace Unity_Studio { public string m_Name; public byte[] m_Script; - public string m_PathName; public TextAsset(AssetPreloadData preloadData, bool readSwitch) { @@ -28,36 +27,16 @@ namespace Unity_Studio m_Name = a_Stream.ReadAlignedString(a_Stream.ReadInt32()); - int m_Script_size = a_Stream.ReadInt32(); - - if (readSwitch) //asset is read for preview or export + if (readSwitch) { - m_Script = new byte[m_Script_size]; - a_Stream.Read(m_Script, 0, m_Script_size); - - if (m_Script[0] == 93) - { - try - { - m_Script = SevenZip.Compression.LZMA.SevenZipHelper.Decompress(m_Script); - } - catch { } - } - if (m_Script[0] == 60 || (m_Script[0] == 239 && m_Script[1] == 187 && m_Script[2] == 191 && m_Script[3] == 60)) { preloadData.extension = ".xml"; } + m_Script = a_Stream.ReadBytes(a_Stream.ReadInt32()); } else { - byte lzmaTest = a_Stream.ReadByte(); - - a_Stream.Position += m_Script_size - 1; - if (m_Name != "") { preloadData.Text = m_Name; } else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; } preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() }); } - a_Stream.AlignStream(4); - - m_PathName = a_Stream.ReadAlignedString(a_Stream.ReadInt32()); } } }