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

调整 SpriteCache 的读取资源方式 

将原来 UGF 事件回调风格的调用改成使用 UniTask 的异步操作
This commit is contained in:
SepComet 2026-06-04 22:37:55 +08:00
parent 117dd123de
commit 170ea690b2
8 changed files with 88 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs
View File

@ -1,3 +1,4 @@
using Cysharp.Threading.Tasks;
using SepCore.Event;
using UnityEngine;
using UnityEngine.UI;
@ -10,7 +11,7 @@ namespace SepCore.UI
private RoleItemContext _context = null;
public void OnInit(RoleItemContext context)
public async UniTaskVoid OnInit(RoleItemContext context)
{
_context = context;
if (_context == null || string.IsNullOrEmpty(_context.IconName))
@ -18,7 +19,7 @@ namespace SepCore.UI
return;
}
GameEntry.SpriteCache.GetSprite(_context.IconName, sprite => _roleImage.sprite = sprite);
_roleImage.sprite = await GameEntry.SpriteCache.GetSprite(_context.IconName);
}
public void OnReset()

39
Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs
View File

@ -1,3 +1,4 @@
using Cysharp.Threading.Tasks;
using SepCore.CustomUtility;
using SepCore.DataTable;
using SepCore.Definition;
@ -24,31 +25,37 @@ namespace SepCore.UI
ItemType = ItemType.None;
}
public GoodsItemContext(GoodsItemRawData rawData)
public static async UniTask<GoodsItemContext> CreateAsync(GoodsItemRawData rawData)
{
Price = rawData.Price;
Rarity = rawData.Rarity;
ItemType = rawData.ItemType;
if (ItemType == ItemType.None)
var context = new GoodsItemContext
{
Description = string.Empty;
Icon = null;
Title = string.Empty;
Price = rawData.Price,
Rarity = rawData.Rarity,
ItemType = rawData.ItemType
};
if (context.ItemType == ItemType.None)
{
context.Description = string.Empty;
context.Icon = null;
context.Title = string.Empty;
}
else if (ItemType == ItemType.Weapon)
else if (context.ItemType == ItemType.Weapon)
{
var weapon = (DRWeapon)rawData.DataRow;
Title = weapon.Title;
Description = ItemDescUtility.CreateWeaponDescription(weapon);
GameEntry.SpriteCache.GetSprite(weapon.IconAssetName, sprite => Icon = sprite);
context.Title = weapon.Title;
context.Description = ItemDescUtility.CreateWeaponDescription(weapon);
context.Icon = await GameEntry.SpriteCache.GetSprite(weapon.IconAssetName);
}
else
{
var prop = (DRProp)rawData.DataRow;
Title = prop.Title;
Description = ItemDescUtility.CreatePropDescription(prop.Modifiers);
GameEntry.SpriteCache.GetSprite(prop.IconAssetName, sprite => Icon = sprite);
}
context.Title = prop.Title;
context.Description = ItemDescUtility.CreatePropDescription(prop.Modifiers);
context.Icon = await GameEntry.SpriteCache.GetSprite(prop.IconAssetName);
}
return context;
}
}
}

12
Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs
View File

@ -1,4 +1,5 @@
using System;
using Cysharp.Threading.Tasks;
using SepCore.Event;
using TMPro;
using UnityEngine;
@ -36,7 +37,7 @@ namespace SepCore.UI
private Vector3 _targetPos;
public void RefreshUI(DisplayItemInfoContext context)
public async UniTaskVoid RefreshUI(DisplayItemInfoContext context)
{
if (context == null)
{
@ -64,21 +65,16 @@ namespace SepCore.UI
_recycleButton.gameObject.SetActive(_context.ItemType == ItemType.Weapon);
}
if (_iconArea != null)
{
if (!string.IsNullOrEmpty(_context.IconAssetName))
if (_iconArea != null && !string.IsNullOrEmpty(_context.IconAssetName))
{
string iconAssetName = _context.IconAssetName;
GameEntry.SpriteCache.GetSprite(iconAssetName, sprite =>
{
var sprite = await GameEntry.SpriteCache.GetSprite(iconAssetName);
if (_context != null && _context.IconAssetName == iconAssetName)
{
_iconArea.OnInit(sprite, context.Rarity);
ResizeToFitContent();
ApplyClampedTargetPos();
}
});
}
}
ResizeToFitContent();

16
Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs
View File

@ -42,7 +42,7 @@ namespace SepCore.UI
#region BuildContext
private ShopContext BuildContext(ShopRawData rawData)
private async UniTask<ShopContext> BuildContext(ShopRawData rawData)
{
if (rawData == null)
{
@ -55,7 +55,7 @@ namespace SepCore.UI
List<GoodsItemContext> goodsItems = new List<GoodsItemContext>();
foreach (var item in rawData.GoodsItems)
{
goodsItems.Add(new GoodsItemContext(item));
goodsItems.Add(await GoodsItemContext.CreateAsync(item));
}
return new ShopContext
@ -214,7 +214,7 @@ namespace SepCore.UI
public async UniTask<int?> OpenUIAsync(ShopRawData rawData, float timeout = 30f)
{
ShopContext context = BuildContext(rawData);
ShopContext context = await BuildContext(rawData);
return await OpenFormAsync(context, timeout);
}
@ -256,7 +256,7 @@ namespace SepCore.UI
#region Service
private void RefreshGoodsItems(ShopRefreshResult result)
private async UniTask RefreshGoodsItems(ShopRefreshResult result)
{
if (result == null)
{
@ -272,8 +272,8 @@ namespace SepCore.UI
for (int i = 0; i < result.GoodsItems.Count; i++)
{
if (i < Context.GoodsItems.Count) Context.GoodsItems[i] = new GoodsItemContext(result.GoodsItems[i]);
else Context.GoodsItems.Add(new GoodsItemContext(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]));
}
if (Context.GoodsItems.Count != result.GoodsItems.Count)
@ -425,7 +425,7 @@ namespace SepCore.UI
#region Event Handlers
private void Refresh(object sender, GameEventArgs e)
private async void Refresh(object sender, GameEventArgs e)
{
if (sender is not ShopForm)
{
@ -443,7 +443,7 @@ namespace SepCore.UI
return;
}
RefreshGoodsItems(result);
await RefreshGoodsItems(result);
}
private void ShopPurchase(object sender, GameEventArgs e)

7
Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs
View File

@ -1,3 +1,4 @@
using Cysharp.Threading.Tasks;
using SepCore.Event;
using UnityEngine;
using UnityEngine.UI;
@ -19,7 +20,7 @@ namespace SepCore.UI
_index = index;
}
public void OnInit(DisplayItemContext context, int index)
public async UniTaskVoid OnInit(DisplayItemContext context, int index)
{
if (context == null) return;
@ -28,8 +29,8 @@ namespace SepCore.UI
if (_iconArea != null)
{
string iconName = _context.IconAssetName;
GameEntry.SpriteCache.GetSprite(iconName, sprite => { _iconArea.OnInit(sprite, context.Rarity); });
var sprite = await GameEntry.SpriteCache.GetSprite(_context.IconAssetName);
_iconArea.OnInit(sprite, context.Rarity);
}
}

8
Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs
View File

@ -1,3 +1,4 @@
using Cysharp.Threading.Tasks;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
@ -32,16 +33,17 @@ namespace SepCore.UI
if (_descriptionText != null) _descriptionText.text = context.Description;
if (_iconArea != null) _iconArea.OnInit(context.Icon, context.ItemRarity);
LoadIcon(_context.IconAssetName);
LoadIcon(_context.IconAssetName).Forget();
}
private void LoadIcon(string iconAssetName)
private async UniTaskVoid LoadIcon(string iconAssetName)
{
if (_iconArea == null) return;
if (string.IsNullOrEmpty(iconAssetName)) return;
GameEntry.SpriteCache.GetSprite(iconAssetName, sprite => _iconArea.SetIcon(sprite));
var sprite = await GameEntry.SpriteCache.GetSprite(iconAssetName);
_iconArea.SetIcon(sprite);
}
}
}

