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

修复BUG

Browse source
This commit is contained in:
Perfare 2020-02-27 17:59:11 +08:00
parent 96fd324d04
commit 788eb8af99
1 changed files with 48 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
Il2CppDumper/Outputs/ScriptGenerator.cs
View file

@ -512,7 +512,7 @@ namespace Il2CppDumper
structFieldInfo.FieldTypeName = ParseType(fieldType, context); structFieldInfo.FieldTypeName = ParseType(fieldType, context);
var fieldName = FixName(metadata.GetStringFromIndex(fieldDef.nameIndex)); var fieldName = FixName(metadata.GetStringFromIndex(fieldDef.nameIndex));
structFieldInfo.FieldName = fieldName; structFieldInfo.FieldName = fieldName;
structFieldInfo.IsValueType = IsValueType(fieldType); structFieldInfo.IsValueType = IsValueType(fieldType, context);
if ((fieldType.attrs & FIELD_ATTRIBUTE_STATIC) != 0) if ((fieldType.attrs & FIELD_ATTRIBUTE_STATIC) != 0)
{ {
if (!isParent) if (!isParent)
@ -727,30 +727,56 @@ namespace Il2CppDumper
} }
} }
private bool IsValueType(Il2CppType il2CppType) private bool IsValueType(Il2CppType il2CppType, Il2CppGenericContext context)
{ {
var type = il2CppType.type; switch (il2CppType.type)
if (type == Il2CppTypeEnum.IL2CPP_TYPE_VALUETYPE)
{ {
var typeDef = metadata.typeDefs[il2CppType.data.klassIndex]; case Il2CppTypeEnum.IL2CPP_TYPE_VALUETYPE:
if (!typeDef.IsEnum) {
{ var typeDef = metadata.typeDefs[il2CppType.data.klassIndex];
return true; if (!typeDef.IsEnum)
} {
else return true;
{ }
else
{
return false;
}
}
case Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST:
{
var genericClass = il2Cpp.MapVATR<Il2CppGenericClass>(il2CppType.data.generic_class);
var typeDef = metadata.typeDefs[genericClass.typeDefinitionIndex];
return typeDef.IsValueType;
}
case Il2CppTypeEnum.IL2CPP_TYPE_VAR:
{
if (context != null)
{
var genericParameter = metadata.genericParameters[il2CppType.data.genericParameterIndex];
var genericInst = il2Cpp.MapVATR<Il2CppGenericInst>(context.class_inst);
var pointers = il2Cpp.MapVATR<ulong>(genericInst.type_argv, genericInst.type_argc);
var pointer = pointers[genericParameter.num];
var type = il2Cpp.GetIl2CppType(pointer);
return IsValueType(type, null);
}
return false;
}
case Il2CppTypeEnum.IL2CPP_TYPE_MVAR:
{
if (context != null)
{
var genericParameter = metadata.genericParameters[il2CppType.data.genericParameterIndex];
var genericInst = il2Cpp.MapVATR<Il2CppGenericInst>(context.method_inst);
var pointers = il2Cpp.MapVATR<ulong>(genericInst.type_argv, genericInst.type_argc);
var pointer = pointers[genericParameter.num];
var type = il2Cpp.GetIl2CppType(pointer);
return IsValueType(type, null);
}
return false;
}
default:
return false; 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;
} }
} }
} }