PHXH
/
obfuz
mirror of https://github.com/focus-creative-games/obfuz
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

删除 ObfuzIgnoreAttribute.ApplyToMembers属性，因为没有必要，正常逻辑来说应该是ApplyToMembers

before-split
walon 2025-05-27 10:28:34 +08:00
parent cd99bfe4f3
commit f134b88c13
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
com.code-philosophy.obfuz/Editor/Utils/MetaUtil.cs
View File

@ -811,25 +811,6 @@ namespace Obfuz.Utils
return scope; return scope;
} }
//public static ObfuzScope? GetSelfOrInheritObfuzIgnoreScope(TypeDef typeDef)
//{
// TypeDef cur = typeDef;
// while (cur != null)
// {
// var ca = cur.CustomAttributes?.FirstOrDefault(c => c.AttributeType.FullName == "Obfuz.ObfuzIgnoreAttribute");
// if (ca != null)
// {
// var scope = (ObfuzScope)ca.ConstructorArguments[0].Value;
// CANamedArgument inheritByNestedTypesArg = ca.GetNamedArgument("ApplyToMembers", false);
// bool inheritByNestedTypes = inheritByNestedTypesArg == null || (bool)inheritByNestedTypesArg.Value;
// return inheritByNestedTypes ? (ObfuzScope?) scope : null;
// }
// cur = cur.DeclaringType;
// }
// return null;
//}
public static bool HasObfuzIgnoreScope(IHasCustomAttribute obj, ObfuzScope targetScope) public static bool HasObfuzIgnoreScope(IHasCustomAttribute obj, ObfuzScope targetScope)
{ {
ObfuzScope? objScope = GetObfuzIgnoreScope(obj); ObfuzScope? objScope = GetObfuzIgnoreScope(obj);
@ -869,16 +850,13 @@ namespace Obfuz.Utils
var scope = (ObfuzScope)ca.ConstructorArguments[0].Value; var scope = (ObfuzScope)ca.ConstructorArguments[0].Value;
if (cur != typeDef) if (cur != typeDef)
{ {
CANamedArgument applyToNestedTypesArg = ca.GetNamedArgument(cur == typeDef ? "ApplyToMembers" : "ApplyToNestedTypes", false); CANamedArgument applyToNestedTypesArg = ca.GetNamedArgument("ApplyToNestedTypes", false);
if (applyToNestedTypesArg != null && !(bool)applyToNestedTypesArg.Value) if (applyToNestedTypesArg != null && !(bool)applyToNestedTypesArg.Value)
{ {
return false; return false;
} }
} }
return (scope & targetScope) != 0;
CANamedArgument inheritByNestedTypesArg = ca.GetNamedArgument("ApplyToMembers", false);
bool inheritByNestedTypes = inheritByNestedTypesArg == null || (bool)inheritByNestedTypesArg.Value;
return inheritByNestedTypes && (scope & targetScope) != 0;
} }
cur = cur.DeclaringType; cur = cur.DeclaringType;
} }

2
com.code-philosophy.obfuz/Runtime/ObfuzIgnoreAttribute.cs
View File

@ -12,8 +12,6 @@ namespace Obfuz
{ {
public ObfuzScope Scope { get; set; } public ObfuzScope Scope { get; set; }
public bool ApplyToMembers { get; set; } = true;
public bool ApplyToNestedTypes { get; set; } = true; public bool ApplyToNestedTypes { get; set; } = true;
public ObfuzIgnoreAttribute(ObfuzScope scope = ObfuzScope.All) public ObfuzIgnoreAttribute(ObfuzScope scope = ObfuzScope.All)