Merge branch 'dev'

This commit is contained in:
Mikhail 2024-10-12 23:22:18 +08:00
commit 7690c190f9
2 changed files with 4 additions and 4 deletions

View File

@ -15,7 +15,7 @@ namespace DCFApixels.DragonECS
public sealed class CombineAttribute : InjectAspectMemberAttribute public sealed class CombineAttribute : InjectAspectMemberAttribute
{ {
public readonly int order = 0; public readonly int order = 0;
public CombineAttribute(int order = 0) => this.order = order; public CombineAttribute(int order = 0) { this.order = order; }
} }
public abstract class ImplicitInjectAttribute : Attribute { } public abstract class ImplicitInjectAttribute : Attribute { }

View File

@ -243,7 +243,7 @@ namespace DCFApixels.DragonECS
private FieldInfo _member; private FieldInfo _member;
private EcsInjectAttribute _injectAttribute; private EcsInjectAttribute _injectAttribute;
public bool IsInjected { get; private set; } public bool IsInjected { get; private set; }
public Type PropertyType => _member.FieldType; public Type PropertyType { get { return _member.FieldType; } }
public InjectedField(FieldInfo member) public InjectedField(FieldInfo member)
{ {
_member = member; _member = member;
@ -262,7 +262,7 @@ namespace DCFApixels.DragonECS
private PropertyInfo _member; private PropertyInfo _member;
private EcsInjectAttribute _injectAttribute; private EcsInjectAttribute _injectAttribute;
public bool IsInjected { get; private set; } public bool IsInjected { get; private set; }
public Type PropertyType => _member.PropertyType; public Type PropertyType { get { return _member.PropertyType; } }
public InjectedProperty(PropertyInfo member) public InjectedProperty(PropertyInfo member)
{ {
_member = member; _member = member;
@ -282,7 +282,7 @@ namespace DCFApixels.DragonECS
private EcsInjectAttribute _injectAttribute; private EcsInjectAttribute _injectAttribute;
private Type propertyType; private Type propertyType;
public bool IsInjected { get; private set; } public bool IsInjected { get; private set; }
public Type PropertyType => propertyType; public Type PropertyType { get { return propertyType; } }
public InjectedMethod(MethodInfo member) public InjectedMethod(MethodInfo member)
{ {
_member = member; _member = member;