release v3.0.4

Assets/Coffee/UIExtensions/UIEffect/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v3.0.4](https://github.com/mob-sakai/UIEffect/tree/v3.0.4) (2019-02-15)
+
+[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.3...v3.0.4)
+
+**Implemented enhancements:**
+
+- add initial play animation delay option to UIShiny [\#147](https://github.com/mob-sakai/UIEffect/pull/147) ([antpaw](https://github.com/antpaw))
+
+**Fixed bugs:**
+
+- UIEffectCapturedImage.effectColor does not work as expected [\#148](https://github.com/mob-sakai/UIEffect/issues/148)
+- fix warnings [\#146](https://github.com/mob-sakai/UIEffect/pull/146) ([antpaw](https://github.com/antpaw))
+
 ## [v3.0.3](https://github.com/mob-sakai/UIEffect/tree/v3.0.3) (2019-01-21)
 
 [Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.2...v3.0.3)

Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/EffectPlayer.cs

@@ -19,6 +19,13 @@ public class EffectPlayer
 		[Tooltip("Playing.")]
 		public bool play = false;
 
+		/// <summary>
+		/// Gets or sets the delay before looping.
+		/// </summary>
+		[Tooltip("Initial play delay.")]
+		[Range(0f, 10f)]
+		public float initialPlayDelay = 0;
+
 		/// <summary>
 		/// Gets or sets a value indicating whether can loop.
 		/// </summary>
@@ -67,7 +74,14 @@ public void OnEnable(Action<float> callback = null)
 			}
 			s_UpdateActions.Add(OnWillRenderCanvases);
 
-			_time = 0;
+			if (play)
+			{
+				_time = -initialPlayDelay;
+			}
+			else
+			{
+				_time = 0;
+			}
 			_callback = callback;
 		}
 

Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectCapturedImageEditor.cs

@@ -70,7 +70,7 @@ public override void OnInspectorGUI()
 			//================
 			GUILayout.Space(10);
 			EditorGUILayout.LabelField("Capture Effect", EditorStyles.boldLabel);
-			UIEffectEditor.DrawEffectProperties(serializedObject);
+			UIEffectEditor.DrawEffectProperties(serializedObject, "m_EffectColor");
 
 			//================
 			// Advanced option.

Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectEditor.cs

@@ -20,7 +20,7 @@ public class UIEffectEditor : Editor
 		/// <summary>
 		/// Draw effect properties.
 		/// </summary>
-		public static void DrawEffectProperties(SerializedObject serializedObject)
+		public static void DrawEffectProperties(SerializedObject serializedObject, string colorProperty = "m_Color")
 		{
 			//================
 			// Effect material.
@@ -55,7 +55,7 @@ public static void DrawEffectProperties(SerializedObject serializedObject)
 			{
 				EditorGUI.indentLevel++;
 
-				SerializedProperty spColor = serializedObject.FindProperty("m_Color");
+				SerializedProperty spColor = serializedObject.FindProperty(colorProperty);
 				if (spColor == null && serializedObject.targetObject is UIEffect) {
 					spColor = new SerializedObject (serializedObject.targetObjects.Select(x=>(x as UIEffect).targetGraphic).ToArray()).FindProperty("m_Color");
 				}

Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIShinyEditor.cs

@@ -31,6 +31,7 @@ protected void OnEnable()
 			var player = serializedObject.FindProperty("m_Player");
 			_spPlay = player.FindPropertyRelative("play");
 			_spDuration = player.FindPropertyRelative("duration");
+			_spInitialPlayDelay = player.FindPropertyRelative("initialPlayDelay");
 			_spLoop = player.FindPropertyRelative("loop");
 			_spLoopDelay = player.FindPropertyRelative("loopDelay");
 			_spUpdateMode = player.FindPropertyRelative("updateMode");
@@ -75,6 +76,10 @@ public override void OnInspectorGUI()
 			GUILayout.Space(10);
 			EditorGUILayout.LabelField("Effect Player", EditorStyles.boldLabel);
 			EditorGUILayout.PropertyField(_spPlay);
+			if (_spPlay.boolValue)
+			{
+				EditorGUILayout.PropertyField(_spInitialPlayDelay);
+			}
 			EditorGUILayout.PropertyField(_spDuration);
 			EditorGUILayout.PropertyField(_spLoop);
 			EditorGUILayout.PropertyField(_spLoopDelay);
@@ -115,6 +120,7 @@ public override void OnInspectorGUI()
 		SerializedProperty _spLoop;
 		SerializedProperty _spLoopDelay;
 		SerializedProperty _spDuration;
+		SerializedProperty _spInitialPlayDelay;
 		SerializedProperty _spUpdateMode;
 	}
 }

Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs

@@ -49,10 +49,12 @@ public class UIDissolve : UIEffectBase
 		[Header("Effect Player")]
 		[SerializeField] EffectPlayer m_Player;
 
+		#pragma warning disable 0414
 		[Obsolete][HideInInspector]
 		[SerializeField][Range(0.1f, 10)] float m_Duration = 1;
 		[Obsolete][HideInInspector]
 		[SerializeField] AnimatorUpdateMode m_UpdateMode = AnimatorUpdateMode.Normal;
+		#pragma warning restore 0414
 
 
 		//################################

Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs

@@ -55,6 +55,7 @@ public class UIEffect : UIEffectBase
 		[Tooltip("Advanced blurring remove common artifacts in the blur effect for uGUI.")]
 		[SerializeField] bool m_AdvancedBlur = false;
 
+		#pragma warning disable 0414
 		[Obsolete][HideInInspector]
 		[SerializeField][Range(0, 1)] float m_ShadowBlur = 1;
 		[Obsolete][HideInInspector]
@@ -69,6 +70,7 @@ public class UIEffect : UIEffectBase
 		[SerializeField] Color m_EffectColor = Color.white;
 		[Obsolete][HideInInspector]
 		[SerializeField] List<UIShadow.AdditionalShadow> m_AdditionalShadows = new List<UIShadow.AdditionalShadow>();
+		#pragma warning restore 0414
 
 		public enum BlurEx
 		{

Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectCapturedImage.cs

@@ -72,7 +72,7 @@ public enum DesamplingRate
 		[SerializeField] FilterMode m_FilterMode = FilterMode.Bilinear;
 
 		[Tooltip("Effect material.")]
-		[SerializeField] Material m_EffectMaterial;
+		[SerializeField] Material m_EffectMaterial = null;
 
 		[Tooltip("Blur iterations.")]
 		[FormerlySerializedAs("m_Iterations")]
@@ -254,7 +254,7 @@ protected override void OnPopulateMesh(VertexHelper vh)
 				base.OnPopulateMesh(vh);
 				int count = vh.currentVertCount;
 				UIVertex vt = default(UIVertex);
-				Color c = new Color(1, 1, 1, color.a);
+				Color c = color;
 				for (int i = 0; i < count; i++)
 				{
 					vh.PopulateUIVertex(ref vt, i);
@@ -541,6 +541,7 @@ void _Release(ref RenderTexture obj)
 		{
 			if (obj)
 			{
+				obj.Release();
 				RenderTexture.ReleaseTemporary (obj);
 				obj = null;
 			}

Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShadow.cs

@@ -69,8 +69,10 @@ public class AdditionalShadow
 		[Tooltip("Shadow effect style.")]
 		[SerializeField] ShadowStyle m_Style = ShadowStyle.Shadow;
 
+		#pragma warning disable 0414
 		[HideInInspector][System.Obsolete]
 		[SerializeField] List<AdditionalShadow> m_AdditionalShadows = new List<AdditionalShadow>();
+		#pragma warning restore 0414
 
 
 		//################################

Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs

@@ -55,6 +55,7 @@ public class UIShiny : UIEffectBase
 
 		[SerializeField] EffectPlayer m_Player;
 
+		#pragma warning disable 0414
 		[Obsolete][HideInInspector]
 		[SerializeField] bool m_Play = false;
 		[Obsolete][HideInInspector]
@@ -65,6 +66,7 @@ public class UIShiny : UIEffectBase
 		[SerializeField][Range(0, 10)] float m_LoopDelay = 1;
 		[Obsolete][HideInInspector]
 		[SerializeField] AnimatorUpdateMode m_UpdateMode = AnimatorUpdateMode.Normal;
+		#pragma warning restore 0414
 
 
 		//################################

Assets/Coffee/UIExtensions/UIEffect/package.json

@@ -2,7 +2,7 @@
   "name": "com.coffee.uieffect",
 	"displayName": "UIEffect",
 	"description": " UIEffect is an effect component for uGUI element in Unity.\nLet's decorate your UI with effects!",
-  "version": "3.0.3",
+  "version": "3.0.4",
 	"unity": "5.5",
   "license": "MIT",
   "repository": {