modify
This commit is contained in:
parent
208bab1c7a
commit
b61e676608
@ -403,6 +403,7 @@ internal class UXButtonEditor : Editor
|
||||
break;
|
||||
|
||||
case Selectable.Transition.SpriteSwap:
|
||||
CheckAndSetColorDefaults(colorBlock, targetGraphic);
|
||||
Rect spriteRect = new Rect(position.x, y, position.width, EditorGUI.GetPropertyHeight(spriteState));
|
||||
EditorGUI.PropertyField(spriteRect, spriteState);
|
||||
break;
|
||||
@ -411,6 +412,13 @@ internal class UXButtonEditor : Editor
|
||||
EditorGUI.PropertyField(animRect, animationTriggers);
|
||||
break;
|
||||
}
|
||||
|
||||
if (graphic != null && currentTransition != (Selectable.Transition)transition.enumValueIndex &&
|
||||
(Selectable.Transition)transition.enumValueIndex == Selectable.Transition.Animation ||
|
||||
(Selectable.Transition)transition.enumValueIndex == Selectable.Transition.None)
|
||||
{
|
||||
graphic.canvasRenderer.SetColor(Color.white);
|
||||
}
|
||||
}
|
||||
|
||||
private void DrawSelfTransition()
|
||||
@ -436,6 +444,7 @@ internal class UXButtonEditor : Editor
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
EditorGUILayout.PropertyField(transition);
|
||||
|
||||
var animator = graphic != null ? graphic.GetComponent<Animator>() : null;
|
||||
@ -484,6 +493,13 @@ internal class UXButtonEditor : Editor
|
||||
break;
|
||||
}
|
||||
|
||||
if (graphic != null && currentTransition != (Selectable.Transition)transition.enumValueIndex &&
|
||||
(Selectable.Transition)transition.enumValueIndex == Selectable.Transition.Animation ||
|
||||
(Selectable.Transition)transition.enumValueIndex == Selectable.Transition.None)
|
||||
{
|
||||
graphic.canvasRenderer.SetColor(Color.white);
|
||||
}
|
||||
|
||||
EditorGUI.indentLevel--;
|
||||
EditorGUILayout.Space();
|
||||
GUILayout.EndVertical();
|
||||
@ -579,12 +595,7 @@ internal class UXButtonEditor : Editor
|
||||
var graphic = targetGraphic.objectReferenceValue as Graphic;
|
||||
if (graphic != null)
|
||||
{
|
||||
if (!EditorApplication.isPlaying)
|
||||
{
|
||||
Color color = colorBlock.FindPropertyRelative("m_NormalColor").colorValue;
|
||||
graphic.canvasRenderer.SetColor(color);
|
||||
}
|
||||
else if (m_SelectionState.enumValueIndex == 0)
|
||||
if (!EditorApplication.isPlaying && (Selectable.Transition)m_SelectionState.enumValueIndex != Selectable.Transition.Animation)
|
||||
{
|
||||
Color color = colorBlock.FindPropertyRelative("m_NormalColor").colorValue;
|
||||
graphic.canvasRenderer.SetColor(color);
|
||||
|
Loading…
Reference in New Issue
Block a user