close #135; UITransitionEffect: "Pass ray on hidden" option

This commit is contained in:
mob-sakai
2018-10-06 21:31:09 +09:00
parent b9e0da1316
commit c9809ff1f4
2 changed files with 12 additions and 5 deletions
@@ -23,11 +23,7 @@ namespace Coffee.UIExtensions
SerializedProperty _spTransitionTexture;
SerializedProperty _spDuration;
SerializedProperty _spUpdateMode;
SerializedProperty _spPassRayOnHidden;
//################################
@@ -50,6 +46,7 @@ namespace Coffee.UIExtensions
var player = serializedObject.FindProperty("m_Player");
_spDuration = player.FindPropertyRelative("duration");
_spUpdateMode = player.FindPropertyRelative("updateMode");
_spPassRayOnHidden = serializedObject.FindProperty("m_PassRayOnHidden");
}
@@ -91,6 +88,7 @@ namespace Coffee.UIExtensions
EditorGUILayout.PropertyField(_spEffectArea);
EditorGUILayout.PropertyField(_spTransitionTexture);
EditorGUILayout.PropertyField(_spKeepAspectRatio);
EditorGUILayout.PropertyField(_spPassRayOnHidden);
//================
// Effect runner.
@@ -53,6 +53,9 @@ namespace Coffee.UIExtensions
[Tooltip("Dissolve edge color.")]
[SerializeField] [ColorUsage(false)] Color m_DissolveColor = new Color(0.0f, 0.25f, 1.0f);
[Tooltip("Disable graphic's raycast target on hidden.")]
[SerializeField] bool m_PassRayOnHidden;
[Header("Effect Player")]
[SerializeField] EffectPlayer m_Player;
@@ -317,6 +320,12 @@ namespace Coffee.UIExtensions
ptex.SetData(this, 5, m_DissolveColor.g); // param2.y : green
ptex.SetData(this, 6, m_DissolveColor.b); // param2.z : blue
}
// Disable graphic's raycastTarget on hidden.
if (m_PassRayOnHidden)
{
graphic.raycastTarget = 0 < m_EffectFactor;
}
}
#if UNITY_EDITOR