release v3.0.1

mob-sakai · Nov 7, 2018 · 99375cc · 99375cc
2 parents 5ff0de7 + a13f470
commit 99375cc
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 15 deletions.
diff --git a/Assets/Coffee/UIExtensions/UIEffect/Demo/UIEffect_Demo.cs b/Assets/Coffee/UIExtensions/UIEffect/Demo/UIEffect_Demo.cs
@@ -7,7 +7,7 @@ namespace Coffee.UIExtensions
 {
 	public class UIEffect_Demo : MonoBehaviour
 	{
-		[SerializeField] RectMask2D mask;
+		[SerializeField] RectMask2D mask = null;
 
 		// Use this for initialization
 		void Start()

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Demo/UIEffect_Demo_Dialog.cs b/Assets/Coffee/UIExtensions/UIEffect/Demo/UIEffect_Demo_Dialog.cs
@@ -7,7 +7,7 @@ namespace Coffee.UIExtensions
 {
 	public class UIEffect_Demo_Dialog : MonoBehaviour
 	{
-		[SerializeField] Animator m_Animator;
+		[SerializeField] Animator m_Animator = null;
 
 		public void Open()
 		{

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIDissolveEditor.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIDissolveEditor.cs
@@ -109,7 +109,6 @@ public override void OnInspectorGUI()
 		SerializedProperty _spNoiseTexture;
 		SerializedProperty _spEffectArea;
 		SerializedProperty _spKeepAspectRatio;
-		SerializedProperty _spPlay;
 		SerializedProperty _spDuration;
 		SerializedProperty _spUpdateMode;
 	}

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectEditor.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectEditor.cs
@@ -62,7 +62,11 @@ public static void DrawEffectProperties(SerializedObject serializedObject)
 
 				EditorGUI.BeginChangeCheck ();
 				EditorGUI.showMixedValue = spColor.hasMultipleDifferentValues;
+#if UNITY_2018_1_OR_NEWER
+				spColor.colorValue = EditorGUILayout.ColorField (contentEffectColor, spColor.colorValue, true, false, false);
+#else
 				spColor.colorValue = EditorGUILayout.ColorField (contentEffectColor, spColor.colorValue, true, false, false, null);
+#endif
 				if (EditorGUI.EndChangeCheck ()) {
 					spColor.serializedObject.ApplyModifiedProperties ();
 				}

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs
@@ -49,8 +49,6 @@ public class UIDissolve : UIEffectBase
 		[Header("Effect Player")]
 		[SerializeField] EffectPlayer m_Player;
 
-		[Obsolete][HideInInspector]
-		[SerializeField] bool m_Play;
 		[Obsolete][HideInInspector]
 		[SerializeField][Range(0.1f, 10)] float m_Duration = 1;
 		[Obsolete][HideInInspector]

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs
@@ -44,13 +44,13 @@ public class UIEffect : UIEffectBase
 
 		[FormerlySerializedAs("m_ToneMode")]
 		[Tooltip("Effect mode")]
-		[SerializeField] EffectMode m_EffectMode;
+		[SerializeField] EffectMode m_EffectMode = EffectMode.None;
 
 		[Tooltip("Color effect mode")]
-		[SerializeField] ColorMode m_ColorMode;
+		[SerializeField] ColorMode m_ColorMode = ColorMode.Multiply;
 
 		[Tooltip("Blur effect mode")]
-		[SerializeField] BlurMode m_BlurMode;
+		[SerializeField] BlurMode m_BlurMode = BlurMode.None;
 
 		[Tooltip("Advanced blurring remove common artifacts in the blur effect for uGUI.")]
 		[SerializeField] bool m_AdvancedBlur = false;

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectCapturedImage.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectCapturedImage.cs
@@ -51,13 +51,13 @@ public enum DesamplingRate
 
 		[Tooltip("Effect mode.")]
 		[FormerlySerializedAs("m_ToneMode")]
-		[SerializeField] EffectMode m_EffectMode;
+		[SerializeField] EffectMode m_EffectMode = EffectMode.None;
 
 		[Tooltip("Color effect mode.")]
-		[SerializeField] ColorMode m_ColorMode;
+		[SerializeField] ColorMode m_ColorMode = ColorMode.Multiply;
 
 		[Tooltip("Blur effect mode.")]
-		[SerializeField] BlurMode m_BlurMode;
+		[SerializeField] BlurMode m_BlurMode = BlurMode.DetailBlur;
 
 		[Tooltip("Color for the color effect.")]
 		[SerializeField] Color m_EffectColor = Color.white;

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShadow.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShadow.cs
@@ -127,8 +127,6 @@ public ShadowStyle style
 		public ParameterTexture ptex{ get; private set; }
 
 		int _graphicVertexCount;
-		int _start;
-		int _end;
 		static readonly List<UIShadow> tmpShadows = new List<UIShadow>();
 
 		protected override void OnEnable()

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UITransitionEffect.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UITransitionEffect.cs
@@ -39,7 +39,7 @@ public enum EffectMode
 		[SerializeField] Texture m_TransitionTexture;
 
 		[Tooltip("The area for effect.")]
-		[SerializeField] EffectArea m_EffectArea;
+		[SerializeField] EffectArea m_EffectArea = EffectArea.RectTransform;
 
 		[Tooltip("Keep effect aspect ratio.")]
 		[SerializeField] bool m_KeepAspectRatio;
@@ -179,6 +179,11 @@ public Color dissolveColor
 		/// </summary>
 		public float duration { get { return _player.duration; } set { _player.duration = Mathf.Max(value, 0.1f); } }
 
+		/// <summary>
+		/// Disable graphic's raycast target on hidden.
+		/// </summary>
+		public bool passRayOnHidden { get { return m_PassRayOnHidden; } set { m_PassRayOnHidden = value; } }
+
 		/// <summary>
 		/// Update mode for showing/hiding.
 		/// </summary>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [v3.0.1](https://github.com/mob-sakai/UIEffect/tree/v3.0.1) (2018-11-07)
+
+[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.0...v3.0.1)
+
+**Fixed bugs:**
+
+- Compile error in 2018.3 [\#139](https://github.com/mob-sakai/UIEffect/issues/139)
+
 ## [v3.0.0](https://github.com/mob-sakai/UIEffect/tree/v3.0.0) (2018-10-10)
 
 [Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.3...v3.0.0)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "UIEffect",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mob-sakai/UIEffect.git"