diff --git a/GFramework.Game/UI/UiRouterBase.cs b/GFramework.Game/UI/UiRouterBase.cs index ede1b51b..1da37e6c 100644 --- a/GFramework.Game/UI/UiRouterBase.cs +++ b/GFramework.Game/UI/UiRouterBase.cs @@ -101,10 +101,10 @@ public abstract class UiRouterBase : RouterBase { - await BeforeChangeAsync(@event); - await DoPushPageInternalAsync(uiKey, param, policy); - await AfterChangeAsync(@event); - }); + await BeforeChangeAsync(@event).ConfigureAwait(true); + await DoPushPageInternalAsync(uiKey, param, policy).ConfigureAwait(true); + await AfterChangeAsync(@event).ConfigureAwait(true); + }).ConfigureAwait(true); } /// @@ -129,10 +129,10 @@ public abstract class UiRouterBase : RouterBase { - await BeforeChangeAsync(@event); + await BeforeChangeAsync(@event).ConfigureAwait(true); DoPushPageInternal(page, param, policy); - await AfterChangeAsync(@event); - }); + await AfterChangeAsync(@event).ConfigureAwait(true); + }).ConfigureAwait(true); } /// @@ -149,7 +149,7 @@ public abstract class UiRouterBase : RouterBase { - await BeforeChangeAsync(@event); + await BeforeChangeAsync(@event).ConfigureAwait(true); DoPopInternal(policy); - await AfterChangeAsync(@event); - }); + await AfterChangeAsync(@event).ConfigureAwait(true); + }).ConfigureAwait(true); } /// @@ -182,15 +182,15 @@ public abstract class UiRouterBase : RouterBase { - await BeforeChangeAsync(@event); + await BeforeChangeAsync(@event).ConfigureAwait(true); DoClearInternal(popPolicy); var page = _factory.Create(uiKey); Log.Debug("Get/Create UI Page instance for Replace: {0}", page.GetType().Name); DoPushPageInternal(page, param, pushPolicy); - await AfterChangeAsync(@event); - }); + await AfterChangeAsync(@event).ConfigureAwait(true); + }).ConfigureAwait(true); } /// @@ -211,12 +211,12 @@ public abstract class UiRouterBase : RouterBase { - await BeforeChangeAsync(@event); + await BeforeChangeAsync(@event).ConfigureAwait(true); DoClearInternal(popPolicy); Log.Debug("Use existing UI Page instance for Replace: {0}", page.GetType().Name); DoPushPageInternal(page, param, pushPolicy); - await AfterChangeAsync(@event); - }); + await AfterChangeAsync(@event).ConfigureAwait(true); + }).ConfigureAwait(true); } /// @@ -229,10 +229,10 @@ public abstract class UiRouterBase : RouterBase { - await BeforeChangeAsync(@event); + await BeforeChangeAsync(@event).ConfigureAwait(true); DoClearInternal(UiPopPolicy.Destroy); - await AfterChangeAsync(@event); - }); + await AfterChangeAsync(@event).ConfigureAwait(true); + }).ConfigureAwait(true); } /// @@ -650,7 +650,7 @@ public abstract class UiRouterBase : RouterBase过渡策略 private async Task DoPushPageInternalAsync(string uiKey, IUiPageEnterParam? param, UiTransitionPolicy policy) { - if (!await ExecuteEnterGuardsAsync(uiKey, param)) + if (!await ExecuteEnterGuardsAsync(uiKey, param).ConfigureAwait(true)) { Log.Warn("Push blocked by guard: {0}", uiKey); return;