11
This commit is contained in:
parent
a83bdf455c
commit
0f7d062a9f
@ -26,6 +26,7 @@ namespace UnityEngine.UI
|
|||||||
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
|
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
|
||||||
private static void Bootstrap()
|
private static void Bootstrap()
|
||||||
{
|
{
|
||||||
|
if (AppServices.App == null || AppServices.App.Require<IUIService>() == null) return;
|
||||||
EnsureInstance();
|
EnsureInstance();
|
||||||
UXInputModeService.EnsureInstance();
|
UXInputModeService.EnsureInstance();
|
||||||
}
|
}
|
||||||
@ -348,10 +349,10 @@ namespace UnityEngine.UI
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool suppress = IsScopeAvailable(scope)
|
bool suppress = IsScopeAvailable(scope)
|
||||||
&& _topScope != null
|
&& _topScope != null
|
||||||
&& !ReferenceEquals(scope, _topScope)
|
&& !ReferenceEquals(scope, _topScope)
|
||||||
&& _topScope.BlockLowerScopes
|
&& _topScope.BlockLowerScopes
|
||||||
&& CompareScopePriority(_topScope, scope) < 0;
|
&& CompareScopePriority(_topScope, scope) < 0;
|
||||||
scope.SetNavigationSuppressed(suppress);
|
scope.SetNavigationSuppressed(suppress);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user