Upm

Samples/DemoScene/TestAssets/NaughtyScriptableObject.asset

@@ -12,9 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 753bdb918c6038142acddbd7aae6958f, type: 3}
   m_Name: NaughtyScriptableObject
   m_EditorClassIdentifier: 
-  enableMyInt: 0
-  showMyFloat: 1
-  myInt: 0
-  myFloat: 1
-  mySlider: {x: 0.25, y: 0.75}
-  list: 010000000200000003000000
+  listA:
+  - {fileID: 11400000, guid: 149474eb879a6a641b560ca17d48712f, type: 2}
+  - {fileID: 11400000, guid: 149474eb879a6a641b560ca17d48712f, type: 2}

Samples/DemoScene/TestAssets/TestScriptableObjectA.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19472ac11eae27a4b804f354ca7d9c00, type: 3}
+  m_Name: TestScriptableObjectA
+  m_EditorClassIdentifier: 
+  listB:
+  - {fileID: 11400000, guid: 05371aa7630d3ef44ac0106af06cd73c, type: 2}
+  - {fileID: 11400000, guid: 05371aa7630d3ef44ac0106af06cd73c, type: 2}

Samples/DemoScene/TestAssets/TestScriptableObjectB.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c2b396aeebc9d984da298eee313896bc, type: 3}
+  m_Name: TestScriptableObjectB
+  m_EditorClassIdentifier: 
+  slider: {x: 3, y: 7}

Scripts/Core/DrawerAttributes/AllowNestingAttribute.cs

@@ -2,8 +2,8 @@
 
 namespace NaughtyAttributes
 {
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	public class AllowNestingAttribute : DrawerAttribute
-	{
-	}
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    public class AllowNestingAttribute : DrawerAttribute
+    {
+    }
 }

Scripts/Core/DrawerAttributes/AnimatorParamAttribute.cs

@@ -3,22 +3,22 @@
 
 namespace NaughtyAttributes
 {
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	public class AnimatorParamAttribute : DrawerAttribute
-	{
-		public string AnimatorName { get; private set; }
-		public AnimatorControllerParameterType? AnimatorParamType { get; private set; }
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    public class AnimatorParamAttribute : DrawerAttribute
+    {
+        public string AnimatorName { get; private set; }
+        public AnimatorControllerParameterType? AnimatorParamType { get; private set; }
 
-		public AnimatorParamAttribute(string animatorName)
-		{
-			AnimatorName = animatorName;
-			AnimatorParamType = null;
-		}
+        public AnimatorParamAttribute(string animatorName)
+        {
+            AnimatorName = animatorName;
+            AnimatorParamType = null;
+        }
 
-		public AnimatorParamAttribute(string animatorName, AnimatorControllerParameterType animatorParamType)
-		{
-			AnimatorName = animatorName;
-			AnimatorParamType = animatorParamType;
-		}
-	}
+        public AnimatorParamAttribute(string animatorName, AnimatorControllerParameterType animatorParamType)
+        {
+            AnimatorName = animatorName;
+            AnimatorParamType = animatorParamType;
+        }
+    }
 }

Scripts/Core/DrawerAttributes/CurveRangeAttribute.cs

@@ -3,28 +3,28 @@
 
 namespace NaughtyAttributes
 {
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	public class CurveRangeAttribute : DrawerAttribute
-	{
-		public Vector2 Min { get; private set; }
-		public Vector2 Max { get; private set; }
-		public EColor Color { get; private set; }
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    public class CurveRangeAttribute : DrawerAttribute
+    {
+        public Vector2 Min { get; private set; }
+        public Vector2 Max { get; private set; }
+        public EColor Color { get; private set; }
 
-		public CurveRangeAttribute(Vector2 min, Vector2 max, EColor color = EColor.Clear)
-		{
-			Min = min;
-			Max = max;
-			Color = color;
-		}
+        public CurveRangeAttribute(Vector2 min, Vector2 max, EColor color = EColor.Clear)
+        {
+            Min = min;
+            Max = max;
+            Color = color;
+        }
 
-		public CurveRangeAttribute(EColor color)
-			: this(Vector2.zero, Vector2.one, color)
-		{
-		}
+        public CurveRangeAttribute(EColor color)
+            : this(Vector2.zero, Vector2.one, color)
+        {
+        }
 
-		public CurveRangeAttribute(float minX, float minY, float maxX, float maxY, EColor color = EColor.Clear)
-			: this(new Vector2(minX, minY), new Vector2(maxX, maxY), color)
-		{
-		}
-	}
+        public CurveRangeAttribute(float minX, float minY, float maxX, float maxY, EColor color = EColor.Clear)
+            : this(new Vector2(minX, minY), new Vector2(maxX, maxY), color)
+        {
+        }
+    }
 }

Scripts/Core/DrawerAttributes/DrawerAttribute.cs

@@ -2,10 +2,10 @@
 
 namespace NaughtyAttributes
 {
-	/// <summary>
-	/// Base class for all drawer attributes
-	/// </summary>
-	public class DrawerAttribute : PropertyAttribute, INaughtyAttribute
-	{
-	}
+    /// <summary>
+    /// Base class for all drawer attributes
+    /// </summary>
+    public class DrawerAttribute : PropertyAttribute, INaughtyAttribute
+    {
+    }
 }

