Skip to content
This repository has been archived by the owner on Aug 24, 2024. It is now read-only.

Version 3.1.6 #126

Merged
merged 5 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ public override object GetCurrentValue()
{
var property = _container.SerializedProperty;
var objectOfProperty = property.GetValue();
var type = objectOfProperty.GetType();
Type type = null;
if (objectOfProperty == null)
{
type = GetFieldOrElementType();
return type;
}

type = objectOfProperty.GetType();
if (type == typeof(SerializedType))
{
type = (objectOfProperty as SerializedType)?.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public class SelectDrawer : BasePropertyDrawer<BaseSelectHandler, BaseSelectAttr
{
//TODO: Consider to use Locators
private Dictionary<SerializedProperty, BehavioredElement<Button>> _behavioredElements;
private Guid g = Guid.NewGuid();

public SelectDrawer()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,5 @@ namespace Samples.Models
[Serializable]
public abstract class SomeAbstractClass
{
[SerializeField] private protected int baseIntField;

public int BaseIntField => baseIntField;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,14 @@ namespace Samples.Models
public class SomeAbstractClassImplementation2 : SomeAbstractClass
{
[SerializeField] private bool boolField;

[SerializeField] private protected int baseIntField;

public int BaseIntField => baseIntField;
}

[Serializable]
public class SomeAbstractClassImplementation3 : SomeAbstractClass
{
}
}
16 changes: 16 additions & 0 deletions Assets/BetterAttributes/Samples~/TestSamples/Scripts/Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,28 @@ public class TestInner
private int testIntLog;
}

[Serializable]
public class TestSerializableType : ITestSerializableType
{
[Select(typeof(ISomeInterface))]
[SerializeField]
private List<SerializedType> serializedTypes;
}

public interface ITestSerializableType
{
}

public class Test : MonoBehaviour
{
[HideLabel] [Select(typeof(ISomeInterface))]
[SerializeField]
private SerializedType serializedType;

[Select]
[SerializeReference]
private List<ITestSerializableType> serializedTypes;

[Select(typeof(ISomeInterface))]
[SerializeField]
private SerializedType serializedType2;
Expand Down
4 changes: 2 additions & 2 deletions Assets/BetterAttributes/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "com.uurha.betterattributes",
"displayName": "Better Attributes",
"version": "3.1.5",
"version": "3.1.6",
"unity": "2021.3",
"description": "Unity attributes, allows to serialize interfaces, draw handles for Vector3/Vector2/Quaternion/Bounds, create read only fields.",
"dependencies": {
"com.tdw.better.commons" : "0.0.16",
"com.tdw.better.commons" : "0.0.26",
"com.tdw.better.internal.core" : "0.0.2"
},
"author": {
Expand Down
2 changes: 1 addition & 1 deletion Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"com.tdw.better.commons": "0.0.16",
"com.tdw.better.commons": "0.0.26",
"com.tdw.better.internal.core": "0.0.2",
"com.unity.ai.navigation": "1.1.4",
"com.unity.collab-proxy": "2.0.7",
Expand Down
2 changes: 1 addition & 1 deletion Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"com.tdw.better.commons": {
"version": "0.0.16",
"version": "0.0.26",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
Loading