This commit is contained in:
陈思海 2025-12-17 14:20:57 +08:00
parent e08a7aeefa
commit 13eb84d289

View File

@ -453,7 +453,7 @@ namespace UnityEngine.UI
public virtual UXSelectable FindSelectableOnLeft() public virtual UXSelectable FindSelectableOnLeft()
{ {
if (m_Navigation.mode == UXNavigation.Mode.Explicit) if (m_Navigation.mode == UXNavigation.Mode.Explicit)
if (m_Navigation.selectOnLeft.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None) if (m_Navigation.selectOnLeft != null && m_Navigation.selectOnLeft.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
return m_Navigation.selectOnLeft; return m_Navigation.selectOnLeft;
if ((m_Navigation.mode & UXNavigation.Mode.Horizontal) != 0) if ((m_Navigation.mode & UXNavigation.Mode.Horizontal) != 0)
@ -464,7 +464,7 @@ namespace UnityEngine.UI
public virtual UXSelectable FindSelectableOnRight() public virtual UXSelectable FindSelectableOnRight()
{ {
if (m_Navigation.mode == UXNavigation.Mode.Explicit) if (m_Navigation.mode == UXNavigation.Mode.Explicit)
if (m_Navigation.selectOnRight.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None) if (m_Navigation.selectOnRight != null && m_Navigation.selectOnRight.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
return m_Navigation.selectOnRight; return m_Navigation.selectOnRight;
if ((m_Navigation.mode & UXNavigation.Mode.Horizontal) != 0) if ((m_Navigation.mode & UXNavigation.Mode.Horizontal) != 0)
return FindSelectable(transform.rotation * Vector3.right); return FindSelectable(transform.rotation * Vector3.right);
@ -474,7 +474,7 @@ namespace UnityEngine.UI
public virtual UXSelectable FindSelectableOnUp() public virtual UXSelectable FindSelectableOnUp()
{ {
if (m_Navigation.mode == UXNavigation.Mode.Explicit) if (m_Navigation.mode == UXNavigation.Mode.Explicit)
if (m_Navigation.selectOnUp.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None) if (m_Navigation.selectOnUp != null && m_Navigation.selectOnUp.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
return m_Navigation.selectOnUp; return m_Navigation.selectOnUp;
if ((m_Navigation.mode & UXNavigation.Mode.Vertical) != 0) if ((m_Navigation.mode & UXNavigation.Mode.Vertical) != 0)
return FindSelectable(transform.rotation * Vector3.up); return FindSelectable(transform.rotation * Vector3.up);
@ -484,7 +484,7 @@ namespace UnityEngine.UI
public virtual UXSelectable FindSelectableOnDown() public virtual UXSelectable FindSelectableOnDown()
{ {
if (m_Navigation.mode == UXNavigation.Mode.Explicit) if (m_Navigation.mode == UXNavigation.Mode.Explicit)
if (m_Navigation.selectOnDown.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None) if (m_Navigation.selectOnDown != null && m_Navigation.selectOnDown.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
return m_Navigation.selectOnDown; return m_Navigation.selectOnDown;
if ((m_Navigation.mode & UXNavigation.Mode.Vertical) != 0) if ((m_Navigation.mode & UXNavigation.Mode.Vertical) != 0)
return FindSelectable(transform.rotation * Vector3.down); return FindSelectable(transform.rotation * Vector3.down);