This commit is contained in:
陈思海 2025-12-17 14:16:48 +08:00
parent 85d9a87ccb
commit e08a7aeefa

View File

@ -453,7 +453,9 @@ 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)
return m_Navigation.selectOnLeft; if (m_Navigation.selectOnLeft.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
return m_Navigation.selectOnLeft;
if ((m_Navigation.mode & UXNavigation.Mode.Horizontal) != 0) if ((m_Navigation.mode & UXNavigation.Mode.Horizontal) != 0)
return FindSelectable(transform.rotation * Vector3.left); return FindSelectable(transform.rotation * Vector3.left);
return null; return null;
@ -462,7 +464,8 @@ 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)
return m_Navigation.selectOnRight; if (m_Navigation.selectOnRight.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
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);
return null; return null;
@ -471,7 +474,8 @@ 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)
return m_Navigation.selectOnUp; if (m_Navigation.selectOnUp.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
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);
return null; return null;
@ -480,7 +484,8 @@ 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)
return m_Navigation.selectOnDown; if (m_Navigation.selectOnDown.IsInteractable() && m_Navigation.mode != UXNavigation.Mode.None)
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);
return null; return null;