From 40373c473dbfb61e12684f7446b72a234f2fd3ad Mon Sep 17 00:00:00 2001
From: ALEXTANG <574809918@qq.com>
Date: Thu, 7 Dec 2023 10:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E8=BF=87Tag?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=B5=84=E6=BA=90=E5=AF=B9=E8=B1=A1=E9=9B=86?=
=?UTF-8?q?=E5=90=88=E6=8E=A5=E5=8F=A3=E3=80=82(Operation=E9=9C=80?=
=?UTF-8?q?=E8=A6=81=E8=87=AA=E8=A1=8C=E7=AE=A1=E7=90=86=E7=94=9F=E5=91=BD?=
=?UTF-8?q?=E5=91=A8=E6=9C=9F=E9=87=8A=E6=94=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修改通过Tag加载资源对象集合接口。(Operation需要自行管理生命周期释放)
---
.../Runtime/Modules/ResourceModule/IResourceManager.cs | 2 +-
.../Runtime/Modules/ResourceModule/ResourceManager.cs | 6 ++----
.../Runtime/Modules/ResourceModule/ResourceModule.cs | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs
index 4c2ef5e8..d86ac772 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs
@@ -280,7 +280,7 @@ namespace TEngine
/// 指定资源包的名称。不传使用默认资源包
/// 资源类型。
/// 资源对象集合。
- UniTask> LoadAssetsByTagAsync(string assetTag, string packageName = "") where T : UnityEngine.Object;
+ UniTask> LoadAssetsByTagAsync(string assetTag, string packageName = "") where T : UnityEngine.Object;
///
/// 异步加载资源。
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs
index b44bf706..94ecd817 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs
@@ -824,15 +824,13 @@ namespace TEngine
return package.LoadSubAssetsSync(assetInfo);
}
- public async UniTask> LoadAssetsByTagAsync(string assetTag, string packageName = "")
+ public async UniTask> LoadAssetsByTagAsync(string assetTag,string packageName = "")
where T : UnityEngine.Object
{
LoadAssetsByTagOperation operation = new LoadAssetsByTagOperation(assetTag, packageName);
YooAssets.StartOperation(operation);
await operation.ToUniTask();
- List assetObjects = operation.AssetObjects;
- operation.ReleaseHandle();
- return assetObjects;
+ return operation;
}
public async UniTask LoadAssetAsync(string location, CancellationToken cancellationToken = default,
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs
index e29bf8f7..8870a983 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs
@@ -671,7 +671,7 @@ namespace TEngine
/// 指定资源包的名称。不传使用默认资源包
/// 资源类型。
/// 资源对象集合。
- public async UniTask> LoadAssetsByTagAsync(string assetTag, string customPackageName = "")
+ public async UniTask> LoadAssetsByTagAsync(string assetTag, string customPackageName = "")
where T : UnityEngine.Object
{
return await m_ResourceManager.LoadAssetsByTagAsync(assetTag, packageName: customPackageName);