Fixed bugs and compatibility with Il2CppAssemblyUnhollower

1582421598 · Jun 11, 2022 · 01ec5a6 · 01ec5a6
1 parent e69edd3
commit 01ec5a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Il2CppDumper/Program.cs b/Il2CppDumper/Program.cs
@@ -43,8 +43,7 @@ static void Main(string[] args)
                 {
                     if (File.Exists(arg))
                     {
-                        var file = File.ReadAllBytes(arg);
-                        if (BitConverter.ToUInt32(file, 0) == 0xFAB11BAF)
+                        if (arg.Contains("global-metadata.dat"))
                         {
                             metadataPath = arg;
                         }

diff --git a/Il2CppDumper/Utils/Il2CppExecutor.cs b/Il2CppDumper/Utils/Il2CppExecutor.cs
@@ -38,7 +38,7 @@ public Il2CppExecutor(Metadata metadata, Il2Cpp il2Cpp)
             this.metadata = metadata;
             this.il2Cpp = il2Cpp;
 
-            if ((il2Cpp.Version >= 27 && il2Cpp.Version < 29)&& !Program.IsGenshinMetadata)
+            if ((il2Cpp.Version >= 27 && il2Cpp.Version < 29) && !Program.IsGenshinMetadata)
             {
                 customAttributeGenerators = new ulong[metadata.imageDefs.Sum(x => x.customAttributeCount)];
                 foreach (var imageDef in metadata.imageDefs)
@@ -274,7 +274,11 @@ public Il2CppRGCTXDefinition[] GetRGCTXDefinition(string imageName, Il2CppMethod
 
         public Il2CppTypeDefinition GetGenericClassTypeDefinition(Il2CppGenericClass genericClass)
         {
-            if (il2Cpp.Version >= 27 && !Program.IsGenshinMetadata)
+            if (Program.IsGenshinMetadata)
+            {
+                return metadata.typeDefs[genericClass.type];
+            }
+            if (il2Cpp.Version >= 27)
             {
                 var il2CppType = il2Cpp.GetIl2CppType(genericClass.type);
                 if (il2CppType == null)

diff --git a/Il2CppDumper/ghidra.py b/Il2CppDumper/ghidra.py
@@ -84,4 +84,4 @@ def make_function(start):
 		make_function(start)
 		monitor.incrementProgress(1)
 
-print 'Script finished!'
+print("Script finished!")