AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-07 16:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/AlanWeekend/TEngine

Browse Source
This commit is contained in:
Weekend
2023-11-15 15:15:11 +08:00
parent af822add2c ffb1f214ad
commit 1334dc30f9
2 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs
View File

@@ -239,13 +239,13 @@ namespace TEngine
/// <summary> /// <summary>
/// 获取当前资源包版本。 /// 获取当前资源包版本。
/// </summary> /// </summary>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>资源包版本。</returns> /// <returns>资源包版本。</returns>
public string GetPackageVersion(string packageName = "") public string GetPackageVersion(string customPackageName = "")
{ {
var package = string.IsNullOrEmpty(packageName) var package = string.IsNullOrEmpty(customPackageName)
? YooAssets.GetPackage(this.packageName) ? YooAssets.GetPackage(this.packageName)
: YooAssets.GetPackage(packageName); : YooAssets.GetPackage(customPackageName);
if (package == null) if (package == null)
{ {
return string.Empty; return string.Empty;
@@ -259,14 +259,14 @@ namespace TEngine
/// </summary> /// </summary>
/// <param name="appendTimeTicks">请求URL是否需要带时间戳。</param> /// <param name="appendTimeTicks">请求URL是否需要带时间戳。</param>
/// <param name="timeout">超时时间。</param> /// <param name="timeout">超时时间。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>请求远端包裹的最新版本操作句柄。</returns> /// <returns>请求远端包裹的最新版本操作句柄。</returns>
public UpdatePackageVersionOperation UpdatePackageVersionAsync(bool appendTimeTicks = false, int timeout = 60, public UpdatePackageVersionOperation UpdatePackageVersionAsync(bool appendTimeTicks = false, int timeout = 60,
string packageName = "") string customPackageName = "")
{ {
var package = string.IsNullOrEmpty(packageName) var package = string.IsNullOrEmpty(customPackageName)
? YooAssets.GetPackage(this.packageName) ? YooAssets.GetPackage(this.packageName)
: YooAssets.GetPackage(packageName); : YooAssets.GetPackage(customPackageName);
return package.UpdatePackageVersionAsync(appendTimeTicks, timeout); return package.UpdatePackageVersionAsync(appendTimeTicks, timeout);
} }
@@ -276,23 +276,23 @@ namespace TEngine
/// <param name="packageVersion">更新的包裹版本</param> /// <param name="packageVersion">更新的包裹版本</param>
/// <param name="autoSaveVersion">更新成功后自动保存版本号，作为下次初始化的版本。</param> /// <param name="autoSaveVersion">更新成功后自动保存版本号，作为下次初始化的版本。</param>
/// <param name="timeout">超时时间（默认值：60秒）</param> /// <param name="timeout">超时时间（默认值：60秒）</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion, public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion,
bool autoSaveVersion = true, int timeout = 60, string packageName = "") bool autoSaveVersion = true, int timeout = 60, string customPackageName = "")
{ {
var package = string.IsNullOrEmpty(packageName) var package = string.IsNullOrEmpty(customPackageName)
? YooAssets.GetPackage(this.packageName) ? YooAssets.GetPackage(this.packageName)
: YooAssets.GetPackage(packageName); : YooAssets.GetPackage(customPackageName);
return package.UpdatePackageManifestAsync(packageVersion, autoSaveVersion, timeout); return package.UpdatePackageManifestAsync(packageVersion, autoSaveVersion, timeout);
} }
/// <summary> /// <summary>
/// 创建资源下载器，用于下载当前资源版本所有的资源包文件。 /// 创建资源下载器，用于下载当前资源版本所有的资源包文件。
/// </summary> /// </summary>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public ResourceDownloaderOperation CreateResourceDownloader(string packageName = "") public ResourceDownloaderOperation CreateResourceDownloader(string customPackageName = "")
{ {
if (string.IsNullOrEmpty(packageName)) if (string.IsNullOrEmpty(customPackageName))
{ {
var package = YooAssets.GetPackage(this.packageName); var package = YooAssets.GetPackage(this.packageName);
Downloader = package.CreateResourceDownloader(downloadingMaxNum, failedTryAgain); Downloader = package.CreateResourceDownloader(downloadingMaxNum, failedTryAgain);
@@ -300,7 +300,7 @@ namespace TEngine
} }
else else
{ {
var package = YooAssets.GetPackage(packageName); var package = YooAssets.GetPackage(customPackageName);
Downloader = package.CreateResourceDownloader(downloadingMaxNum, failedTryAgain); Downloader = package.CreateResourceDownloader(downloadingMaxNum, failedTryAgain);
return Downloader; return Downloader;
} }
@@ -330,24 +330,24 @@ namespace TEngine
/// <summary> /// <summary>
/// 清理包裹未使用的缓存文件。 /// 清理包裹未使用的缓存文件。
/// </summary> /// </summary>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public ClearUnusedCacheFilesOperation ClearUnusedCacheFilesAsync(string packageName = "") public ClearUnusedCacheFilesOperation ClearUnusedCacheFilesAsync(string customPackageName = "")
{ {
var package = string.IsNullOrEmpty(packageName) var package = string.IsNullOrEmpty(customPackageName)
? YooAssets.GetPackage(this.packageName) ? YooAssets.GetPackage(this.packageName)
: YooAssets.GetPackage(packageName); : YooAssets.GetPackage(customPackageName);
return package.ClearUnusedCacheFilesAsync(); return package.ClearUnusedCacheFilesAsync();
} }
/// <summary> /// <summary>
/// 清理沙盒路径。 /// 清理沙盒路径。
/// </summary> /// </summary>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public void ClearSandbox(string packageName = "") public void ClearSandbox(string customPackageName = "")
{ {
var package = string.IsNullOrEmpty(packageName) var package = string.IsNullOrEmpty(customPackageName)
? YooAssets.GetPackage(this.packageName) ? YooAssets.GetPackage(this.packageName)
: YooAssets.GetPackage(packageName); : YooAssets.GetPackage(customPackageName);
package.ClearPackageSandbox(); package.ClearPackageSandbox();
} }
@@ -419,11 +419,11 @@ namespace TEngine
/// 检查资源是否存在。 /// 检查资源是否存在。
/// </summary> /// </summary>
/// <param name="location">要检查资源的名称。</param> /// <param name="location">要检查资源的名称。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>检查资源是否存在的结果。</returns> /// <returns>检查资源是否存在的结果。</returns>
public HasAssetResult HasAsset(string location, string packageName = "") public HasAssetResult HasAsset(string location, string customPackageName = "")
{ {
return m_ResourceManager.HasAsset(location, packageName: packageName); return m_ResourceManager.HasAsset(location, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -439,65 +439,65 @@ namespace TEngine
/// 是否需要从远端更新下载。 /// 是否需要从远端更新下载。
/// </summary> /// </summary>
/// <param name="location">资源的定位地址。</param> /// <param name="location">资源的定位地址。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns></returns> /// <returns></returns>
public bool IsNeedDownloadFromRemote(string location, string packageName = "") public bool IsNeedDownloadFromRemote(string location, string customPackageName = "")
{ {
return m_ResourceManager.IsNeedDownloadFromRemote(location, packageName: packageName); return m_ResourceManager.IsNeedDownloadFromRemote(location, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 是否需要从远端更新下载。 /// 是否需要从远端更新下载。
/// </summary> /// </summary>
/// <param name="assetInfo">资源信息。</param> /// <param name="assetInfo">资源信息。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns></returns> /// <returns></returns>
public bool IsNeedDownloadFromRemote(AssetInfo assetInfo, string packageName = "") public bool IsNeedDownloadFromRemote(AssetInfo assetInfo, string customPackageName = "")
{ {
return m_ResourceManager.IsNeedDownloadFromRemote(assetInfo, packageName: packageName); return m_ResourceManager.IsNeedDownloadFromRemote(assetInfo, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 获取资源信息列表。 /// 获取资源信息列表。
/// </summary> /// </summary>
/// <param name="resTag">资源标签。</param> /// <param name="resTag">资源标签。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>资源信息列表。</returns> /// <returns>资源信息列表。</returns>
public AssetInfo[] GetAssetInfos(string resTag, string packageName = "") public AssetInfo[] GetAssetInfos(string resTag, string customPackageName = "")
{ {
return m_ResourceManager.GetAssetInfos(resTag, packageName: packageName); return m_ResourceManager.GetAssetInfos(resTag, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 获取资源信息列表。 /// 获取资源信息列表。
/// </summary> /// </summary>
/// <param name="tags">资源标签列表。</param> /// <param name="tags">资源标签列表。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>资源信息列表。</returns> /// <returns>资源信息列表。</returns>
public AssetInfo[] GetAssetInfos(string[] tags, string packageName = "") public AssetInfo[] GetAssetInfos(string[] tags, string customPackageName = "")
{ {
return m_ResourceManager.GetAssetInfos(tags, packageName: packageName); return m_ResourceManager.GetAssetInfos(tags, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 获取资源信息。 /// 获取资源信息。
/// </summary> /// </summary>
/// <param name="location">资源的定位地址。</param> /// <param name="location">资源的定位地址。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>资源信息。</returns> /// <returns>资源信息。</returns>
public AssetInfo GetAssetInfo(string location, string packageName = "") public AssetInfo GetAssetInfo(string location, string customPackageName = "")
{ {
return m_ResourceManager.GetAssetInfo(location, packageName: packageName); return m_ResourceManager.GetAssetInfo(location, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 检查资源定位地址是否有效。 /// 检查资源定位地址是否有效。
/// </summary> /// </summary>
/// <param name="location">资源的定位地址</param> /// <param name="location">资源的定位地址</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public bool CheckLocationValid(string location, string packageName = "") public bool CheckLocationValid(string location, string customPackageName = "")
{ {
return m_ResourceManager.CheckLocationValid(location, packageName: packageName); return m_ResourceManager.CheckLocationValid(location, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -506,13 +506,13 @@ namespace TEngine
/// <param name="location">资源的定位地址。</param> /// <param name="location">资源的定位地址。</param>
/// <param name="needInstance">是否需要实例化。</param> /// <param name="needInstance">是否需要实例化。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <returns>资源实例。</returns> /// <returns>资源实例。</returns>
public T LoadAsset<T>(string location, bool needInstance = true, bool needCache = false, public T LoadAsset<T>(string location, bool needInstance = true, bool needCache = false,
string packageName = "") where T : UnityEngine.Object string customPackageName = "") where T : UnityEngine.Object
{ {
return m_ResourceManager.LoadAsset<T>(location, needInstance, needCache, packageName: packageName); return m_ResourceManager.LoadAsset<T>(location, needInstance, needCache, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -522,13 +522,13 @@ namespace TEngine
/// <param name="parent">父节点位置。</param> /// <param name="parent">父节点位置。</param>
/// <param name="needInstance">是否需要实例化。</param> /// <param name="needInstance">是否需要实例化。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <returns>资源实例。</returns> /// <returns>资源实例。</returns>
public T LoadAsset<T>(string location, Transform parent, bool needInstance = true, bool needCache = false, public T LoadAsset<T>(string location, Transform parent, bool needInstance = true, bool needCache = false,
string packageName = "") where T : UnityEngine.Object string customPackageName = "") where T : UnityEngine.Object
{ {
return m_ResourceManager.LoadAsset<T>(location, parent, needInstance, needCache, packageName: packageName); return m_ResourceManager.LoadAsset<T>(location, parent, needInstance, needCache, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -537,13 +537,13 @@ namespace TEngine
/// <param name="handle">资源操作句柄。</param> /// <param name="handle">资源操作句柄。</param>
/// <param name="location">资源的定位地址。</param> /// <param name="location">资源的定位地址。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <returns>资源实例。</returns> /// <returns>资源实例。</returns>
public T LoadAsset<T>(string location, out AssetOperationHandle handle, bool needCache = false, public T LoadAsset<T>(string location, out AssetOperationHandle handle, bool needCache = false,
string packageName = "") where T : UnityEngine.Object string customPackageName = "") where T : UnityEngine.Object
{ {
return m_ResourceManager.LoadAsset<T>(location, out handle, needCache, packageName: packageName); return m_ResourceManager.LoadAsset<T>(location, out handle, needCache, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -553,13 +553,13 @@ namespace TEngine
/// <param name="handle">资源操作句柄。</param> /// <param name="handle">资源操作句柄。</param>
/// <param name="parent">父节点位置。</param> /// <param name="parent">父节点位置。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <returns>资源实例。</returns> /// <returns>资源实例。</returns>
public T LoadAsset<T>(string location, Transform parent, out AssetOperationHandle handle, public T LoadAsset<T>(string location, Transform parent, out AssetOperationHandle handle,
bool needCache = false, string packageName = "") where T : UnityEngine.Object bool needCache = false, string customPackageName = "") where T : UnityEngine.Object
{ {
return m_ResourceManager.LoadAsset<T>(location, parent, out handle, needCache, packageName: packageName); return m_ResourceManager.LoadAsset<T>(location, parent, out handle, needCache, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -568,13 +568,13 @@ namespace TEngine
/// <param name="location">资源的定位地址。</param> /// <param name="location">资源的定位地址。</param>
/// <param name="callback">回调函数。</param> /// <param name="callback">回调函数。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
public void LoadAssetAsync<T>(string location, Action<AssetOperationHandle> callback = null, public void LoadAssetAsync<T>(string location, Action<AssetOperationHandle> callback = null,
bool needCache = false, string packageName = "") where T : UnityEngine.Object bool needCache = false, string customPackageName = "") where T : UnityEngine.Object
{ {
AssetOperationHandle handle = AssetOperationHandle handle =
m_ResourceManager.LoadAssetAsyncHandle<T>(location, needCache, packageName: packageName); m_ResourceManager.LoadAssetAsyncHandle<T>(location, needCache, packageName: customPackageName);
handle.Completed += callback; handle.Completed += callback;
} }
@@ -584,13 +584,13 @@ namespace TEngine
/// </summary> /// </summary>
/// <param name="location">资源的定位地址。</param> /// <param name="location">资源的定位地址。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <returns>同步加载资源句柄。</returns> /// <returns>同步加载资源句柄。</returns>
public AssetOperationHandle LoadAssetGetOperation<T>(string location, bool needCache = false, public AssetOperationHandle LoadAssetGetOperation<T>(string location, bool needCache = false,
string packageName = "") where T : UnityEngine.Object string customPackageName = "") where T : UnityEngine.Object
{ {
return m_ResourceManager.LoadAssetGetOperation<T>(location, needCache, packageName: packageName); return m_ResourceManager.LoadAssetGetOperation<T>(location, needCache, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -598,13 +598,13 @@ namespace TEngine
/// </summary> /// </summary>
/// <param name="location">资源的定位地址。</param> /// <param name="location">资源的定位地址。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <returns>异步加载资源句柄。</returns> /// <returns>异步加载资源句柄。</returns>
public AssetOperationHandle LoadAssetAsyncHandle<T>(string location, bool needCache = false, public AssetOperationHandle LoadAssetAsyncHandle<T>(string location, bool needCache = false,
string packageName = "") where T : UnityEngine.Object string customPackageName = "") where T : UnityEngine.Object
{ {
return m_ResourceManager.LoadAssetAsyncHandle<T>(location, needCache, packageName: packageName); return m_ResourceManager.LoadAssetAsyncHandle<T>(location, needCache, packageName: customPackageName);
} }
@@ -613,11 +613,11 @@ namespace TEngine
/// </summary> /// </summary>
/// <typeparam name="TObject">资源类型</typeparam> /// <typeparam name="TObject">资源类型</typeparam>
/// <param name="location">资源的定位地址</param> /// <param name="location">资源的定位地址</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public SubAssetsOperationHandle LoadSubAssetsSync<TObject>(string location, string packageName = "") public SubAssetsOperationHandle LoadSubAssetsSync<TObject>(string location, string customPackageName = "")
where TObject : UnityEngine.Object where TObject : UnityEngine.Object
{ {
return m_ResourceManager.LoadSubAssetsSync<TObject>(location: location, packageName: packageName); return m_ResourceManager.LoadSubAssetsSync<TObject>(location: location, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -625,41 +625,41 @@ namespace TEngine
/// </summary> /// </summary>
/// <typeparam name="TObject">资源类型</typeparam> /// <typeparam name="TObject">资源类型</typeparam>
/// <param name="location">资源的定位地址</param> /// <param name="location">资源的定位地址</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public SubAssetsOperationHandle LoadSubAssetsAsync<TObject>(string location, string packageName = "") public SubAssetsOperationHandle LoadSubAssetsAsync<TObject>(string location, string customPackageName = "")
where TObject : UnityEngine.Object where TObject : UnityEngine.Object
{ {
return m_ResourceManager.LoadSubAssetsAsync<TObject>(location: location, packageName: packageName); return m_ResourceManager.LoadSubAssetsAsync<TObject>(location: location, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 同步加载子资源对象 /// 同步加载子资源对象
/// </summary> /// </summary>
/// <param name="location">资源的定位地址</param> /// <param name="location">资源的定位地址</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public SubAssetsOperationHandle LoadSubAssetsSync(string location, string packageName = "") public SubAssetsOperationHandle LoadSubAssetsSync(string location, string customPackageName = "")
{ {
var assetInfo = GetAssetInfo(location, packageName: packageName); var assetInfo = GetAssetInfo(location, customPackageName: customPackageName);
if (assetInfo == null) if (assetInfo == null)
{ {
Log.Fatal($"AssetsInfo is null"); Log.Fatal($"AssetsInfo is null");
return null; return null;
} }
return m_ResourceManager.LoadSubAssetsSync(assetInfo, packageName: packageName); return m_ResourceManager.LoadSubAssetsSync(assetInfo, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 通过Tag加载资源对象集合。 /// 通过Tag加载资源对象集合。
/// </summary> /// </summary>
/// <param name="assetTag">资源标识。</param> /// <param name="assetTag">资源标识。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">资源类型。</typeparam> /// <typeparam name="T">资源类型。</typeparam>
/// <returns>资源对象集合。</returns> /// <returns>资源对象集合。</returns>
public async UniTask<List<T>> LoadAssetsByTagAsync<T>(string assetTag, string packageName = "") public async UniTask<List<T>> LoadAssetsByTagAsync<T>(string assetTag, string customPackageName = "")
where T : UnityEngine.Object where T : UnityEngine.Object
{ {
return await m_ResourceManager.LoadAssetsByTagAsync<T>(assetTag, packageName: packageName); return await m_ResourceManager.LoadAssetsByTagAsync<T>(assetTag, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -669,14 +669,14 @@ namespace TEngine
/// <param name="cancellationToken">取消操作Token。</param> /// <param name="cancellationToken">取消操作Token。</param>
/// <param name="needInstance">是否需要实例化。</param> /// <param name="needInstance">是否需要实例化。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <returns>异步资源实例。</returns> /// <returns>异步资源实例。</returns>
public async UniTask<T> LoadAssetAsync<T>(string location, CancellationToken cancellationToken = default, public async UniTask<T> LoadAssetAsync<T>(string location, CancellationToken cancellationToken = default,
bool needInstance = true, bool needCache = false, string packageName = "") where T : UnityEngine.Object bool needInstance = true, bool needCache = false, string customPackageName = "") where T : UnityEngine.Object
{ {
return await m_ResourceManager.LoadAssetAsync<T>(location, cancellationToken, needInstance, needCache, return await m_ResourceManager.LoadAssetAsync<T>(location, cancellationToken, needInstance, needCache,
packageName: packageName); packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -685,13 +685,13 @@ namespace TEngine
/// <param name="location">要加载的游戏物体名称。</param> /// <param name="location">要加载的游戏物体名称。</param>
/// <param name="cancellationToken">取消操作Token。</param> /// <param name="cancellationToken">取消操作Token。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>异步游戏物体实例。</returns> /// <returns>异步游戏物体实例。</returns>
public async UniTask<GameObject> LoadGameObjectAsync(string location, public async UniTask<GameObject> LoadGameObjectAsync(string location,
CancellationToken cancellationToken = default, bool needCache = false, string packageName = "") CancellationToken cancellationToken = default, bool needCache = false, string customPackageName = "")
{ {
return await m_ResourceManager.LoadGameObjectAsync(location, cancellationToken, needCache, return await m_ResourceManager.LoadGameObjectAsync(location, cancellationToken, needCache,
packageName: packageName); packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -701,13 +701,13 @@ namespace TEngine
/// <param name="parent">父节点位置。</param> /// <param name="parent">父节点位置。</param>
/// <param name="cancellationToken">取消操作Token。</param> /// <param name="cancellationToken">取消操作Token。</param>
/// <param name="needCache">是否需要缓存。</param> /// <param name="needCache">是否需要缓存。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>异步游戏物体实例。</returns> /// <returns>异步游戏物体实例。</returns>
public async UniTask<GameObject> LoadGameObjectAsync(string location, Transform parent, public async UniTask<GameObject> LoadGameObjectAsync(string location, Transform parent,
CancellationToken cancellationToken = default, bool needCache = false, string packageName = "") CancellationToken cancellationToken = default, bool needCache = false, string customPackageName = "")
{ {
return await m_ResourceManager.LoadGameObjectAsync(location, parent, cancellationToken, needCache, return await m_ResourceManager.LoadGameObjectAsync(location, parent, cancellationToken, needCache,
packageName: packageName); packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -715,12 +715,12 @@ namespace TEngine
/// </summary> /// </summary>
/// <param name="location">资源定位地址。</param> /// <param name="location">资源定位地址。</param>
/// <param name="cancellationToken">取消操作Token。</param> /// <param name="cancellationToken">取消操作Token。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <returns>原生文件资源实例。</returns> /// <returns>原生文件资源实例。</returns>
public async UniTask<RawFileOperationHandle> LoadRawAssetAsync(string location, public async UniTask<RawFileOperationHandle> LoadRawAssetAsync(string location,
CancellationToken cancellationToken = default, string packageName = "") CancellationToken cancellationToken = default, string customPackageName = "")
{ {
return await m_ResourceManager.LoadRawAssetAsync(location, cancellationToken, packageName: packageName); return await m_ResourceManager.LoadRawAssetAsync(location, cancellationToken, packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -729,14 +729,14 @@ namespace TEngine
/// <param name="location">资源定位地址。</param> /// <param name="location">资源定位地址。</param>
/// <param name="assetName">子资源名称。</param> /// <param name="assetName">子资源名称。</param>
/// <param name="cancellationToken">取消操作Token。</param> /// <param name="cancellationToken">取消操作Token。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">资源实例类型。</typeparam> /// <typeparam name="T">资源实例类型。</typeparam>
/// <returns>原生文件资源实例。</returns> /// <returns>原生文件资源实例。</returns>
public async UniTask<T> LoadSubAssetAsync<T>(string location, string assetName, public async UniTask<T> LoadSubAssetAsync<T>(string location, string assetName,
CancellationToken cancellationToken = default, string packageName = "") where T : UnityEngine.Object CancellationToken cancellationToken = default, string customPackageName = "") where T : UnityEngine.Object
{ {
return await m_ResourceManager.LoadSubAssetAsync<T>(location, assetName, cancellationToken, return await m_ResourceManager.LoadSubAssetAsync<T>(location, assetName, cancellationToken,
packageName: packageName); packageName: customPackageName);
} }
/// <summary> /// <summary>
@@ -744,14 +744,14 @@ namespace TEngine
/// </summary> /// </summary>
/// <param name="location">资源定位地址。</param> /// <param name="location">资源定位地址。</param>
/// <param name="cancellationToken">取消操作Token。</param> /// <param name="cancellationToken">取消操作Token。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">资源实例类型。</typeparam> /// <typeparam name="T">资源实例类型。</typeparam>
/// <returns>原生文件资源实例。</returns> /// <returns>原生文件资源实例。</returns>
public async UniTask<T[]> LoadAllSubAssetAsync<T>(string location, public async UniTask<T[]> LoadAllSubAssetAsync<T>(string location,
CancellationToken cancellationToken = default, string packageName = "") where T : UnityEngine.Object CancellationToken cancellationToken = default, string customPackageName = "") where T : UnityEngine.Object
{ {
return await m_ResourceManager.LoadAllSubAssetAsync<T>(location, cancellationToken, return await m_ResourceManager.LoadAllSubAssetAsync<T>(location, cancellationToken,
packageName: packageName); packageName: customPackageName);
} }
#region 预加载 #region 预加载
@@ -761,22 +761,22 @@ namespace TEngine
/// </summary> /// </summary>
/// <param name="location">资源定位地址。</param> /// <param name="location">资源定位地址。</param>
/// <param name="assetObject">预加载对象。</param> /// <param name="assetObject">预加载对象。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
public void PushPreLoadAsset(string location, UnityEngine.Object assetObject, string packageName = "") public void PushPreLoadAsset(string location, UnityEngine.Object assetObject, string customPackageName = "")
{ {
m_ResourceManager.PushPreLoadAsset(location, assetObject, packageName: packageName); m_ResourceManager.PushPreLoadAsset(location, assetObject, packageName: customPackageName);
} }
/// <summary> /// <summary>
/// 获取预加载的实例对象。 /// 获取预加载的实例对象。
/// </summary> /// </summary>
/// <param name="location">资源定位地址。</param> /// <param name="location">资源定位地址。</param>
/// <param name="packageName">指定资源包的名称。不传使用默认资源包</param> /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
/// <typeparam name="T">资源实例类型。</typeparam> /// <typeparam name="T">资源实例类型。</typeparam>
/// <returns>预加载对象。</returns> /// <returns>预加载对象。</returns>
public T GetPreLoadAsset<T>(string location, string packageName = "") where T : UnityEngine.Object public T GetPreLoadAsset<T>(string location, string customPackageName = "") where T : UnityEngine.Object
{ {
return m_ResourceManager.GetPreLoadAsset<T>(location, packageName: packageName); return m_ResourceManager.GetPreLoadAsset<T>(location, packageName: customPackageName);
} }
#endregion #endregion

2
UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIBase.cs
View File

@@ -340,7 +340,7 @@ namespace TEngine
public async UniTask<T> CreateWidgetByPathAsync<T>(Transform parentTrans, string assetLocation, bool visible = true) where T : UIWidget, new() public async UniTask<T> CreateWidgetByPathAsync<T>(Transform parentTrans, string assetLocation, bool visible = true) where T : UIWidget, new()
{ {
GameObject goInst = await GameModule.Resource.LoadAssetAsync<GameObject>(assetLocation, gameObject.GetCancellationTokenOnDestroy()); GameObject goInst = await GameModule.Resource.LoadAssetAsync<GameObject>(assetLocation, gameObject.GetCancellationTokenOnDestroy());
goInst.transform.SetParent(parentTrans); goInst.transform.SetParent(parentTrans, false);
return CreateWidget<T>(goInst, visible); return CreateWidget<T>(goInst, visible);
} }