mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-21 02:12:37 +08:00
fix #183; UIDissolve's "Reverse Play" option works only in OnEnable
This commit is contained in:
@@ -36,7 +36,7 @@ namespace Coffee.UIExtensions.Editors
|
||||
_spColorMode = serializedObject.FindProperty("m_ColorMode");
|
||||
_spNoiseTexture = serializedObject.FindProperty("m_NoiseTexture");
|
||||
_spKeepAspectRatio = serializedObject.FindProperty("m_KeepAspectRatio");
|
||||
_spReverseAnimation = serializedObject.FindProperty("m_ReverseAnimation");
|
||||
_spReverse = serializedObject.FindProperty("m_Reverse");
|
||||
var player = serializedObject.FindProperty("m_Player");
|
||||
_spPlay = player.FindPropertyRelative("play");
|
||||
_spDuration = player.FindPropertyRelative("duration");
|
||||
@@ -119,7 +119,7 @@ namespace Coffee.UIExtensions.Editors
|
||||
EditorGUILayout.PropertyField(_spLoop);
|
||||
EditorGUILayout.PropertyField(_spLoopDelay);
|
||||
EditorGUILayout.PropertyField(_spUpdateMode);
|
||||
EditorGUILayout.PropertyField(_spReverseAnimation);
|
||||
EditorGUILayout.PropertyField(_spReverse);
|
||||
|
||||
// Debug.
|
||||
using (new EditorGUI.DisabledGroupScope(!Application.isPlaying))
|
||||
@@ -166,7 +166,7 @@ namespace Coffee.UIExtensions.Editors
|
||||
SerializedProperty _spNoiseTexture;
|
||||
SerializedProperty _spEffectArea;
|
||||
SerializedProperty _spKeepAspectRatio;
|
||||
SerializedProperty _spReverseAnimation;
|
||||
SerializedProperty _spReverse;
|
||||
SerializedProperty _spPlay;
|
||||
SerializedProperty _spLoop;
|
||||
SerializedProperty _spLoopDelay;
|
||||
|
||||
@@ -50,8 +50,9 @@ namespace Coffee.UIExtensions
|
||||
[Header("Effect Player")]
|
||||
[SerializeField] EffectPlayer m_Player;
|
||||
|
||||
[HideInInspector]
|
||||
[SerializeField] bool m_ReverseAnimation = false;
|
||||
[Tooltip("Reverse the dissolve effect.")]
|
||||
[FormerlySerializedAs("m_ReverseAnimation")]
|
||||
[SerializeField] bool m_Reverse = false;
|
||||
|
||||
#pragma warning disable 0414
|
||||
[Obsolete][HideInInspector]
|
||||
@@ -234,6 +235,11 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
public AnimatorUpdateMode updateMode { get { return _player.updateMode; } set { _player.updateMode = value; } }
|
||||
|
||||
/// <summary>
|
||||
/// Reverse the dissolve effect.
|
||||
/// </summary>
|
||||
public bool reverse { get { return m_Reverse; } set { m_Reverse = value; } }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the parameter texture.
|
||||
/// </summary>
|
||||
@@ -370,20 +376,11 @@ namespace Coffee.UIExtensions
|
||||
protected override void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
if (m_ReverseAnimation)
|
||||
|
||||
_player.OnEnable((f) =>
|
||||
{
|
||||
_player.OnEnable((f) =>
|
||||
{
|
||||
effectFactor = 1f - f;
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
_player.OnEnable((f) =>
|
||||
{
|
||||
effectFactor = f;
|
||||
});
|
||||
}
|
||||
effectFactor = m_Reverse ? 1f - f : f;
|
||||
});
|
||||
}
|
||||
|
||||
protected override void OnDisable()
|
||||
|
||||
Reference in New Issue
Block a user