Skip to content

Commit

Permalink
Small cleanup.
Browse files Browse the repository at this point in the history
Fix alignment for ByteArray import over a string.
Update Mono.Cecil (2014 version was a bit outdated).
Clarify non-affiliation with Unity Technologies (just in case).
  • Loading branch information
SeriousCache committed Apr 25, 2022
1 parent edc33b4 commit 78ee37e
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 12 deletions.
4 changes: 3 additions & 1 deletion AssetsTools/AssetTypeClass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ ASSETSTOOLS_API QWORD AssetTypeValueField::Write(IAssetsWriter *pWriter, QWORD f
SwapEndians_(dwValueTmp);
pWriter->Write(filePos, 4, &dwValueTmp); filePos+=4;
pWriter->Write(filePos, curStrLen, strVal); filePos+=curStrLen;
if ((this->templateField->children.size() > 0) && this->templateField->children[0].align)
if ((this->templateField->children.size() == 1) && this->templateField->children[0].align)
doPadding = true;
}
else if (this->value != NULL
Expand All @@ -215,6 +215,8 @@ ASSETSTOOLS_API QWORD AssetTypeValueField::Write(IAssetsWriter *pWriter, QWORD f
filePos = this->pChildren[i]->Write(pWriter, filePos, bigEndian);
}
}
if ((this->templateField->children.size() == 1) && this->templateField->children[0].align)
doPadding = true; //For special case: String overwritten with ByteArray value.
}
else if (this->childrenCount > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion Launcher/Launcher.rc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL

STRINGTABLE
BEGIN
IDS_APP_TITLE "Unity Asset Bundle Extractor"
IDS_APP_TITLE "Asset Bundle Extractor"
IDC_ASSETBUNDLEEXTRACTOR "ASSETBUNDLEEXTRACTOR"
END

Expand Down
Binary file modified ModInstaller/Dialogs.rc
Binary file not shown.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Unity Asset Bundle Extractor
Unity .assets and AssetBundle editor
# Asset Bundle Extractor
.assets and AssetBundle editor.
Not affiliated with Unity Technologies.

UABE is an editor for Unity 3.4+/4/5/2017-2021.3 .assets and AssetBundle files. It can create standalone mod installers from changes to .assets and/or bundles.
UABE is an editor for 3.4+/4/5/2017-2021.3 .assets and AssetBundle files. It can create standalone mod installers from changes to .assets and/or bundles.

There are multiple plugins to convert Unity assets from/to common file formats :
There are multiple plugins to convert assets from/to common file formats :
- The Texture plugin can export and import .png and .tga files (Texture2D only) and decode&encode most texture formats used by Unity.
- The TextAsset plugin can export and import .txt files.
- The AudioClip plugin can export uncompressed .wav files from Unity 5+ AudioClip assets using FMOD, .m4a files from WebGL builds and Unity 4 sound files.
Expand Down
Binary file modified Tools/Mono.Cecil.Rocks.dll
Binary file not shown.
Binary file modified Tools/Mono.Cecil.dll
Binary file not shown.
Binary file modified Tools/TypeTreeGenerator.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions TypeTreeGenerator/HelperClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public static GenericFuncContainer<TypeDefinition,bool> BaseInterfaceComparer(Ty
TypeDefinition curBaseType = type;
while (curBaseType != null)
{
foreach (TypeReference curInterfaceRef in curBaseType.Interfaces)
foreach (InterfaceImplementation curInterfaceImpl in curBaseType.Interfaces)
{
TypeDefinition interfaceDef = curInterfaceRef.Resolve();
TypeDefinition interfaceDef = curInterfaceImpl.InterfaceType.Resolve();
if (interfaceDef == null)
continue;
if (interfaceDef.Equals(baseType))
Expand Down
4 changes: 0 additions & 4 deletions TypeTreeGenerator/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ public AssemblyArgs(string path, EngineVersion engineVersion)
static Logger logger;
public static void Main(string[] args)
{
/*args = new string[]{ "-f", "E:\\Programme\\SteamLibrary\\SteamApps\\common\\7 Days To Die\\7DaysToDie_Data\\Managed\\Assembly-CSharp.dll",
"-f", "E:\\Programme\\SteamLibrary\\SteamApps\\common\\7 Days To Die\\7DaysToDie_Data\\Managed\\Assembly-CSharp-firstpass.dll"};*/
//args = new string[] { "-f", @"P:\Downloads\users_assetbundle-demo\demo\build9 test\test_Data\Managed\Assembly-CSharp.dll" };
//args = new string[] { "-f", @"P:\Programme\Unity 5.6.0f3\Editor\Data\Managed\UnityEngine.dll", "-f", @"P:\Downloads\UABEHelp31032018_Assembly-CSharp_RefFix.dll", "-c", "UnityTest.BoolComparer" };
if (args.Length == 0)
{
Console.Out.WriteLine("TypeTreeGenerator Parameters (evaluated from first to last) :");
Expand Down
Binary file modified UABE_Win32/AssetBundleExtractor.rc
Binary file not shown.

0 comments on commit 78ee37e

Please sign in to comment.