Skip to content

fixed #416 #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2022
Merged

fixed #416 #417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions UnityProject/Assets/Dependencies/JEngine/Core/Util/ClassBind.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ public void BindSelf()
private static readonly Type MonoAdapterType = typeof(MonoBehaviourAdapter.Adaptor);
private static readonly Type ILTypeInstanceType = typeof(ILTypeInstance);
private static readonly Type AppdomainType = typeof(AppDomain);
private const BindingFlags AllBindingFlags = BindingFlags.Public | BindingFlags.NonPublic |
BindingFlags.Instance | BindingFlags.Static |
BindingFlags.FlattenHierarchy | BindingFlags.Default;

/// <summary>
/// Add class
Expand Down Expand Up @@ -91,11 +94,9 @@ t.BaseType is ILRuntimeWrapperType wrapperType
//直接反射赋值一波了
var clrInstance = gameObject.AddComponent(adapterType) as MonoBehaviour;

var clrILInstance = t.GetFields(
BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)
var clrILInstance = t.GetFields(AllBindingFlags)
.First(f => f.Name == "instance" && f.FieldType == ILTypeInstanceType);
var clrAppDomain = t.GetFields(
BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)
var clrAppDomain = t.GetFields(AllBindingFlags)
.First(f => f.Name == "appdomain" && f.FieldType == AppdomainType);
if (!(clrInstance is null))
{
Expand Down Expand Up @@ -136,7 +137,7 @@ t.BaseType is ILRuntimeWrapperType wrapperType
//JBehaviour额外处理
if (clrInstance.isJBehaviour)
{
var go = t.GetField("_gameObject", BindingFlags.Public| BindingFlags.FlattenHierarchy | BindingFlags.NonPublic);
var go = t.GetField("_gameObject", AllBindingFlags);
go?.SetValue(clrInstance.ILInstance, gameObject);
}
}
Expand Down Expand Up @@ -168,8 +169,6 @@ public void SetVal(ClassData classData)
//绑定数据
classData.BoundData = false;
var fields = classData.fields.ToArray();
var bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance |
BindingFlags.Static | BindingFlags.DeclaredOnly;

foreach (ClassField field in fields)
{
Expand All @@ -180,10 +179,10 @@ public void SetVal(ClassData classData)
{
if (field.fieldType == ClassField.FieldType.Number)
{
var fieldType = t.GetField(field.fieldName, bindingAttr)?.FieldType ??
(t.BaseType?.GetField(field.fieldName, bindingAttr)?.FieldType ??
(t.GetProperty(field.fieldName, bindingAttr)?.PropertyType ??
t.BaseType?.GetProperty(field.fieldName, bindingAttr)?.PropertyType));
var fieldType = t.GetField(field.fieldName, AllBindingFlags)?.FieldType ??
(t.BaseType?.GetField(field.fieldName, AllBindingFlags)?.FieldType ??
(t.GetProperty(field.fieldName, AllBindingFlags)?.PropertyType ??
t.BaseType?.GetProperty(field.fieldName, AllBindingFlags)?.PropertyType));
fieldType = fieldType is ILRuntimeWrapperType wrapperType ? wrapperType.RealType : fieldType;

if (fieldType == typeof(SByte))
Expand Down Expand Up @@ -352,16 +351,16 @@ void SetField(Type fieldType)
}
}

var tp = t.GetField(field.fieldName, bindingAttr);
if (tp == null) tp = t.BaseType?.GetField(field.fieldName, bindingAttr);
var tp = t.GetField(field.fieldName, AllBindingFlags);
if (tp == null) tp = t.BaseType?.GetField(field.fieldName, AllBindingFlags);
if (tp != null)
{
SetField(tp.FieldType);
}
else
{
var pi = t.GetProperty(field.fieldName, bindingAttr);
if (pi == null) pi = t.BaseType?.GetProperty(field.fieldName, bindingAttr);
var pi = t.GetProperty(field.fieldName, AllBindingFlags);
if (pi == null) pi = t.BaseType?.GetProperty(field.fieldName, AllBindingFlags);
if (pi != null)
{
SetField(pi.PropertyType);
Expand Down Expand Up @@ -411,16 +410,16 @@ void BindVal(MemberInfo mi)
}
}

var fi = t.GetField(field.fieldName, bindingAttr);
if (fi == null) fi = t.BaseType?.GetField(field.fieldName, bindingAttr);
var fi = t.GetField(field.fieldName, AllBindingFlags);
if (fi == null) fi = t.BaseType?.GetField(field.fieldName, AllBindingFlags);
if (fi != null)
{
BindVal(fi);
}
else
{
var pi = t.GetProperty(field.fieldName, bindingAttr);
if (pi == null) pi = t.BaseType?.GetProperty(field.fieldName, bindingAttr);
var pi = t.GetProperty(field.fieldName, AllBindingFlags);
if (pi == null) pi = t.BaseType?.GetProperty(field.fieldName, AllBindingFlags);
BindVal(pi);
}
}
Expand Down