3.1.12: store Il2CppToMonoType key as string AssemblyQualifiedName instead of Type object

Author: sinai-dev

src/ExplorerCore.cs

@@ -15,7 +15,7 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.1.11";
+        public const string VERSION = "3.1.12";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 

src/Helpers/ReflectionHelpers.cs

@@ -93,30 +93,36 @@ public static Type GetActualType(this object obj)
         }
 
 #if CPP
-        private static readonly Dictionary<CppType, Type> Il2CppToMonoType = new Dictionary<CppType, Type>();
+        private static readonly Dictionary<string, Type> Il2CppToMonoType = new Dictionary<string, Type>();
 
         public static Type GetMonoType(CppType cppType)
         {
-            if (Il2CppToMonoType.ContainsKey(cppType))
-                return Il2CppToMonoType[cppType];
+            if (Il2CppToMonoType.ContainsKey(cppType.AssemblyQualifiedName))
+                return Il2CppToMonoType[cppType.AssemblyQualifiedName];
 
             var getType = Type.GetType(cppType.AssemblyQualifiedName);
 
             if (getType != null)
             {
-                Il2CppToMonoType.Add(cppType, getType);
+                Il2CppToMonoType.Add(cppType.AssemblyQualifiedName, getType);
                 return getType;
             }
             else
             {
                 string baseName = cppType.FullName;
                 string baseAssembly = cppType.Assembly.GetName().name;
 
-                Type unhollowedType = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.GetName().Name == baseAssembly)?.GetTypes().FirstOrDefault(t =>
-                    t.CustomAttributes.Any(ca =>
-                        ca.AttributeType.Name == "ObfuscatedNameAttribute" && (string)ca.ConstructorArguments[0].Value == baseName));
+                Type unhollowedType = AppDomain.CurrentDomain
+                    .GetAssemblies()
+                    .FirstOrDefault(a => a.GetName().Name == baseAssembly)?
+                    .TryGetTypes()
+                    .FirstOrDefault(t =>
+                        t.CustomAttributes.Any(ca 
+                            => ca.AttributeType.Name == "ObfuscatedNameAttribute"
+                               && (string)ca.ConstructorArguments[0].Value == baseName));
+
+                Il2CppToMonoType.Add(cppType.AssemblyQualifiedName, unhollowedType);
 
-                Il2CppToMonoType.Add(cppType, unhollowedType);
                 return unhollowedType;
             }
         }