IL2Cpp/Il2CppDumper
1
0
Fork 0
mirror of https://github.com/Perfare/Il2CppDumper.git synced 2025-01-09 19:27:17 -03:00
Code Issues Projects Releases Packages Wiki Activity

修复Generic Struct

Browse source
This commit is contained in:
Perfare 2020-02-27 17:45:05 +08:00
parent 600607abf4
commit 96fd324d04
1 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Il2CppDumper/Outputs/ScriptGenerator.cs
View file

@ -413,11 +413,10 @@ namespace Il2CppDumper
return "Il2CppArray*";
case Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST:
{
//TODO Enum ValueType
var genericClass = il2Cpp.MapVATR<Il2CppGenericClass>(il2CppType.data.generic_class);
var typeDef = metadata.typeDefs[genericClass.typeDefinitionIndex];
if (!GenericClassStructNameDic.TryGetValue(il2CppType.data.generic_class, out var typeStructName))
{
var genericClass = il2Cpp.MapVATR<Il2CppGenericClass>(il2CppType.data.generic_class);
var typeDef = metadata.typeDefs[genericClass.typeDefinitionIndex];
var typeOriName = StructNameDic[typeDef];
var typeToReplaceName = FixName(executor.GetTypeDefName(typeDef, true, true));
var typeReplaceName = FixName(executor.GetTypeName(il2CppType, true, false));
@ -428,6 +427,10 @@ namespace Il2CppDumper
GenericClass.Add(il2CppType.data.generic_class);
}
}
if (typeDef.IsValueType)
{
return typeStructName + "_t";
}
return typeStructName + "_t*";
}
case Il2CppTypeEnum.IL2CPP_TYPE_TYPEDBYREF:
@ -509,14 +512,7 @@ namespace Il2CppDumper
structFieldInfo.FieldTypeName = ParseType(fieldType, context);
var fieldName = FixName(metadata.GetStringFromIndex(fieldDef.nameIndex));
structFieldInfo.FieldName = fieldName;
if (fieldType.type == Il2CppTypeEnum.IL2CPP_TYPE_VALUETYPE)
{
var fieldTypeDef = metadata.typeDefs[fieldType.data.klassIndex];
if (!fieldTypeDef.IsEnum)
{
structFieldInfo.IsValueType = true;
}
}
structFieldInfo.IsValueType = IsValueType(fieldType);
if ((fieldType.attrs & FIELD_ATTRIBUTE_STATIC) != 0)
{
if (!isParent)
@ -710,7 +706,6 @@ namespace Il2CppDumper
return "Il2CppArray*";
case Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST:
{
//TODO Enum ValueType
if (!GenericClassStructNameDic.TryGetValue(il2CppType.data.generic_class, out var typeStructName))
{
var genericClass = il2Cpp.MapVATR<Il2CppGenericClass>(il2CppType.data.generic_class);
@ -731,5 +726,32 @@ namespace Il2CppDumper
throw new NotSupportedException();
}
}
private bool IsValueType(Il2CppType il2CppType)
{
var type = il2CppType.type;
if (type == Il2CppTypeEnum.IL2CPP_TYPE_VALUETYPE)
{
var typeDef = metadata.typeDefs[il2CppType.data.klassIndex];
if (!typeDef.IsEnum)
{
return true;
}
else
{
return false;
}
}
else if (type == Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST)
{
var genericClass = il2Cpp.MapVATR<Il2CppGenericClass>(il2CppType.data.generic_class);
var typeDef = metadata.typeDefs[genericClass.typeDefinitionIndex];
return typeDef.IsValueType;
}
else
{
return false;
}
}
}
}