caleb-brown/Alchemy
1
0
Fork 0
mirror of https://github.com/AnnulusGames/Alchemy.git synced 2025-01-22 08:18:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: fields that hides inherited properties appears multiple times

Browse Source
This commit is contained in:
AnnulusGames 2024-02-17 15:27:14 +09:00
parent 6800d3a455
commit aff108be38
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Alchemy/Assets/Alchemy/Editor/Internal/InspectorHelper.cs
View File

@ -211,7 +211,11 @@ namespace Alchemy.Editor
break;
case FieldInfo:
case PropertyInfo:
if (memberInfo.IsPublic() || memberInfo.HasCustomAttribute<SerializeField>())
var isSerializedMember = false;
if (memberInfo is FieldInfo f) isSerializedMember = f.IsPublic | f.HasCustomAttribute<SerializeField>();
else if (memberInfo is PropertyInfo p) isSerializedMember = p.HasCustomAttribute<SerializeField>();
if (isSerializedMember)
{
var property = findPropertyFunc?.Invoke(memberInfo.Name);

11
Alchemy/Assets/Alchemy/Editor/Internal/MemberInfoExtensions.cs
View File

@ -15,16 +15,5 @@ namespace Alchemy.Editor
result = memberInfo.GetCustomAttribute<T>();
return result != null;
}
public static bool IsPublic(this MemberInfo memberInfo)
{
switch (memberInfo)
{
case MethodInfo methodInfo: return methodInfo.IsPublic;
case FieldInfo fieldInfo: return fieldInfo.IsPublic;
case PropertyInfo propertyInfo: return propertyInfo.GetMethod != null && propertyInfo.GetMethod.IsPublic && propertyInfo.SetMethod != null && propertyInfo.SetMethod.IsPublic;
default: throw new NotSupportedException();
}
}
}
}