Scripts/Core/DrawerAttributes/DropdownAttribute.cs

@@ -4,54 +4,54 @@
 
 namespace NaughtyAttributes
 {
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	public class DropdownAttribute : DrawerAttribute
-	{
-		public string ValuesName { get; private set; }
-
-		public DropdownAttribute(string valuesName)
-		{
-			ValuesName = valuesName;
-		}
-	}
-
-	public interface IDropdownList : IEnumerable<KeyValuePair<string, object>>
-	{
-	}
-
-	public class DropdownList<T> : IDropdownList
-	{
-		private List<KeyValuePair<string, object>> _values;
-
-		public DropdownList()
-		{
-			_values = new List<KeyValuePair<string, object>>();
-		}
-
-		public void Add(string displayName, T value)
-		{
-			_values.Add(new KeyValuePair<string, object>(displayName, value));
-		}
-
-		public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
-		{
-			return _values.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
-		public static explicit operator DropdownList<object>(DropdownList<T> target)
-		{
-			DropdownList<object> result = new DropdownList<object>();
-			foreach (var kvp in target)
-			{
-				result.Add(kvp.Key, kvp.Value);
-			}
-
-			return result;
-		}
-	}
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    public class DropdownAttribute : DrawerAttribute
+    {
+        public string ValuesName { get; private set; }
+
+        public DropdownAttribute(string valuesName)
+        {
+            ValuesName = valuesName;
+        }
+    }
+
+    public interface IDropdownList : IEnumerable<KeyValuePair<string, object>>
+    {
+    }
+
+    public class DropdownList<T> : IDropdownList
+    {
+        private List<KeyValuePair<string, object>> _values;
+
+        public DropdownList()
+        {
+            _values = new List<KeyValuePair<string, object>>();
+        }
+
+        public void Add(string displayName, T value)
+        {
+            _values.Add(new KeyValuePair<string, object>(displayName, value));
+        }
+
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        {
+            return _values.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public static explicit operator DropdownList<object>(DropdownList<T> target)
+        {
+            DropdownList<object> result = new DropdownList<object>();
+            foreach (var kvp in target)
+            {
+                result.Add(kvp.Key, kvp.Value);
+            }
+
+            return result;
+        }
+    }
 }

Scripts/Core/DrawerAttributes/EnumFlagsAttribute.cs

@@ -2,8 +2,8 @@
 
 namespace NaughtyAttributes
 {
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	public class EnumFlagsAttribute : DrawerAttribute
-	{
-	}
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    public class EnumFlagsAttribute : DrawerAttribute
+    {
+    }
 }

Scripts/Core/DrawerAttributes/Expandable.cs

@@ -2,8 +2,8 @@
 
 namespace NaughtyAttributes
 {
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	public class ExpandableAttribute : DrawerAttribute
-	{
-	}
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+    public class ExpandableAttribute : DrawerAttribute
+    {
+    }
 }

Scripts/Core/DrawerAttributes/HorizontalLineAttribute.cs

@@ -2,19 +2,19 @@
 
 namespace NaughtyAttributes
 {
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = true)]
-	public class HorizontalLineAttribute : DrawerAttribute
-	{
-		public const float DefaultHeight = 2.0f;
-		public const EColor DefaultColor = EColor.Gray;
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = true)]
+    public class HorizontalLineAttribute : DrawerAttribute
+    {
+        public const float DefaultHeight = 2.0f;
+        public const EColor DefaultColor = EColor.Gray;
 
-		public float Height { get; private set; }
-		public EColor Color { get; private set; }
+        public float Height { get; private set; }
+        public EColor Color { get; private set; }
 
-		public HorizontalLineAttribute(float height = DefaultHeight, EColor color = DefaultColor)
-		{
-			Height = height;
-			Color = color;
-		}
-	}
+        public HorizontalLineAttribute(float height = DefaultHeight, EColor color = DefaultColor)
+        {
+            Height = height;
+            Color = color;
+        }
+    }
 }

Scripts/Core/DrawerAttributes/InfoBoxAttribute.cs

@@ -2,23 +2,23 @@
 
 namespace NaughtyAttributes
 {
-	public enum EInfoBoxType
-	{
-		Normal,
-		Warning,
-		Error
-	}
+    public enum EInfoBoxType
+    {
+        Normal,
+        Warning,
+        Error
+    }
 
-	[AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = true)]
-	public class InfoBoxAttribute : DrawerAttribute
-	{
-		public string Text { get; private set; }
-		public EInfoBoxType Type { get; private set; }
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = true)]
+    public class InfoBoxAttribute : DrawerAttribute
+    {
+        public string Text { get; private set; }
+        public EInfoBoxType Type { get; private set; }
 
-		public InfoBoxAttribute(string text, EInfoBoxType type = EInfoBoxType.Normal)
-		{
-			Text = text;
-			Type = type;
-		}
-	}
+        public InfoBoxAttribute(string text, EInfoBoxType type = EInfoBoxType.Normal)
+        {
+            Text = text;
+            Type = type;
+        }
+    }
 }