diff --git a/Assets/GameMain/Scripts/Presentation/Common/Dialog/DialogController.cs b/Assets/GameMain/Scripts/Presentation/Common/Dialog/DialogController.cs index b59b5fc..05add67 100644 --- a/Assets/GameMain/Scripts/Presentation/Common/Dialog/DialogController.cs +++ b/Assets/GameMain/Scripts/Presentation/Common/Dialog/DialogController.cs @@ -41,7 +41,7 @@ namespace SepCore.UI }; } - public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) + public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { if (userData is not DialogRawData rawData) { @@ -54,14 +54,14 @@ namespace SepCore.UI Log.Warning("DialogController.OpenUIAsync() rawData is required."); } - return null; + return; } DialogContext context = BuildContext(rawData); if (context == null) { Log.Warning("DialogController.OpenUIAsync() rawData is invalid."); - return null; + return; } _onClickConfirmGFAction = rawData.OnClickConfirm; @@ -69,7 +69,7 @@ namespace SepCore.UI _onClickOtherGFAction = rawData.OnClickOther; _currentUserData = rawData.UserData; - return await OpenFormAsync(context, timeout); + await OpenFormAsync(context, timeout); } public override async UniTask CloseUIAsync(object userData = null, float timeout = 30f) diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs index 2bb9728..aa6a8fe 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs @@ -46,7 +46,7 @@ namespace SepCore.UI return new DisplayItemInfoContext(rawData); } - public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) + public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { if (userData is not DisplayItemInfoRawData rawData) { @@ -59,18 +59,18 @@ namespace SepCore.UI Log.Warning("DisplayItemInfoController.OpenUIAsync() rawData is required."); } - return null; + return; } DisplayItemInfoContext context = BuildContext(rawData); if (context == null) { Log.Warning("DisplayItemInfoController.OpenUIAsync() rawData is invalid."); - return null; + return; } _locked = false; - return await OpenFormAsync(context, timeout); + await OpenFormAsync(context, timeout); } public override async UniTask CloseUIAsync(object userData = null, float timeout = 30f) diff --git a/Assets/GameMain/Scripts/Presentation/Main/Hud/HudController.cs b/Assets/GameMain/Scripts/Presentation/Main/Hud/HudController.cs index c534034..e14f28f 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Hud/HudController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Hud/HudController.cs @@ -18,15 +18,15 @@ namespace SepCore.UI return new HudContext(); } - public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) + public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { if (userData != null) { Log.Warning("HudController.OpenUIAsync() userData type is invalid."); - return null; + return; } - return await OpenFormAsync(BuildHudContext(), timeout); + await OpenFormAsync(BuildHudContext(), timeout); } public override void BindUseCase(IUIUseCase useCase) diff --git a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs index f3bd461..4c10af5 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs @@ -57,7 +57,7 @@ namespace SepCore.UI { Title = reward.Title, Icon = null, - ItemRarity = reward.Rarity, + ItemRarity = reward.Rarity, Description = ItemDescUtility.CreatePropDescription(reward.Modifiers), IconAssetName = reward.IconAssetName }); @@ -70,27 +70,27 @@ namespace SepCore.UI }; } - public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) + public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { if (userData is LevelUpRawData rawData) { - return await OpenUIAsync(rawData, timeout); + await OpenUIAsync(rawData, timeout); } if (userData != null) { Log.Warning("LevelUpController.OpenUIAsync() userData type is invalid."); - return null; + return; } if (_useCase == null) { Log.Error("LevelUpController.OpenUIAsync() useCase is null."); - return null; + return; } LevelUpRawData initialRawData = _useCase.CreateInitialModel(); - return await OpenUIAsync(initialRawData, timeout); + await OpenUIAsync(initialRawData, timeout); } public async UniTask OpenUIAsync(LevelUpRawData rawData, float timeout = 30f) diff --git a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs index c91307f..7439e09 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs @@ -218,27 +218,27 @@ namespace SepCore.UI return await OpenFormAsync(context, timeout); } - public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) + public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { if (userData is ShopRawData rawData) { - return await OpenUIAsync(rawData, timeout); + await OpenUIAsync(rawData, timeout); } if (userData != null) { Log.Warning("ShopController.OpenUIAsync() userData type is invalid."); - return null; + return; } if (_useCase == null) { Log.Error("ShopController.OpenUIAsync() useCase is null."); - return null; + return; } ShopRawData initialRawData = _useCase.CreateInitialModel(); - return await OpenUIAsync(initialRawData, timeout); + await OpenUIAsync(initialRawData, timeout); } public override void BindUseCase(IUIUseCase useCase) @@ -272,7 +272,8 @@ namespace SepCore.UI for (int i = 0; i < result.GoodsItems.Count; i++) { - if (i < Context.GoodsItems.Count) Context.GoodsItems[i] = await GoodsItemContext.CreateAsync(result.GoodsItems[i]); + if (i < Context.GoodsItems.Count) + Context.GoodsItems[i] = await GoodsItemContext.CreateAsync(result.GoodsItems[i]); else Context.GoodsItems.Add(await GoodsItemContext.CreateAsync(result.GoodsItems[i])); } diff --git a/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs b/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs index 500861e..a165d53 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs @@ -40,15 +40,15 @@ namespace SepCore.UI return new MenuContext(); } - public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) + public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { if (userData != null) { Log.Warning("MenuController.OpenUIAsync() userData type is invalid."); - return null; + return; } - return await OpenFormAsync(BuildMenuContext(), timeout); + await OpenFormAsync(BuildMenuContext(), timeout); } public override void BindUseCase(IUIUseCase useCase) diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs index dce580f..7860ebd 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleController.cs @@ -73,27 +73,27 @@ namespace SepCore.UI }; } - public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) + public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { if (userData is SelectRoleRawData rawData) { - return await OpenUIAsync(rawData, timeout); + await OpenUIAsync(rawData, timeout); } if (userData != null) { Log.Warning("SelectRoleController.OpenUIAsync() userData type is invalid."); - return null; + return; } if (_useCase == null) { Log.Error("SelectRoleController.OpenUIAsync() useCase is null."); - return null; + return; } SelectRoleRawData initialRawData = _useCase.CreateModel(); - return await OpenUIAsync(initialRawData, timeout); + await OpenUIAsync(initialRawData, timeout); } public async UniTask OpenUIAsync(SelectRoleRawData rawData, float timeout = 30f) diff --git a/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs b/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs index e0b7bc2..12a20ef 100644 --- a/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs +++ b/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs @@ -23,11 +23,11 @@ namespace SepCore.Procedure #region FSM - protected override async void OnEnter(ProcedureOwner procedureOwner) + protected override void OnEnter(ProcedureOwner procedureOwner) { base.OnEnter(procedureOwner); - await GameEntry.UIRouter.OpenUIAsync(UIFormType.MenuForm); + GameEntry.UIRouter.OpenUIAsync(UIFormType.MenuForm); var useCase = new SelectRoleUseCase(StartGame); GameEntry.UIRouter.BindUIUseCase(UIFormType.SelectRoleForm, useCase); diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs index 7e5e47a..c110278 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs @@ -66,12 +66,12 @@ namespace SepCore.UIRouter controller.BindUseCase(useCase); } - public UniTask OpenUIAsync(UIFormType uiFormType, object userData = null, float timeout = 30f) + public UniTask OpenUIAsync(UIFormType uiFormType, object userData = null, float timeout = 30f) { IUIFormController controller = GetOrCreateController(uiFormType); if (controller == null) { - return UniTask.FromResult(null); + return default; } return controller.OpenUIAsync(userData, timeout); diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs index 2d656eb..d73d09f 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs @@ -4,7 +4,7 @@ namespace SepCore.UI { public interface IUIFormController { - UniTask OpenUIAsync(object userData = null, float timeout = 30f); + UniTask OpenUIAsync(object userData = null, float timeout = 30f); UniTask CloseUIAsync(object userData = null, float timeout = 30f); diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs index 920e0be..92f4bde 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs @@ -100,7 +100,7 @@ namespace SepCore.UI } } - public abstract UniTask OpenUIAsync(object userData = null, float timeout = 30f); + public abstract UniTask OpenUIAsync(object userData = null, float timeout = 30f); public virtual UniTask CloseUIAsync(object userData = null, float timeout = 30f) {