basil/vampire-like
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整 UIRouter 的打开关闭 UI 的返回值，统一成 UniTask

Browse Source
This commit is contained in:
SepComet
2026-06-06 13:33:33 +08:00
parent 7ac38cd999
commit 788f717335
11 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs
+4 -4
View File
@@ -46,7 +46,7 @@ namespace SepCore.UI
return new DisplayItemInfoContext(rawData);
}
public override async UniTask<int?> 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)
Assets/GameMain/Scripts/Presentation/Main/Hud/HudController.cs
+3 -3
View File
@@ -18,15 +18,15 @@ namespace SepCore.UI
return new HudContext();
}
public override async UniTask<int?> 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)
Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs
+6 -6
View File
@@ -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<int?> 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<int?> OpenUIAsync(LevelUpRawData rawData, float timeout = 30f)
Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs
+7 -6
View File
@@ -218,27 +218,27 @@ namespace SepCore.UI
return await OpenFormAsync(context, timeout);
}
public override async UniTask<int?> 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]));
}