This commit is contained in:
陈思海 2025-07-29 15:38:36 +08:00
parent 208bab1c7a
commit b61e676608

View File

@ -403,6 +403,7 @@ internal class UXButtonEditor : Editor
break; break;
case Selectable.Transition.SpriteSwap: case Selectable.Transition.SpriteSwap:
CheckAndSetColorDefaults(colorBlock, targetGraphic);
Rect spriteRect = new Rect(position.x, y, position.width, EditorGUI.GetPropertyHeight(spriteState)); Rect spriteRect = new Rect(position.x, y, position.width, EditorGUI.GetPropertyHeight(spriteState));
EditorGUI.PropertyField(spriteRect, spriteState); EditorGUI.PropertyField(spriteRect, spriteState);
break; break;
@ -411,6 +412,13 @@ internal class UXButtonEditor : Editor
EditorGUI.PropertyField(animRect, animationTriggers); EditorGUI.PropertyField(animRect, animationTriggers);
break; 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() private void DrawSelfTransition()
@ -436,6 +444,7 @@ internal class UXButtonEditor : Editor
break; break;
} }
EditorGUILayout.PropertyField(transition); EditorGUILayout.PropertyField(transition);
var animator = graphic != null ? graphic.GetComponent<Animator>() : null; var animator = graphic != null ? graphic.GetComponent<Animator>() : null;
@ -484,6 +493,13 @@ internal class UXButtonEditor : Editor
break; 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--; EditorGUI.indentLevel--;
EditorGUILayout.Space(); EditorGUILayout.Space();
GUILayout.EndVertical(); GUILayout.EndVertical();
@ -579,12 +595,7 @@ internal class UXButtonEditor : Editor
var graphic = targetGraphic.objectReferenceValue as Graphic; var graphic = targetGraphic.objectReferenceValue as Graphic;
if (graphic != null) if (graphic != null)
{ {
if (!EditorApplication.isPlaying) if (!EditorApplication.isPlaying && (Selectable.Transition)m_SelectionState.enumValueIndex != Selectable.Transition.Animation)
{
Color color = colorBlock.FindPropertyRelative("m_NormalColor").colorValue;
graphic.canvasRenderer.SetColor(color);
}
else if (m_SelectionState.enumValueIndex == 0)
{ {
Color color = colorBlock.FindPropertyRelative("m_NormalColor").colorValue; Color color = colorBlock.FindPropertyRelative("m_NormalColor").colorValue;
graphic.canvasRenderer.SetColor(color); graphic.canvasRenderer.SetColor(color);