20
Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ResourceAsyncExtension.cs
View File

@ -1,4 +1,6 @@
using System;
using Cysharp.Threading.Tasks;
using GameFramework.Resource;
using UnityGameFramework.Runtime;
using ResourceApplySuccessEventArgs = UnityGameFramework.Runtime.ResourceApplySuccessEventArgs;
using ResourceUpdateAllCompleteEventArgs = UnityGameFramework.Runtime.ResourceUpdateAllCompleteEventArgs;
@ -11,6 +13,24 @@ namespace SepCore.AsyncTask
/// </summary>
public static class ResourceAsyncExtension
{
/// <summary>
/// 异步加载资源
/// </summary>
/// <typeparam name="T">资源类型</typeparam>
/// <param name="resourceComponent">资源组件</param>
/// <param name="assetName">资源名称</param>
/// <param name="priority">加载优先级</param>
/// <returns>加载完成的资源</returns>
public static UniTask<T> LoadAssetAsync<T>(this ResourceComponent resourceComponent, string assetName, int priority = 0)
{
var tcs = AutoResetUniTaskCompletionSource<T>.Create();
resourceComponent.LoadAsset(assetName, priority, new LoadAssetCallbacks(
(_, asset, _, _) => tcs.TrySetResult((T)asset),
(_, _, errorMessage, _) => tcs.TrySetException(new Exception(errorMessage))
));
return tcs.Task;
}
/// <summary>
/// 异步等待资源更新完成
/// </summary>

44
Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs
View File

@ -1,8 +1,9 @@
using System;
using System.Collections.Generic;
using SepCore.Definition;
using Cysharp.Threading.Tasks;
using GameFramework.Resource;
using SepCore.AsyncTask;
using SepCore.CustomUtility;
using SepCore.Definition;
using UnityEngine;
using UnityGameFramework.Runtime;
@ -22,45 +23,22 @@ namespace SepCore.SpriteCache
_resource = GameEntry.Resource;
}
public void GetSprite(string assetName, Action<Sprite> callback)
public async UniTask<Sprite> GetSprite(string assetName)
{
if (_spriteCache.TryGetValue(assetName, out var sprite))
{
callback?.Invoke(sprite);
return;
}
else
{
_resource.LoadAsset
(
return sprite;
var texture = await _resource.LoadAssetAsync<Texture2D>(
AssetUtility.GetUITextureIconAsset(assetName),
Constant.AssetPriority.UIFormAsset,
new LoadAssetCallbacks(
(resourcePath, asset, duration, userData) =>
{
Log.Debug(resourcePath);
Texture2D texture = asset as Texture2D;
if (texture != null)
{
Sprite newSprite = Sprite.Create(
Constant.AssetPriority.UIFormAsset);
var newSprite = Sprite.Create(
texture,
new Rect(0, 0, texture.width, texture.height),
_defaultPivot,
_pixelsPerUnit);
_spriteCache.TryAdd(assetName, newSprite);
callback?.Invoke(newSprite);
}
},
(resourcePath, status, errorMessage, userData) =>
{
Log.Error("Can not load icon '{0}' from '{1}' with error message '{2}'.",
assetName,
resourcePath,
errorMessage);
}
)
);
}
return newSprite;
}
private void OnDestroy()