Compare commits

...

13 Commits

Author SHA1 Message Date
何冠峰
2b6e7856e7 update mini game 2026-01-14 19:28:30 +08:00
何冠峰
8d461056e4 update extension sample 2026-01-14 19:28:07 +08:00
何冠峰
f188cc715a update test sample 2026-01-14 19:27:39 +08:00
何冠峰
329cae1441 refactor : 重构资源包裹模块 2026-01-14 19:26:40 +08:00
何冠峰
c8c74b8c20 refactor : 重构资源包裹模块 2026-01-13 19:11:49 +08:00
何冠峰
b3d024743c update space shooter 2026-01-13 17:09:18 +08:00
何冠峰
246a62a675 refactor : 重构异步操作模块 2026-01-13 17:01:15 +08:00
何冠峰
354ca5197f refactor : 重构异步操作模块 2026-01-13 14:55:31 +08:00
何冠峰
ce4d6911db refactor : 重构异步操作模块 2026-01-13 12:08:02 +08:00
何冠峰
b796b1a44e refactor : 重构异步操作模块 2026-01-13 11:23:50 +08:00
何冠峰
7198e639d9 refactor : 重构异步操作模块 2026-01-12 16:10:24 +08:00
何冠峰
294fa18fec refactor : 重构异步操作模块 2026-01-12 15:35:00 +08:00
何冠峰
a3f689d815 refactor : 重构异步操作模块 2026-01-12 11:09:27 +08:00
97 changed files with 1794 additions and 1211 deletions

View File

@@ -255,12 +255,7 @@ namespace YooAsset
if (_watchdogAborted) if (_watchdogAborted)
return; return;
#if UNITY_2020_3_OR_NEWER double realtimeSinceStartup = TimeUtility.RealtimeSinceStartup;
double realtimeSinceStartup = UnityEngine.Time.realtimeSinceStartupAsDouble;
#else
double realtimeSinceStartup = UnityEngine.Time.realtimeSinceStartup;
#endif
if (DownloadedBytes != _lastDownloadBytes) if (DownloadedBytes != _lastDownloadBytes)
{ {
_lastDownloadBytes = DownloadedBytes; _lastDownloadBytes = DownloadedBytes;

View File

@@ -87,7 +87,7 @@ namespace YooAsset
if (Status == EDownloadRequestStatus.None) if (Status == EDownloadRequestStatus.None)
{ {
Status = EDownloadRequestStatus.Running; Status = EDownloadRequestStatus.Running;
_lastUpdateTime = GetUnityEngineRealtime(); _lastUpdateTime = TimeUtility.RealtimeSinceStartup;
} }
} }
@@ -99,7 +99,7 @@ namespace YooAsset
if (Status != EDownloadRequestStatus.Running) if (Status != EDownloadRequestStatus.Running)
return; return;
double currentTime = GetUnityEngineRealtime(); double currentTime = TimeUtility.RealtimeSinceStartup;
double deltaTime = currentTime - _lastUpdateTime; double deltaTime = currentTime - _lastUpdateTime;
_lastUpdateTime = currentTime; _lastUpdateTime = currentTime;
@@ -137,14 +137,5 @@ namespace YooAsset
public void Dispose() public void Dispose()
{ {
} }
private double GetUnityEngineRealtime()
{
#if UNITY_2020_3_OR_NEWER
return UnityEngine.Time.realtimeSinceStartupAsDouble;
#else
return UnityEngine.Time.realtimeSinceStartup;
#endif
}
} }
} }

View File

@@ -2,100 +2,6 @@ using System.Collections.Generic;
namespace YooAsset namespace YooAsset
{ {
/// <summary>
/// 下载器结束
/// </summary>
public struct DownloaderFinishData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 是否成功
/// </summary>
public bool Succeed;
}
/// <summary>
/// 下载器相关的更新数据
/// </summary>
public struct DownloadUpdateData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 下载进度 (0-1f)
/// </summary>
public float Progress;
/// <summary>
/// 下载文件总数
/// </summary>
public int TotalDownloadCount;
/// <summary>
/// 当前完成的下载文件数量
/// </summary>
public int CurrentDownloadCount;
/// <summary>
/// 下载数据总大小(单位:字节)
/// </summary>
public long TotalDownloadBytes;
/// <summary>
/// 当前完成的下载数据大小(单位:字节)
/// </summary>
public long CurrentDownloadBytes;
}
/// <summary>
/// 下载器相关的错误数据
/// </summary>
public struct DownloadErrorData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 下载失败的文件名称
/// </summary>
public string FileName;
/// <summary>
/// 错误信息
/// </summary>
public string ErrorInfo;
}
/// <summary>
/// 下载器相关的文件数据
/// </summary>
public struct DownloadFileData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 下载的文件名称
/// </summary>
public string FileName;
/// <summary>
/// 下载的文件大小
/// </summary>
public long FileSize;
}
/// <summary> /// <summary>
/// 导入文件的信息 /// 导入文件的信息
/// </summary> /// </summary>

View File

@@ -41,20 +41,20 @@ DownloadSystem 的职责是提供“可替换后端 + 统一请求接口 + 轮
``` ```
┌─────────────────────────────────────────────────────────┐ ┌─────────────────────────────────────────────────────────┐
│ 上层调用者 │ │ 上层调用者
│ (FileSystem / ResourceManager) │ (FileSystem / ResourceManager) │
└─────────────────────────┬───────────────────────────────┘ └─────────────────────────┬───────────────────────────────┘
┌─────────────────────────▼───────────────────────────────┐ ┌─────────────────────────▼───────────────────────────────┐
│ IDownloadBackend │ IDownloadBackend │
│ (后端接口) │ │ (后端接口) │
│ 定义网络库合约,工厂模式创建请求 │ │ 定义网络库合约,工厂模式创建请求
└─────────────────────────┬───────────────────────────────┘ └─────────────────────────┬───────────────────────────────┘
┌─────────────────────────▼───────────────────────────────┐ ┌─────────────────────────▼───────────────────────────────┐
│ IDownloadRequest │ IDownloadRequest │
│ (请求接口) │ │ (请求接口) │
│ 轮询式生命周期管理,状态机驱动 │ │ 轮询式生命周期管理,状态机驱动
└─────────────────────────┬───────────────────────────────┘ └─────────────────────────┬───────────────────────────────┘
┌─────────────────────────▼───────────────────────────────┐ ┌─────────────────────────▼───────────────────────────────┐
@@ -244,16 +244,6 @@ public struct DownloadSimulateRequestArgs
} }
``` ```
### 回调数据结构体
| 结构体 | 用途 | 关键字段 |
|--------|------|----------|
| `DownloaderFinishData` | 下载完成回调 | `PackageName`, `Succeed` |
| `DownloadUpdateData` | 进度更新回调 | `Progress`, `TotalDownloadBytes`, `CurrentDownloadBytes` |
| `DownloadErrorData` | 下载错误回调 | `FileName`, `ErrorInfo` |
| `DownloadFileData` | 文件完成回调 | `FileName`, `FileSize` |
| `ImportFileInfo` | 导入文件元数据 | `FilePath`, `BundleName`, `BundleGUID` |
--- ---
## 核心类说明 ## 核心类说明

View File

@@ -108,14 +108,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -108,14 +108,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -107,7 +107,7 @@ namespace YooAsset
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
//注意:场景加载不支持异步转同步,为了支持同步加载方法需要实现该方法! //注意:场景加载不支持异步转同步,为了支持同步加载方法需要实现该方法!
InternalUpdate(); RunOnceExecution();
} }
public override void UnSuspendLoad() public override void UnSuspendLoad()
{ {

View File

@@ -108,14 +108,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -109,14 +109,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -88,14 +88,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -113,7 +113,7 @@ namespace YooAsset
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
//注意:场景加载不支持异步转同步,为了支持同步加载方法需要实现该方法! //注意:场景加载不支持异步转同步,为了支持同步加载方法需要实现该方法!
InternalUpdate(); RunOnceExecution();
} }
public override void UnSuspendLoad() public override void UnSuspendLoad()
{ {

View File

@@ -100,14 +100,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -129,16 +129,16 @@ namespace YooAsset
var operation = new DBFSInitializeOperation(this); var operation = new DBFSInitializeOperation(this);
return operation; return operation;
} }
public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options)
{
var operation = new DBFSLoadPackageManifestOperation(this, packageVersion);
return operation;
}
public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout)
{ {
var operation = new DBFSRequestPackageVersionOperation(this); var operation = new DBFSRequestPackageVersionOperation(this);
return operation; return operation;
} }
public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options)
{
var operation = new DBFSLoadPackageManifestOperation(this, options.PackageVersion);
return operation;
}
public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options) public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
{ {
return _unpackFileSystem.ClearCacheFilesAsync(manifest, options); return _unpackFileSystem.ClearCacheFilesAsync(manifest, options);

View File

@@ -131,14 +131,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
@@ -204,14 +197,141 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
}
}
#if TUANJIE_1_7_OR_NEWER
/// <summary>
/// 加载团结文件
/// </summary>
internal class DBFSLoadInstantBundleOperation : FSLoadBundleOperation
{
private enum ESteps
{
None,
LoadInstantBundle,
CheckResult,
Done,
}
private readonly DefaultBuildinFileSystem _fileSystem;
private readonly PackageBundle _bundle;
private AssetBundleCreateRequest _createRequest;
private AssetBundle _assetBundle;
private Stream _managedStream;
private ESteps _steps = ESteps.None;
internal DBFSLoadInstantBundleOperation(DefaultBuildinFileSystem fileSystem, PackageBundle bundle)
{
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalStart()
{
DownloadProgress = 1f;
DownloadedBytes = _bundle.FileSize;
_steps = ESteps.LoadInstantBundle;
}
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
if (_steps == ESteps.LoadInstantBundle)
{ {
if (ExecuteWhileDone()) if (_bundle.Encrypted)
{
if (_fileSystem.DecryptionServices == null)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"The {nameof(IDecryptionServices)} is null !";
YooLogger.Error(Error);
return;
}
}
if (IsWaitForAsyncComplete)
{
if (_bundle.Encrypted)
{
var decryptResult = _fileSystem.LoadEncryptedAssetBundle(_bundle);
_assetBundle = decryptResult.Result;
_managedStream = decryptResult.ManagedStream;
}
else
{
string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
_assetBundle = AssetBundle.LoadFromFile(filePath);
}
}
else
{
if (_bundle.Encrypted)
{
var decryptResult = _fileSystem.LoadEncryptedAssetBundleAsync(_bundle);
_createRequest = decryptResult.CreateRequest;
_managedStream = decryptResult.ManagedStream;
}
else
{
string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
_createRequest = AssetBundle.LoadFromFileAsync(filePath);
}
}
_steps = ESteps.CheckResult;
}
if (_steps == ESteps.CheckResult)
{
if (_createRequest != null)
{
if (IsWaitForAsyncComplete)
{
// 强制挂起主线程(注意:该操作会很耗时)
YooLogger.Warning("Suspend the main thread to load unity bundle.");
_assetBundle = _createRequest.assetBundle;
}
else
{
if (_createRequest.isDone == false)
return;
_assetBundle = _createRequest.assetBundle;
}
}
if (_assetBundle == null)
{
if (_bundle.Encrypted)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Failed to load encrypted buildin asset bundle file : {_bundle.BundleName}";
YooLogger.Error(Error);
}
else
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Failed to load buildin asset bundle file : {_bundle.BundleName}";
YooLogger.Error(Error);
}
}
else
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
break; Result = new AssetBundleResult(_fileSystem, _bundle, _assetBundle, _managedStream);
Status = EOperationStatus.Succeed;
} }
} }
} }
internal override void InternalWaitForAsyncComplete()
{
RunBatchExecution();
}
} }
#endif
} }

View File

@@ -151,14 +151,14 @@ namespace YooAsset
var operation = new DCFSInitializeOperation(this); var operation = new DCFSInitializeOperation(this);
return operation; return operation;
} }
public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options)
{ {
var operation = new DCFSLoadPackageManifestOperation(this, packageVersion, timeout); var operation = new DCFSRequestPackageVersionOperation(this, options.AppendTimeTicks, options.Timeout);
return operation; return operation;
} }
public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout) public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options)
{ {
var operation = new DCFSRequestPackageVersionOperation(this, appendTimeTicks, timeout); var operation = new DCFSLoadPackageManifestOperation(this, options.PackageVersion, options.Timeout);
return operation; return operation;
} }
public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options) public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)

View File

@@ -262,14 +262,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
@@ -419,14 +412,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -124,14 +124,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
internal override void InternalAbort() internal override void InternalAbort()
{ {

View File

@@ -98,6 +98,10 @@ namespace YooAsset
// 检测下载结果 // 检测下载结果
if (_steps == ESteps.CheckRequest) if (_steps == ESteps.CheckRequest)
{ {
//TODO 更新下载后台,防止无限挂起
if (IsWaitForAsyncComplete)
_fileSystem.DownloadBackend.Update();
DownloadProgress = _request.DownloadProgress; DownloadProgress = _request.DownloadProgress;
DownloadedBytes = _request.DownloadedBytes; DownloadedBytes = _request.DownloadedBytes;
Progress = DownloadProgress; Progress = DownloadProgress;
@@ -177,23 +181,12 @@ namespace YooAsset
internal override void InternalAbort() internal override void InternalAbort()
{ {
if (_request != null) if (_request != null)
_request.AbortRequest(); _request.Dispose();
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) //TODO 等待导入或解压本地文件完毕,该操作会挂起主线程!
{ RunUntilCompletion();
//TODO 更新下载后台,防止无限挂起
_fileSystem.DownloadBackend.Update();
//TODO 等待导入或解压本地文件完毕,该操作会挂起主线程!
InternalUpdate();
if (IsDone)
break;
//TODO 短暂休眠避免完全卡死
System.Threading.Thread.Sleep(1);
}
} }
} }
} }

View File

@@ -144,7 +144,7 @@ namespace YooAsset
internal override void InternalAbort() internal override void InternalAbort()
{ {
if (_request != null) if (_request != null)
_request.AbortRequest(); _request.Dispose();
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {

View File

@@ -119,23 +119,16 @@ namespace YooAsset
} }
/// <summary> /// <summary>
/// 中止所有下载任务 /// 释放下载资源
/// </summary>
public void AbortAll()
{
foreach (var valuePair in _downloaders)
{
valuePair.Value.AbortOperation();
}
_downloaders.Clear();
}
/// <summary>
/// 释放资源
/// </summary> /// </summary>
public void Dispose() public void Dispose()
{ {
AbortAll(); foreach (var valuePair in _downloaders)
{
var operation = valuePair.Value;
operation.AbortOperation();
}
_downloaders.Clear();
} }
/// <summary> /// <summary>

View File

@@ -17,7 +17,7 @@ namespace YooAsset
private readonly DefaultCacheFileSystem _fileSystem; private readonly DefaultCacheFileSystem _fileSystem;
private IEnumerator<string> _filesEnumerator = null; private IEnumerator<string> _filesEnumerator = null;
private float _verifyStartTime; private double _verifyStartTime;
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
/// <summary> /// <summary>
@@ -33,7 +33,7 @@ namespace YooAsset
internal override void InternalStart() internal override void InternalStart()
{ {
_steps = ESteps.Prepare; _steps = ESteps.Prepare;
_verifyStartTime = UnityEngine.Time.realtimeSinceStartup; _verifyStartTime = TimeUtility.RealtimeSinceStartup;
} }
internal override void InternalUpdate() internal override void InternalUpdate()
{ {
@@ -58,7 +58,7 @@ namespace YooAsset
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Succeed; Status = EOperationStatus.Succeed;
float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime; double costTime = TimeUtility.RealtimeSinceStartup - _verifyStartTime;
YooLogger.Log($"Search cache files elapsed time {costTime:f1} seconds"); YooLogger.Log($"Search cache files elapsed time {costTime:f1} seconds");
} }
} }

View File

@@ -25,7 +25,7 @@ namespace YooAsset
private List<VerifyFileElement> _verifyingList; private List<VerifyFileElement> _verifyingList;
private int _verifyMaxNum; private int _verifyMaxNum;
private int _verifyTotalCount; private int _verifyTotalCount;
private float _verifyStartTime; private double _verifyStartTime;
private int _succeedCount; private int _succeedCount;
private int _failedCount; private int _failedCount;
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
@@ -40,7 +40,7 @@ namespace YooAsset
internal override void InternalStart() internal override void InternalStart()
{ {
_steps = ESteps.InitVerify; _steps = ESteps.InitVerify;
_verifyStartTime = UnityEngine.Time.realtimeSinceStartup; _verifyStartTime = TimeUtility.RealtimeSinceStartup;
} }
internal override void InternalUpdate() internal override void InternalUpdate()
{ {
@@ -84,7 +84,7 @@ namespace YooAsset
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Succeed; Status = EOperationStatus.Succeed;
float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime; double costTime = TimeUtility.RealtimeSinceStartup - _verifyStartTime;
YooLogger.Log($"Verify cache files elapsed time {costTime:f1} seconds"); YooLogger.Log($"Verify cache files elapsed time {costTime:f1} seconds");
} }

View File

@@ -69,16 +69,8 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) //TODO 等待子线程验证文件完毕,该操作会挂起主线程!
{ RunUntilCompletion();
//TODO 等待子线程验证文件完毕,该操作会挂起主线程!
InternalUpdate();
if (IsDone)
break;
//TODO 短暂休眠避免完全卡死
System.Threading.Thread.Sleep(1);
}
} }
private void VerifyInThread(object obj) private void VerifyInThread(object obj)

View File

@@ -83,16 +83,16 @@ namespace YooAsset
var operation = new DEFSInitializeOperation(this); var operation = new DEFSInitializeOperation(this);
return operation; return operation;
} }
public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options)
{
var operation = new DEFSLoadPackageManifestOperation(this, packageVersion);
return operation;
}
public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout)
{ {
var operation = new DEFSRequestPackageVersionOperation(this); var operation = new DEFSRequestPackageVersionOperation(this);
return operation; return operation;
} }
public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options)
{
var operation = new DEFSLoadPackageManifestOperation(this, options.PackageVersion);
return operation;
}
public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options) public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
{ {
var operation = new FSClearCacheFilesCompleteOperation(); var operation = new FSClearCacheFilesCompleteOperation();

View File

@@ -142,14 +142,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
} }
} }

View File

@@ -78,14 +78,14 @@ namespace YooAsset
var operation = new DWRFSInitializeOperation(this); var operation = new DWRFSInitializeOperation(this);
return operation; return operation;
} }
public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options)
{ {
var operation = new DWRFSLoadPackageManifestOperation(this, packageVersion, timeout); var operation = new DWRFSRequestPackageVersionOperation(this, options.AppendTimeTicks, options.Timeout);
return operation; return operation;
} }
public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout) public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options)
{ {
var operation = new DWRFSRequestPackageVersionOperation(this, appendTimeTicks, timeout); var operation = new DWRFSLoadPackageManifestOperation(this, options.PackageVersion, options.Timeout);
return operation; return operation;
} }
public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options) public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)

View File

@@ -91,7 +91,7 @@ namespace YooAsset
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Failed; Status = EOperationStatus.Failed;
Error = "WebGL platform not support sync load method !"; Error = "WebGL platform not support sync load method !";
UnityEngine.Debug.LogError(Error); YooLogger.Error(Error);
} }
} }
} }

View File

@@ -87,14 +87,14 @@ namespace YooAsset
var operation = new DWSFSInitializeOperation(this); var operation = new DWSFSInitializeOperation(this);
return operation; return operation;
} }
public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options)
{ {
var operation = new DWSFSLoadPackageManifestOperation(this, packageVersion, timeout); var operation = new DWSFSRequestPackageVersionOperation(this, options.Timeout);
return operation; return operation;
} }
public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout) public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options)
{ {
var operation = new DWSFSRequestPackageVersionOperation(this, timeout); var operation = new DWSFSLoadPackageManifestOperation(this, options.PackageVersion, options.Timeout);
return operation; return operation;
} }
public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options) public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)

View File

@@ -91,7 +91,7 @@ namespace YooAsset
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Failed; Status = EOperationStatus.Failed;
Error = "WebGL platform not support sync load method !"; Error = "WebGL platform not support sync load method !";
UnityEngine.Debug.LogError(Error); YooLogger.Error(Error);
} }
} }
} }

View File

@@ -24,15 +24,15 @@ namespace YooAsset
/// </summary> /// </summary>
FSInitializeFileSystemOperation InitializeFileSystemAsync(); FSInitializeFileSystemOperation InitializeFileSystemAsync();
/// <summary>
/// 加载包裹清单
/// </summary>
FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout);
/// <summary> /// <summary>
/// 查询包裹版本 /// 查询包裹版本
/// </summary> /// </summary>
FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout); FSRequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options);
/// <summary>
/// 加载包裹清单
/// </summary>
FSLoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options);
/// <summary> /// <summary>
/// 清理缓存文件 /// 清理缓存文件

View File

@@ -1,19 +1,6 @@
 
namespace YooAsset namespace YooAsset
{ {
internal class ClearCacheFilesOptions
{
/// <summary>
/// 清理模式
/// </summary>
public string ClearMode;
/// <summary>
/// 附加参数
/// </summary>
public object ClearParam;
}
internal abstract class FSClearCacheFilesOperation : AsyncOperationBase internal abstract class FSClearCacheFilesOperation : AsyncOperationBase
{ {
} }

View File

@@ -10,7 +10,7 @@ namespace YooAsset
{ {
private List<AsyncOperationBase> _childs; private List<AsyncOperationBase> _childs;
private Action<AsyncOperationBase> _callback; private Action<AsyncOperationBase> _callback;
private int _whileFrame = 1000; private uint _priority = 0;
/// <summary> /// <summary>
/// 等待异步执行完成 /// 等待异步执行完成
@@ -35,10 +35,28 @@ namespace YooAsset
} }
} }
/// <summary>
/// 标记脏(用于调度器检测并重排)
/// </summary>
internal bool IsDirty { set; get; } = false;
/// <summary> /// <summary>
/// 任务优先级 /// 任务优先级
/// </summary> /// </summary>
public uint Priority { set; get; } = 0; public uint Priority
{
set
{
if (_priority == value)
return;
_priority = value;
IsDirty = true;
}
get
{
return _priority;
}
}
/// <summary> /// <summary>
/// 任务状态 /// 任务状态
@@ -122,7 +140,7 @@ namespace YooAsset
} }
internal virtual void InternalWaitForAsyncComplete() internal virtual void InternalWaitForAsyncComplete()
{ {
throw new System.NotImplementedException(this.GetType().Name); throw new YooInternalException($"InternalWaitForAsyncComplete() not implemented : {this.GetType().Name}");
} }
internal virtual string InternalGetDesc() internal virtual string InternalGetDesc()
{ {
@@ -137,9 +155,19 @@ namespace YooAsset
if (_childs == null) if (_childs == null)
_childs = new List<AsyncOperationBase>(10); _childs = new List<AsyncOperationBase>(10);
#if UNITY_EDITOR #if UNITY_EDITOR || DEBUG
if (child == null)
throw new YooInternalException("The child node is null !");
if (ReferenceEquals(child, this))
throw new YooInternalException("The child node cannot be itself !");
if (_childs.Contains(child)) if (_childs.Contains(child))
throw new YooInternalException($"The child node {child.GetType().Name} already exists !"); throw new YooInternalException($"The child node {child.GetType().Name} already exists !");
// 禁止形成环依赖
if (WouldCreateCycle(child))
throw new YooInternalException($"AddChildOperation would create a cycle : {this.GetType().Name} -> {child.GetType().Name}");
#endif #endif
_childs.Add(child); _childs.Add(child);
@@ -153,7 +181,10 @@ namespace YooAsset
if (_childs == null) if (_childs == null)
return; return;
#if UNITY_EDITOR #if UNITY_EDITOR || DEBUG
if (child == null)
throw new YooInternalException("The child node is null !");
if (_childs.Contains(child) == false) if (_childs.Contains(child) == false)
throw new YooInternalException($"The child node {child.GetType().Name} not exists !"); throw new YooInternalException($"The child node {child.GetType().Name} not exists !");
#endif #endif
@@ -182,7 +213,16 @@ namespace YooAsset
DebugBeginRecording(); DebugBeginRecording();
// 开始任务 // 开始任务
InternalStart(); try
{
InternalStart();
}
catch (Exception ex)
{
Status = EOperationStatus.Failed;
Error = ex.ToString();
YooLogger.Error($"Exception in {this.GetType().Name}.InternalStart : {ex}");
}
} }
} }
@@ -197,7 +237,18 @@ namespace YooAsset
DebugUpdateRecording(); DebugUpdateRecording();
// 更新任务 // 更新任务
InternalUpdate(); // 注意:兜底隔离机制
// 说明检测的异常源包含I/O解压/读写权限/磁盘满),平台差异等
try
{
InternalUpdate();
}
catch (Exception ex)
{
Status = EOperationStatus.Failed;
Error = ex.ToString();
YooLogger.Error($"Exception in {this.GetType().Name}.InternalUpdate : {ex}");
}
} }
if (IsDone && IsFinish == false) if (IsDone && IsFinish == false)
@@ -226,12 +277,15 @@ namespace YooAsset
Error = "user abort"; Error = "user abort";
YooLogger.Warning($"Async operation {this.GetType().Name} has been aborted !"); YooLogger.Warning($"Async operation {this.GetType().Name} has been aborted !");
} }
//注意强制收尾确保Task能完成
FinishOperation();
} }
/// <summary> /// <summary>
/// 强制结束异步任务 /// 强制结束异步任务
/// </summary> /// </summary>
internal void FinishOperation() private void FinishOperation()
{ {
if (IsFinish == false) if (IsFinish == false)
{ {
@@ -243,6 +297,7 @@ namespace YooAsset
try try
{ {
//TODO 单个回调异常会阻断后续订阅者
_callback?.Invoke(this); _callback?.Invoke(this);
} }
catch (Exception ex) catch (Exception ex)
@@ -259,25 +314,59 @@ namespace YooAsset
} }
/// <summary> /// <summary>
/// 执行While循环 /// 执行一次更新逻辑
/// </summary> /// </summary>
protected bool ExecuteWhileDone() protected void RunOnceExecution()
{ {
if (IsDone == false) if (IsDone)
return;
UpdateOperation();
}
/// <summary>
/// 批量执行一定次数的更新逻辑
/// </summary>
/// <param name="count">次数</param>
protected void RunBatchExecution(int count = 1000)
{
if (IsDone)
return;
int runCount = count;
while (true)
{ {
// 执行更新逻辑 // 执行更新逻辑
InternalUpdate(); UpdateOperation();
if (IsDone)
break;
// 当执行次数用完时 // 当执行次数用完时
_whileFrame--; runCount--;
if (_whileFrame <= 0) if (runCount <= 0)
{ break;
Status = EOperationStatus.Failed; }
Error = $"Operation {this.GetType().Name} failed to wait for async complete !"; }
YooLogger.Error(Error);
} /// <summary>
/// 无限次数的执行更新逻辑,直到任务完成
/// 注意:该方法会阻塞主线程
/// </summary>
/// <param name="sleepMS">休眠时长</param>
protected void RunUntilCompletion(int sleepMS = 1)
{
if (IsDone)
return;
while (true)
{
UpdateOperation();
if (IsDone)
break;
// 注意: 短暂休眠避免完全占用CPU资源
System.Threading.Thread.Sleep(sleepMS);
} }
return IsDone;
} }
/// <summary> /// <summary>
@@ -285,11 +374,7 @@ namespace YooAsset
/// </summary> /// </summary>
public void WaitForAsyncComplete() public void WaitForAsyncComplete()
{ {
if (IsDone)
return;
//TODO 防止异步操作被挂起陷入无限死循环! //TODO 防止异步操作被挂起陷入无限死循环!
// 例如:文件解压任务或者文件导入任务!
if (Status == EOperationStatus.None) if (Status == EOperationStatus.None)
{ {
StartOperation(); StartOperation();
@@ -298,12 +383,19 @@ namespace YooAsset
if (IsWaitForAsyncComplete == false) if (IsWaitForAsyncComplete == false)
{ {
IsWaitForAsyncComplete = true; IsWaitForAsyncComplete = true;
InternalWaitForAsyncComplete();
#if UNITY_EDITOR
if (IsDone == false) if (IsDone == false)
throw new YooInternalException($"WaitForAsyncComplete() must complete operation: {this.GetType().Name}"); InternalWaitForAsyncComplete();
#endif
if (IsDone == false)
{
Status = EOperationStatus.Failed;
Error = $"Operation {this.GetType().Name} failed to wait for async complete !";
YooLogger.Error(Error);
}
//注意强制收尾确保Task能完成
FinishOperation();
} }
} }
@@ -311,7 +403,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 开始的时间 /// 开始的时间
/// </summary> /// </summary>
public string BeginTime = string.Empty; public string BeginTime { protected set; get; }
/// <summary> /// <summary>
/// 处理耗时(单位:毫秒) /// 处理耗时(单位:毫秒)
@@ -326,7 +418,7 @@ namespace YooAsset
{ {
if (_watch == null) if (_watch == null)
{ {
BeginTime = SpawnTimeToString(UnityEngine.Time.realtimeSinceStartup); BeginTime = SpawnTimeToString(TimeUtility.RealtimeSinceStartup);
_watch = Stopwatch.StartNew(); _watch = Stopwatch.StartNew();
} }
} }
@@ -350,14 +442,51 @@ namespace YooAsset
} }
} }
private string SpawnTimeToString(float spawnTime) private string SpawnTimeToString(double spawnTime)
{ {
float h = UnityEngine.Mathf.FloorToInt(spawnTime / 3600f); double h = System.Math.Floor(spawnTime / 3600);
float m = UnityEngine.Mathf.FloorToInt(spawnTime / 60f - h * 60f); double m = System.Math.Floor(spawnTime / 60 - h * 60);
float s = UnityEngine.Mathf.FloorToInt(spawnTime - m * 60f - h * 3600f); double s = System.Math.Floor(spawnTime - m * 60 - h * 3600);
return h.ToString("00") + ":" + m.ToString("00") + ":" + s.ToString("00"); return h.ToString("00") + ":" + m.ToString("00") + ":" + s.ToString("00");
} }
private bool WouldCreateCycle(AsyncOperationBase child)
{
const int maxVisited = 4096;
var stack = new Stack<AsyncOperationBase>();
var visited = new HashSet<AsyncOperationBase>();
stack.Push(child);
while (stack.Count > 0)
{
var node = stack.Pop();
if (node == null)
continue;
if (visited.Add(node) == false)
continue;
if (visited.Count > maxVisited)
throw new YooInternalException("Child operation graph is too large, cycle check aborted !");
if (ReferenceEquals(node, this))
return true;
if (node._childs == null)
continue;
for (int i = 0; i < node._childs.Count; i++)
{
stack.Push(node._childs[i]);
}
}
return false;
}
/// <summary>
/// 获取调试信息
/// 注意:递归构建子树存在深度风险
/// </summary>
internal DebugOperationInfo GetDebugOperationInfo() internal DebugOperationInfo GetDebugOperationInfo()
{ {
var operationInfo = new DebugOperationInfo(); var operationInfo = new DebugOperationInfo();

View File

@@ -1,25 +0,0 @@

namespace YooAsset
{
public abstract class GameAsyncOperation : AsyncOperationBase
{
internal override void InternalStart()
{
OnStart();
}
internal override void InternalUpdate()
{
OnUpdate();
}
/// <summary>
/// 异步操作开始
/// </summary>
protected abstract void OnStart();
/// <summary>
/// 异步操作更新
/// </summary>
protected abstract void OnUpdate();
}
}

View File

@@ -10,6 +10,7 @@ namespace YooAsset
{ {
private readonly List<AsyncOperationBase> _operations = new List<AsyncOperationBase>(100); private readonly List<AsyncOperationBase> _operations = new List<AsyncOperationBase>(100);
private readonly List<AsyncOperationBase> _newList = new List<AsyncOperationBase>(100); private readonly List<AsyncOperationBase> _newList = new List<AsyncOperationBase>(100);
private uint _priority = 0;
/// <summary> /// <summary>
/// 所属包裹名称 /// 所属包裹名称
@@ -19,7 +20,23 @@ namespace YooAsset
/// <summary> /// <summary>
/// 调度器优先级(值越大越优先) /// 调度器优先级(值越大越优先)
/// </summary> /// </summary>
public int Priority { private set; get; } public uint Priority
{
get { return _priority; }
set
{
if (_priority != value)
{
_priority = value;
IsDirty = true;
}
}
}
/// <summary>
/// 优先级是否已变更(需要重新排序)
/// </summary>
public bool IsDirty { set; get; } = false;
/// <summary> /// <summary>
/// 创建顺序(用于同优先级稳定排序) /// 创建顺序(用于同优先级稳定排序)
@@ -27,10 +44,9 @@ namespace YooAsset
public int CreateIndex { private set; get; } public int CreateIndex { private set; get; }
public OperationScheduler(string packageName, int priority, int createIndex) public OperationScheduler(string packageName, int createIndex)
{ {
PackageName = packageName; PackageName = packageName;
Priority = priority;
CreateIndex = createIndex; CreateIndex = createIndex;
} }
@@ -41,9 +57,6 @@ namespace YooAsset
{ {
_newList.Add(operation); _newList.Add(operation);
operation.StartOperation(); operation.StartOperation();
// 通知开始回调
OperationSystem.InvokeStartCallback(PackageName, operation);
} }
/// <summary> /// <summary>
@@ -58,31 +71,29 @@ namespace YooAsset
if (operation.IsFinish) if (operation.IsFinish)
{ {
_operations.RemoveAt(i); _operations.RemoveAt(i);
// 通知完成回调
OperationSystem.InvokeFinishCallback(PackageName, operation);
} }
} }
// 添加新增的异步操作 // 添加新增的异步操作
if (_newList.Count > 0) if (_newList.Count > 0)
{ {
bool sorting = false;
foreach (var operation in _newList)
{
if (operation.Priority > 0)
{
sorting = true;
break;
}
}
_operations.AddRange(_newList); _operations.AddRange(_newList);
_newList.Clear(); _newList.Clear();
}
// 重新排序优先级 // 检测是否需要执行排序
if (sorting) bool isDirty = false;
_operations.Sort(); foreach (var operation in _operations)
{
if (operation.IsDirty)
{
operation.IsDirty = false;
isDirty = true;
}
}
if (isDirty)
{
_operations.Sort();
} }
// 更新进行中的异步操作 // 更新进行中的异步操作
@@ -109,7 +120,6 @@ namespace YooAsset
foreach (var operation in _newList) foreach (var operation in _newList)
{ {
operation.AbortOperation(); operation.AbortOperation();
operation.FinishOperation(); //注意强制收尾确保Task能完成
} }
_newList.Clear(); _newList.Clear();
@@ -117,7 +127,6 @@ namespace YooAsset
foreach (var operation in _operations) foreach (var operation in _operations)
{ {
operation.AbortOperation(); operation.AbortOperation();
operation.FinishOperation(); //注意强制收尾确保Task能完成
} }
_operations.Clear(); _operations.Clear();
} }

View File

@@ -5,7 +5,7 @@ using System.Diagnostics;
namespace YooAsset namespace YooAsset
{ {
internal class OperationSystem internal static class OperationSystem
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
[UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)] [UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
@@ -16,24 +16,36 @@ namespace YooAsset
#endif #endif
// 全局调度器名称 // 全局调度器名称
public const string GLOBAL_SCHEDULER_NAME = ""; public const string GLOBAL_SCHEDULER_NAME = "YOOASSET_GLOBAL_SCHEDULER";
private static readonly Dictionary<string, OperationScheduler> _schedulerDic = new Dictionary<string, OperationScheduler>(100); private static readonly Dictionary<string, OperationScheduler> _schedulerDic = new Dictionary<string, OperationScheduler>(100);
private static readonly List<OperationScheduler> _schedulerList = new List<OperationScheduler>(100); private static readonly List<OperationScheduler> _schedulerList = new List<OperationScheduler>(100);
private static bool _schedulerListDirty = false; private static bool _isInitialize = false;
private static int _createIndex = 0; private static int _createIndex = 0;
private static Action<string, AsyncOperationBase> _startCallback = null;
private static Action<string, AsyncOperationBase> _finishCallback = null;
// 计时器相关 // 计时器相关
private static Stopwatch _watch; private static Stopwatch _watch;
private static long _frameTime; private static long _frameTime;
private static long _maxTimeSlice = long.MaxValue;
/// <summary> /// <summary>
/// 异步操作系统的每帧最大执行预算(毫秒) /// 异步操作系统的每帧最大执行预算(毫秒)
/// </summary> /// </summary>
public static long MaxTimeSlice { set; get; } = long.MaxValue; public static long MaxTimeSlice
{
set
{
if (value < 10)
{
_maxTimeSlice = 10;
YooLogger.Warning($"MaxTimeSlice minimum value is 10 milliseconds.");
}
else
{
_maxTimeSlice = value;
}
}
}
/// <summary> /// <summary>
/// 异步操作系统是否繁忙 /// 异步操作系统是否繁忙
@@ -45,11 +57,11 @@ namespace YooAsset
if (_watch == null) if (_watch == null)
return false; return false;
if (MaxTimeSlice == long.MaxValue) if (_maxTimeSlice == long.MaxValue)
return false; return false;
// 注意 : 单次调用开销约1微秒 // 注意 : 单次调用开销约1微秒
return _watch.ElapsedMilliseconds - _frameTime >= MaxTimeSlice; return _watch.ElapsedMilliseconds - _frameTime >= _maxTimeSlice;
} }
} }
@@ -59,10 +71,14 @@ namespace YooAsset
/// </summary> /// </summary>
public static void Initialize() public static void Initialize()
{ {
_watch = Stopwatch.StartNew(); if (_isInitialize == false)
{
_isInitialize = true;
_watch = Stopwatch.StartNew();
// 创建全局调度器 // 创建全局调度器
CreatePackageScheduler(GLOBAL_SCHEDULER_NAME, 0); CreatePackageScheduler(GLOBAL_SCHEDULER_NAME, uint.MaxValue);
}
} }
/// <summary> /// <summary>
@@ -70,10 +86,21 @@ namespace YooAsset
/// </summary> /// </summary>
public static void Update() public static void Update()
{ {
// 重新排序调度器 if (_isInitialize == false)
if (_schedulerListDirty) return;
// 检测是否需要执行排序
bool isDirty = false;
foreach (var scheduler in _schedulerList)
{
if (scheduler.IsDirty)
{
scheduler.IsDirty = false;
isDirty = true;
}
}
if (isDirty)
{ {
_schedulerListDirty = false;
_schedulerList.Sort(); _schedulerList.Sort();
} }
@@ -95,6 +122,9 @@ namespace YooAsset
/// </summary> /// </summary>
public static void DestroyAll() public static void DestroyAll()
{ {
_isInitialize = false;
YooLogger.Log("Operation system destroy all !");
// 清空所有调度器 // 清空所有调度器
foreach (var scheduler in _schedulerList) foreach (var scheduler in _schedulerList)
{ {
@@ -102,11 +132,8 @@ namespace YooAsset
} }
_schedulerDic.Clear(); _schedulerDic.Clear();
_schedulerList.Clear(); _schedulerList.Clear();
_schedulerListDirty = false;
_createIndex = 0; _createIndex = 0;
_startCallback = null;
_finishCallback = null;
_watch = null; _watch = null;
_frameTime = 0; _frameTime = 0;
MaxTimeSlice = long.MaxValue; MaxTimeSlice = long.MaxValue;
@@ -115,24 +142,29 @@ namespace YooAsset
/// <summary> /// <summary>
/// 创建包裹调度器 /// 创建包裹调度器
/// </summary> /// </summary>
internal static void CreatePackageScheduler(string packageName, int priority) public static OperationScheduler CreatePackageScheduler(string packageName, uint priority)
{ {
DebugCheckInitialize(packageName);
if (_schedulerDic.ContainsKey(packageName)) if (_schedulerDic.ContainsKey(packageName))
{ {
throw new YooInternalException($"Package scheduler already exists: {packageName}"); throw new YooInternalException($"Package scheduler already exists: {packageName}");
} }
var scheduler = new OperationScheduler(packageName, priority, _createIndex++); var scheduler = new OperationScheduler(packageName, _createIndex++);
_schedulerDic.Add(packageName, scheduler); _schedulerDic.Add(packageName, scheduler);
_schedulerList.Add(scheduler); _schedulerList.Add(scheduler);
_schedulerListDirty = true; scheduler.Priority = priority;
return scheduler;
} }
/// <summary> /// <summary>
/// 销毁包裹调度器 /// 销毁包裹调度器
/// </summary> /// </summary>
internal static void DestroyPackageScheduler(string packageName) public static void DestroyPackageScheduler(string packageName)
{ {
DebugCheckInitialize(packageName);
// 不允许销毁默认调度器 // 不允许销毁默认调度器
if (packageName == GLOBAL_SCHEDULER_NAME) if (packageName == GLOBAL_SCHEDULER_NAME)
{ {
@@ -152,6 +184,8 @@ namespace YooAsset
/// </summary> /// </summary>
public static void ClearPackageOperation(string packageName) public static void ClearPackageOperation(string packageName)
{ {
DebugCheckInitialize(packageName);
var scheduler = GetScheduler(packageName); var scheduler = GetScheduler(packageName);
scheduler.ClearAll(); scheduler.ClearAll();
} }
@@ -161,40 +195,32 @@ namespace YooAsset
/// </summary> /// </summary>
public static void StartOperation(string packageName, AsyncOperationBase operation) public static void StartOperation(string packageName, AsyncOperationBase operation)
{ {
DebugCheckInitialize(packageName);
var scheduler = GetScheduler(packageName); var scheduler = GetScheduler(packageName);
scheduler.StartOperation(operation); scheduler.StartOperation(operation);
} }
/// <summary> /// <summary>
/// 监听任务开始 /// 设置调度器优先级
/// </summary> /// </summary>
public static void RegisterStartCallback(Action<string, AsyncOperationBase> callback) public static void SetSchedulerPriority(string packageName, uint priority)
{ {
_startCallback = callback; DebugCheckInitialize(packageName);
var scheduler = GetScheduler(packageName);
scheduler.Priority = priority;
} }
/// <summary> /// <summary>
/// 监听任务结束 /// 获取调度器优先级
/// </summary> /// </summary>
public static void RegisterFinishCallback(Action<string, AsyncOperationBase> callback) public static uint GetSchedulerPriority(string packageName)
{ {
_finishCallback = callback; DebugCheckInitialize(packageName);
}
/// <summary> var scheduler = GetScheduler(packageName);
/// 触发任务开始回调 return scheduler.Priority;
/// </summary>
internal static void InvokeStartCallback(string packageName, AsyncOperationBase operation)
{
_startCallback?.Invoke(packageName, operation);
}
/// <summary>
/// 触发任务完成回调
/// </summary>
internal static void InvokeFinishCallback(string packageName, AsyncOperationBase operation)
{
_finishCallback?.Invoke(packageName, operation);
} }
/// <summary> /// <summary>
@@ -202,32 +228,34 @@ namespace YooAsset
/// </summary> /// </summary>
private static OperationScheduler GetScheduler(string packageName) private static OperationScheduler GetScheduler(string packageName)
{ {
// 空包名路由到默认调度器
if (string.IsNullOrEmpty(packageName))
packageName = GLOBAL_SCHEDULER_NAME;
if (_schedulerDic.TryGetValue(packageName, out var scheduler)) if (_schedulerDic.TryGetValue(packageName, out var scheduler))
{ {
return scheduler; return scheduler;
} }
// 严格模式:非默认包裹必须先创建调度器 // 严格模式:非默认包裹必须先创建调度器
throw new YooInternalException($"Package scheduler not found: {packageName}. Please call YooAssets.CreatePackage() first!"); throw new YooInternalException($"Operation scheduler not found: {packageName}.");
} }
#region #region
internal static List<DebugOperationInfo> GetDebugOperationInfos(string packageName) internal static List<DebugOperationInfo> GetDebugOperationInfos(string packageName)
{ {
// 空包名路由到默认调度器 DebugCheckInitialize(packageName);
if (string.IsNullOrEmpty(packageName))
packageName = GLOBAL_SCHEDULER_NAME;
if (_schedulerDic.TryGetValue(packageName, out var scheduler)) var scheduler = GetScheduler(packageName);
{ return scheduler.GetDebugOperationInfos();
return scheduler.GetDebugOperationInfos(); }
} #endregion
return new List<DebugOperationInfo>(); #region
[Conditional("DEBUG")]
private static void DebugCheckInitialize(string packageName)
{
if (string.IsNullOrWhiteSpace(packageName))
throw new YooInternalException("Package name is null or empty.");
if (_isInitialize == false)
throw new YooInternalException($"{nameof(OperationSystem)} not initialized !");
} }
#endregion #endregion
} }

View File

@@ -32,23 +32,23 @@ OperationSystem 是 YooAsset 资源管理系统的**异步操作调度核心**
``` ```
┌─────────────────────────────────────────────────────────┐ ┌─────────────────────────────────────────────────────────┐
│ 上层调用者 │ │ 上层调用者
│ (ResourceManager / FileSystem / 业务层) │ │ (ResourceManager / FileSystem / 业务层) │
└─────────────────────────┬───────────────────────────────┘ └─────────────────────────┬───────────────────────────────┘
│ StartOperation() │ StartOperation()
┌─────────────────────────▼───────────────────────────────┐ ┌─────────────────────────▼───────────────────────────────┐
│ OperationSystem │ OperationSystem │
│ (调度器) │ │ (调度器) │
│ ┌─────────────┐ ┌─────────────┐ ┌─────────────┐ │ │ ┌─────────────┐ ┌─────────────┐ ┌─────────────┐ │
│ │ 优先级队列 │ │ 时间切片 │ │ 回调通知 │ │ │ │ 优先级队列 │ │ 时间切片 │ │ 回调通知 │ │
│ └─────────────┘ └─────────────┘ └─────────────┘ │ │ └─────────────┘ └─────────────┘ └─────────────┘ │
└─────────────────────────┬───────────────────────────────┘ └─────────────────────────┬───────────────────────────────┘
│ UpdateOperation() │ UpdateOperation()
┌─────────────────────────▼───────────────────────────────┐ ┌─────────────────────────▼───────────────────────────────┐
│ AsyncOperationBase │ AsyncOperationBase │
│ (操作基类) │ │ (操作基类) │
│ ┌─────────────┐ ┌─────────────┐ ┌─────────────┐ │ │ ┌─────────────┐ ┌─────────────┐ ┌─────────────┐ │
│ │ 状态机 │ │ 子任务管理 │ │ 异步模式 │ │ │ │ 状态机 │ │ 子任务管理 │ │ 异步模式 │ │
│ └─────────────┘ └─────────────┘ └─────────────┘ │ │ └─────────────┘ └─────────────┘ └─────────────┘ │
└─────────────────────────────────────────────────────────┘ └─────────────────────────────────────────────────────────┘
``` ```
@@ -56,8 +56,8 @@ OperationSystem 是 YooAsset 资源管理系统的**异步操作调度核心**
### 核心组件 ### 核心组件
- **OperationSystem**: 静态调度器,管理所有操作的执行 - **OperationSystem**: 静态调度器,管理所有操作的执行
- **OperationScheduler**: 包裹级调度器,维护操作队列并负责更新调度
- **AsyncOperationBase**: 异步操作基类,定义生命周期和状态 - **AsyncOperationBase**: 异步操作基类,定义生命周期和状态
- **GameAsyncOperation**: 游戏层操作基类,提供更友好的 API
- **EOperationStatus**: 操作状态枚举 - **EOperationStatus**: 操作状态枚举
--- ---
@@ -68,8 +68,8 @@ OperationSystem 是 YooAsset 资源管理系统的**异步操作调度核心**
OperationSystem/ OperationSystem/
├── EOperationStatus.cs # 操作状态枚举 ├── EOperationStatus.cs # 操作状态枚举
├── AsyncOperationBase.cs # 异步操作基类 ├── AsyncOperationBase.cs # 异步操作基类
├── OperationScheduler.cs # 包裹级调度器
├── OperationSystem.cs # 异步操作调度器 ├── OperationSystem.cs # 异步操作调度器
└── GameAsyncOperation.cs # 游戏层操作基类
``` ```
--- ---
@@ -113,12 +113,21 @@ None ─────────────────► Processing ───
| `Status` | `EOperationStatus` | 当前状态 | | `Status` | `EOperationStatus` | 当前状态 |
| `Error` | `string` | 错误信息(失败时) | | `Error` | `string` | 错误信息(失败时) |
| `Progress` | `float` | 处理进度0-1 | | `Progress` | `float` | 处理进度0-1 |
| `PackageName` | `string` | 所属包裹名称 |
| `IsDone` | `bool` | 是否已完成Succeed 或 Failed | | `IsDone` | `bool` | 是否已完成Succeed 或 Failed |
| `Task` | `Task` | 用于 async/await | | `Task` | `Task` | 用于 async/await |
| `BeginTime` | `string` | 开始时间(调试用) | | `BeginTime` | `string` | 开始时间(调试用) |
| `ProcessTime` | `long` | 处理耗时毫秒(调试用) | | `ProcessTime` | `long` | 处理耗时毫秒(调试用) |
> 说明:`AsyncOperationBase` 本身不保存包裹名称;包裹名称由 `OperationSystem.StartOperation(packageName, operation)` 传入,并由 `OperationScheduler` 维护。
#### 内部协作:时间切片(`IsBusy`
为配合 `OperationSystem.MaxTimeSlice` 的时间切片预算,`AsyncOperationBase` 提供了内部属性 `IsBusy``internal`)用于任务在 `InternalUpdate()` 内主动让出本帧预算。
- 推荐用法:在 `InternalUpdate()` 内部(或内部子步骤)在执行重逻辑前判断 `IsBusy`,若繁忙则 `return`,把工作拆到下一帧继续执行。
- 同步等待特殊处理:当调用了 `WaitForAsyncComplete()` 进入同步等待阶段时,`IsBusy` 会强制返回 `false`,避免因时间切片判断导致同步等待无法推进。
- 注意:`WaitForAsyncComplete()` 会阻塞主线程,应谨慎使用;同步等待阶段不受时间切片保护,可能带来卡顿。
#### 公共事件 #### 公共事件
```csharp ```csharp
@@ -150,14 +159,16 @@ public void WaitForAsyncComplete();
#### 子任务管理 #### 子任务管理
```csharp ```csharp
// 子任务列表 // 添加/移除子任务(内部使用)
internal readonly List<AsyncOperationBase> Childs;
// 添加/移除子任务
internal void AddChildOperation(AsyncOperationBase child); internal void AddChildOperation(AsyncOperationBase child);
internal void RemoveChildOperation(AsyncOperationBase child); internal void RemoveChildOperation(AsyncOperationBase child);
``` ```
**调用约束(重要):**
- 仅允许在 Unity 主线程调用(与 `OperationSystem.Update()` 的调度线程一致)。
- 不要在 `InternalUpdate()` 正在遍历/处理中途频繁增删子任务;推荐在任务启动阶段完成子任务挂接,或在确保无并发修改风险的安全点调整。
- `AbortOperation()` 会递归中止子任务,子任务的生命周期由父任务统一管理;避免在 `Completed` 回调里再去修改子任务关系,防止时序混乱。
--- ---
### OperationSystem调度器 ### OperationSystem调度器
@@ -206,61 +217,36 @@ public static void ClearPackageOperation(string packageName);
/// 启动异步操作 /// 启动异步操作
/// </summary> /// </summary>
public static void StartOperation(string packageName, AsyncOperationBase operation); public static void StartOperation(string packageName, AsyncOperationBase operation);
/// <summary>
/// 设置调度器优先级
/// </summary>
public static void SetSchedulerPriority(string packageName, uint priority);
/// <summary>
/// 获取调度器优先级
/// </summary>
public static uint GetSchedulerPriority(string packageName);
``` ```
#### 包裹调度说明
- `packageName` 不允许为空(`null` / `""`),否则会抛出异常。
- 若需要使用全局调度器,请传入 `OperationSystem.GLOBAL_SCHEDULER_NAME``Initialize()` 时自动创建)。
- `packageName` 为非全局调度器名称时,必须先通过 `YooAssets.CreatePackage(packageName)` 创建包裹(内部会注册对应 `OperationScheduler`),否则会抛出异常。
#### 回调监听 #### 回调监听
```csharp OperationSystem **当前未提供**全局任务开始/结束回调的注册接口。
/// <summary>
/// 注册任务开始回调
/// </summary>
public static void RegisterStartCallback(Action<string, AsyncOperationBase> callback);
/// <summary> 如需监听任务结束(推荐),请直接订阅具体任务的 `Completed` 事件:
/// 注册任务结束回调
/// </summary>
public static void RegisterFinishCallback(Action<string, AsyncOperationBase> callback);
```
---
### GameAsyncOperation游戏层基类
继承 `AsyncOperationBase`,为业务层提供更友好的 API。
```csharp ```csharp
public abstract class GameAsyncOperation : AsyncOperationBase var operation = package.LoadAssetAsync<GameObject>(location);
operation.Completed += op =>
{ {
/// <summary> // TODO : 根据 op.Status 判断成功/失败
/// 异步操作开始 };
/// </summary>
protected abstract void OnStart();
/// <summary>
/// 异步操作更新
/// </summary>
protected abstract void OnUpdate();
/// <summary>
/// 异步操作终止
/// </summary>
protected abstract void OnAbort();
/// <summary>
/// 异步等待完成(可选重写)
/// </summary>
protected virtual void OnWaitForAsyncComplete();
/// <summary>
/// 异步操作系统是否繁忙
/// </summary>
protected bool IsBusy();
/// <summary>
/// 终止异步操作
/// </summary>
protected void Abort();
}
``` ```
--- ---
@@ -339,15 +325,37 @@ void LoadAssetSync()
操作按 `Priority` 属性降序排列,优先级高的操作先执行。 操作按 `Priority` 属性降序排列,优先级高的操作先执行。
#### 操作优先级
```csharp ```csharp
var operation = package.LoadAssetAsync<GameObject>(location); var operation = package.LoadAssetAsync<GameObject>(location);
operation.Priority = 100; // 设置高优先级 operation.Priority = 100; // 设置高优先级
``` ```
#### 包裹优先级
通过 `ResourcePackage.PackagePriority` 可以设置包裹的调度器优先级,值越大越优先更新。
```csharp
// 创建包裹时指定优先级
var package = YooAssets.CreatePackage("MyPackage", 100);
// 运行时动态调整优先级
package.PackagePriority = 200;
// 获取当前优先级
uint priority = package.PackagePriority;
```
**使用场景:**
- 多包裹场景下,可根据游戏状态动态调整包裹优先级
- 例如:进入战斗时提高战斗资源包的优先级,退出战斗时恢复默认优先级
**排序规则:** **排序规则:**
- 新操作添加时检查是否需要排序 - 新操作添加时:若新增队列存在非零优先级,则触发排序
- 仅当存在非零优先级时触发排序 - 运行中修改 `Priority`:调度器会在每帧 `Update()` 的排序阶段检测 `IsDirty` 并触发重排;若在某个操作的 `InternalUpdate()` 内修改(本帧排序已完成),则新的优先级会延后一帧生效(可能与预期不符)
- 使用 `List.Sort()` 进行原地排序 - 若期望本帧生效:请尽量在任务入队前或本帧调度器 `Update()` 开始前设置 `Priority`,避免在 `InternalUpdate()` 内临时调整
- 排序使用 `List.Sort()` 进行原地排序;频繁修改优先级会带来额外排序开销,建议按需使用
### 时间切片 ### 时间切片
@@ -358,6 +366,10 @@ operation.Priority = 100; // 设置高优先级
OperationSystem.MaxTimeSlice = 8; OperationSystem.MaxTimeSlice = 8;
``` ```
**操作侧协作建议:**
- 在操作的 `InternalUpdate()` 中使用 `IsBusy``AsyncOperationBase` 的内部属性)进行“自愿让出”,将重任务拆分到多帧执行。
- 在同步等待(`WaitForAsyncComplete()`)阶段,`IsBusy` 会强制返回 `false`,以保证同步等待推进;此时需要自行评估卡顿风险。
**执行流程:** **执行流程:**
``` ```
@@ -420,24 +432,29 @@ OperationSystem.MaxTimeSlice = 8;
### 调试信息结构 ### 调试信息结构
```csharp ```csharp
[Serializable]
internal struct DebugOperationInfo internal struct DebugOperationInfo
{ {
public string OperationName; // 操作类型名 public string OperationName; // 任务名称
public string OperationDesc; // 操作描述 public string OperationDesc; // 任务说明
public uint Priority; // 优先级 public uint Priority; // 优先级
public float Progress; // 进度 public float Progress; // 任务进度
public string BeginTime; // 开始时间 public string BeginTime; // 任务开始时间
public long ProcessTime; // 处理耗时(毫秒) public long ProcessTime; // 处理耗时(单位:毫秒)
public string Status; // 状态 public string Status; // 任务状态
public List<DebugOperationInfo> Childs; // 子操作 public List<DebugOperationInfo> Childs; // 子任务列表注意JsonUtility 序列化深度限制)
} }
``` ```
> 说明:该结构体真实定义位于 `Runtime/DiagnosticSystem/DebugOperationInfo.cs`,这里仅展示关键字段以便理解。
### 获取调试信息 ### 获取调试信息
```csharp ```csharp
// 获取指定包裹的所有操作信息 // 获取指定包裹的所有操作信息(内部调试接口)
var infos = OperationSystem.GetDebugOperationInfos("DefaultPackage"); // packageName 不允许为空;全局调度器请使用 OperationSystem.GLOBAL_SCHEDULER_NAME
// 非全局包裹需先 YooAssets.CreatePackage(packageName)
var infos = OperationSystem.GetDebugOperationInfos(OperationSystem.GLOBAL_SCHEDULER_NAME);
foreach (var info in infos) foreach (var info in infos)
{ {
@@ -457,105 +474,6 @@ Debug.Log($"处理耗时: {operation.ProcessTime}ms");
--- ---
## 使用示例
### 自定义异步操作
```csharp
public class MyCustomOperation : GameAsyncOperation
{
private int _step = 0;
protected override void OnStart()
{
// 初始化操作
_step = 0;
}
protected override void OnUpdate()
{
// 检查系统是否繁忙(时间切片)
if (IsBusy())
return;
// 执行步骤
switch (_step)
{
case 0:
// 第一步
Progress = 0.3f;
_step = 1;
break;
case 1:
// 第二步
Progress = 0.6f;
_step = 2;
break;
case 2:
// 完成
Status = EOperationStatus.Succeed;
break;
}
}
protected override void OnAbort()
{
// 清理资源
}
}
```
### 启动自定义操作
```csharp
var operation = new MyCustomOperation();
OperationSystem.StartOperation("DefaultPackage", operation);
// 使用回调
operation.Completed += (op) =>
{
if (op.Status == EOperationStatus.Succeed)
Debug.Log("操作成功");
};
// 或使用 await
await operation.Task;
```
### 带子任务的操作
```csharp
public class ParentOperation : GameAsyncOperation
{
private ChildOperation _child;
protected override void OnStart()
{
_child = new ChildOperation();
AddChildOperation(_child); // 添加子任务
OperationSystem.StartOperation(PackageName, _child);
}
protected override void OnUpdate()
{
if (_child.IsDone)
{
if (_child.Status == EOperationStatus.Succeed)
Status = EOperationStatus.Succeed;
else
Status = EOperationStatus.Failed;
}
}
protected override void OnAbort()
{
// 子任务会自动中止
}
}
```
---
## 设计模式 ## 设计模式
### 模板方法模式 ### 模板方法模式
@@ -589,7 +507,7 @@ AsyncOperationBase
### 组合模式 ### 组合模式
通过 `Childs` 列表支持父子操作关系: 通过内部子任务列表支持父子操作关系:
``` ```
ParentOperation ParentOperation
@@ -608,10 +526,6 @@ IEnumerator + IComparable<AsyncOperationBase>
AsyncOperationBase (抽象基类) AsyncOperationBase (抽象基类)
├── GameAsyncOperation (游戏层基类)
│ │
│ └── [业务层自定义操作]
└── [YooAsset 内部操作] └── [YooAsset 内部操作]
@@ -632,4 +546,4 @@ IEnumerator + IComparable<AsyncOperationBase>
4. **子任务中止**:父操作中止时会自动中止所有子操作 4. **子任务中止**:父操作中止时会自动中止所有子操作
5. **回调异常**`Completed` 回调中的异常会被捕获并记录,不会中断系统 5. **回调异常**`Completed` 回调中的异常会被捕获并记录,不会中断系统
6. **编辑器重置**:编辑器中使用 `RuntimeInitializeOnLoadMethod` 自动重置状态 6. **编辑器重置**:编辑器中使用 `RuntimeInitializeOnLoadMethod` 自动重置状态
7. **循环保护**`WaitForAsyncComplete()` 有 1000 帧上限,防止无限循环 7. **循环保护**`InternalWaitForAsyncComplete()` 中建议使用 `RunBatchExecution()`(默认 1000 次)限制单次推进次数,避免陷入无限循环或长时间占用主线程

View File

@@ -62,6 +62,9 @@ namespace YooAsset
return; return;
} }
if (IsWaitForAsyncComplete)
_handle.WaitForAsyncComplete();
if (_handle.IsDone == false) if (_handle.IsDone == false)
return; return;
@@ -138,18 +141,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
// 等待句柄完成
if (_handle != null)
_handle.WaitForAsyncComplete();
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
internal override string InternalGetDesc() internal override string InternalGetDesc()
{ {

View File

@@ -127,14 +127,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
internal override string InternalGetDesc() internal override string InternalGetDesc()
{ {

View File

@@ -3,19 +3,6 @@ using UnityEngine;
namespace YooAsset namespace YooAsset
{ {
public sealed class UnloadAllAssetsOptions
{
/// <summary>
/// 释放所有资源句柄,防止卸载过程中触发完成回调!
/// </summary>
public bool ReleaseAllHandles = false;
/// <summary>
/// 卸载过程中锁定加载操作,防止新的任务请求!
/// </summary>
public bool LockLoadOperation = false;
}
public sealed class UnloadAllAssetsOperation : AsyncOperationBase public sealed class UnloadAllAssetsOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
@@ -49,14 +36,6 @@ namespace YooAsset
if (_steps == ESteps.CheckOptions) if (_steps == ESteps.CheckOptions)
{ {
if (_options == null)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{nameof(UnloadAllAssetsOptions)} is null.";
return;
}
// 设置锁定状态 // 设置锁定状态
if (_options.LockLoadOperation) if (_options.LockLoadOperation)
_resManager.LockLoadOperation = true; _resManager.LockLoadOperation = true;

View File

@@ -0,0 +1,22 @@

namespace YooAsset
{
public struct UnloadAllAssetsOptions
{
/// <summary>
/// 释放所有资源句柄,防止卸载过程中触发完成回调!
/// </summary>
public bool ReleaseAllHandles { private set; get; }
/// <summary>
/// 卸载过程中锁定加载操作,防止新的任务请求!
/// </summary>
public bool LockLoadOperation { private set; get; }
public UnloadAllAssetsOptions(bool releaseAllHandles, bool lockLoadOperation)
{
ReleaseAllHandles = releaseAllHandles;
LockLoadOperation = lockLoadOperation;
}
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ff8a96dd005f55346986f8a98aff8c99 guid: dc733fff9ba8d5747b556fb6cdb2b9e2
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

View File

@@ -53,14 +53,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
internal override string InternalGetDesc() internal override string InternalGetDesc()
{ {

View File

@@ -183,14 +183,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
internal override string InternalGetDesc() internal override string InternalGetDesc()
{ {

View File

@@ -44,11 +44,11 @@ namespace YooAsset
/// <summary> /// <summary>
/// 初始化 /// 初始化
/// </summary> /// </summary>
public void Initialize(InitializeParameters parameters, IBundleQuery bundleServices) public void Initialize(InitializePackageOptions options, IBundleQuery bundleServices)
{ {
_bundleLoadingMaxConcurrency = parameters.BundleLoadingMaxConcurrency; _bundleLoadingMaxConcurrency = options.BundleLoadingMaxConcurrency;
AutoUnloadBundleWhenUnused = parameters.AutoUnloadBundleWhenUnused; AutoUnloadBundleWhenUnused = options.AutoUnloadBundleWhenUnused;
WebGLForceSyncLoadAsset = parameters.WebGLForceSyncLoadAsset; WebGLForceSyncLoadAsset = options.WebGLForceSyncLoadAsset;
_bundleQuery = bundleServices; _bundleQuery = bundleServices;
SceneManager.sceneUnloaded += OnSceneUnloaded; SceneManager.sceneUnloaded += OnSceneUnloaded;
} }

View File

@@ -22,5 +22,10 @@ namespace YooAsset
/// 原生文件 /// 原生文件
/// </summary> /// </summary>
RawBundle = 3, RawBundle = 3,
/// <summary>
/// 团结资源包
/// </summary>
InstantBundle = 4,
} }
} }

View File

@@ -0,0 +1,34 @@

namespace YooAsset
{
/// <summary>
/// 运行模式
/// </summary>
public enum EPlayMode
{
/// <summary>
/// 编辑器下的模拟模式
/// </summary>
EditorSimulateMode,
/// <summary>
/// 离线运行模式
/// </summary>
OfflinePlayMode,
/// <summary>
/// 联机运行模式
/// </summary>
HostPlayMode,
/// <summary>
/// WebGL运行模式
/// </summary>
WebPlayMode,
/// <summary>
/// 自定义运行模式
/// </summary>
CustomPlayMode,
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c870af6a4c0efe444af84f4c3ba8c2c9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -14,19 +14,19 @@ namespace YooAsset
void DestroyFileSystem(); void DestroyFileSystem();
/// <summary> /// <summary>
/// 向网络端请求最新的资源版本 /// 请求最新的资源版本
/// </summary> /// </summary>
RequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout); RequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options);
/// <summary> /// <summary>
/// 向网络端请求并更新清单 /// 请求并加载资源清单
/// </summary> /// </summary>
UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion, int timeout); LoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options);
/// <summary> /// <summary>
/// 预下载指定版本的包裹内容 /// 预下载指定版本的包裹内容
/// </summary> /// </summary>
PreDownloadContentOperation PreDownloadContentAsync(string packageVersion, int timeout); PreDownloadContentOperation PreDownloadContentAsync(PreDownloadContentOptions options);
/// <summary> /// <summary>
/// 清理缓存文件 /// 清理缓存文件

View File

@@ -0,0 +1,32 @@

namespace YooAsset
{
public struct ClearCacheFilesOptions
{
/// <summary>
/// 清理模式
/// </summary>
public string ClearMode { private set; get; }
/// <summary>
/// 附加参数
/// </summary>
public object ClearParam { private set; get; }
public ClearCacheFilesOptions(EFileClearMode clearMode)
{
ClearMode = clearMode.ToString();
ClearParam = null;
}
public ClearCacheFilesOptions(EFileClearMode clearMode, object clearParam)
{
ClearMode = clearMode.ToString();
ClearParam = clearParam;
}
public ClearCacheFilesOptions(string clearMode, object clearParam)
{
ClearMode = clearMode;
ClearParam = clearParam;
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4213bf1907101944b88f32ff19367b6f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,7 +1,7 @@
 
namespace YooAsset namespace YooAsset
{ {
public class DestroyOperation : AsyncOperationBase public class DestroyPackageOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
@@ -18,7 +18,7 @@ namespace YooAsset
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
public DestroyOperation(ResourcePackage resourcePackage, UnloadAllAssetsOptions options) public DestroyPackageOperation(ResourcePackage resourcePackage, UnloadAllAssetsOptions options)
{ {
_resourcePackage = resourcePackage; _resourcePackage = resourcePackage;
_options = options; _options = options;
@@ -90,7 +90,7 @@ namespace YooAsset
if (_steps == ESteps.DestroyPackage) if (_steps == ESteps.DestroyPackage)
{ {
// 销毁包裹 // 销毁包裹
_resourcePackage.DestroyPackage(); _resourcePackage.InternalDestroy();
// 最后清理该包裹的异步任务 // 最后清理该包裹的异步任务
// 注意:对于有线程操作的异步任务,需要保证线程安全释放。 // 注意:对于有线程操作的异步任务,需要保证线程安全释放。

View File

@@ -3,13 +3,115 @@ using System.Collections.Generic;
namespace YooAsset namespace YooAsset
{ {
#region
/// <summary>
/// 下载器结束
/// </summary>
public struct DownloaderFinishData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 是否成功
/// </summary>
public bool Succeed;
}
/// <summary>
/// 下载器相关的更新数据
/// </summary>
public struct DownloadUpdateData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 下载进度 (0-1f)
/// </summary>
public float Progress;
/// <summary>
/// 下载文件总数
/// </summary>
public int TotalDownloadCount;
/// <summary>
/// 当前完成的下载文件数量
/// </summary>
public int CurrentDownloadCount;
/// <summary>
/// 下载数据总大小(单位:字节)
/// </summary>
public long TotalDownloadBytes;
/// <summary>
/// 当前完成的下载数据大小(单位:字节)
/// </summary>
public long CurrentDownloadBytes;
}
/// <summary>
/// 下载器相关的错误数据
/// </summary>
public struct DownloadErrorData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 下载失败的文件名称
/// </summary>
public string FileName;
/// <summary>
/// 错误信息
/// </summary>
public string ErrorInfo;
}
/// <summary>
/// 下载器相关的文件数据
/// </summary>
public struct DownloadFileData
{
/// <summary>
/// 所属包裹名称
/// </summary>
public string PackageName;
/// <summary>
/// 资源包名称
/// </summary>
public string BundleName;
/// <summary>
/// 文件名称
/// </summary>
public string FileName;
/// <summary>
/// 文件大小
/// </summary>
public long FileSize;
}
#endregion
public abstract class DownloaderOperation : AsyncOperationBase public abstract class DownloaderOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
None, None,
Check, Check,
Loading, Downloading,
Finish,
Done, Done,
} }
@@ -127,15 +229,37 @@ namespace YooAsset
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Failed; Status = EOperationStatus.Failed;
Error = "Download list is null."; Error = "Download bundle list is null.";
if (DownloadFinishCallback != null)
{
var data = new DownloaderFinishData();
data.PackageName = _packageName;
data.Succeed = false;
DownloadFinishCallback.Invoke(data);
}
}
else if (_bundleInfoList.Count == 0)
{
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
Progress = 1f;
if (DownloadFinishCallback != null)
{
var data = new DownloaderFinishData();
data.PackageName = _packageName;
data.Succeed = true;
DownloadFinishCallback.Invoke(data);
}
} }
else else
{ {
_steps = ESteps.Loading; _steps = ESteps.Downloading;
} }
} }
if (_steps == ESteps.Loading) if (_steps == ESteps.Downloading)
{ {
// 检测下载器结果 // 检测下载器结果
_removeList.Clear(); _removeList.Clear();
@@ -172,7 +296,10 @@ namespace YooAsset
{ {
_lastDownloadBytes = downloadBytes; _lastDownloadBytes = downloadBytes;
_lastDownloadCount = _cachedDownloadCount; _lastDownloadCount = _cachedDownloadCount;
Progress = (float)_lastDownloadBytes / TotalDownloadBytes; if (TotalDownloadBytes == 0)
Progress = (float)_lastDownloadCount / TotalDownloadCount;
else
Progress = (float)_lastDownloadBytes / TotalDownloadBytes;
if (DownloadUpdateCallback != null) if (DownloadUpdateCallback != null)
{ {
@@ -209,54 +336,60 @@ namespace YooAsset
{ {
var data = new DownloadFileData(); var data = new DownloadFileData();
data.PackageName = _packageName; data.PackageName = _packageName;
data.FileName = bundleInfo.Bundle.BundleName; data.BundleName = bundleInfo.Bundle.BundleName;
data.FileName = bundleInfo.Bundle.FileName;
data.FileSize = bundleInfo.Bundle.FileSize; data.FileSize = bundleInfo.Bundle.FileSize;
DownloadFileBeginCallback.Invoke(data); DownloadFileBeginCallback.Invoke(data);
} }
} }
} }
// 下载结 // 下载结
if (_downloaders.Count == 0) if (_downloaders.Count == 0)
{ {
if (_failedList.Count > 0) _steps = ESteps.Finish;
}
}
if (_steps == ESteps.Finish)
{
if (_failedList.Count > 0)
{
var failedDownloader = _failedList[0];
string bundleName = failedDownloader.Bundle.BundleName;
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Failed to download file : {bundleName}";
if (DownloadErrorCallback != null)
{ {
var failedDownloader = _failedList[0]; var data = new DownloadErrorData();
string bundleName = failedDownloader.Bundle.BundleName; data.PackageName = _packageName;
_steps = ESteps.Done; data.FileName = bundleName;
Status = EOperationStatus.Failed; data.ErrorInfo = failedDownloader.Error;
Error = $"Failed to download file : {bundleName}"; DownloadErrorCallback.Invoke(data);
if (DownloadErrorCallback != null)
{
var data = new DownloadErrorData();
data.PackageName = _packageName;
data.FileName = bundleName;
data.ErrorInfo = failedDownloader.Error;
DownloadErrorCallback.Invoke(data);
}
if (DownloadFinishCallback != null)
{
var data = new DownloaderFinishData();
data.PackageName = _packageName;
data.Succeed = false;
DownloadFinishCallback.Invoke(data);
}
} }
else
{
// 结算成功
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
if (DownloadFinishCallback != null) if (DownloadFinishCallback != null)
{ {
var data = new DownloaderFinishData(); var data = new DownloaderFinishData();
data.PackageName = _packageName; data.PackageName = _packageName;
data.Succeed = true; data.Succeed = false;
DownloadFinishCallback.Invoke(data); DownloadFinishCallback.Invoke(data);
} }
}
else
{
// 结算成功
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
if (DownloadFinishCallback != null)
{
var data = new DownloaderFinishData();
data.PackageName = _packageName;
data.Succeed = true;
DownloadFinishCallback.Invoke(data);
} }
} }
} }

View File

@@ -0,0 +1,192 @@
using System;
namespace YooAsset
{
public class InitializePackageOperation : AsyncOperationBase
{
private enum ESteps
{
None,
SetPlayMode,
CheckOptions,
CheckPlatform,
CreateCore,
InitFileSystem,
Done,
}
private readonly ResourcePackage _package;
private readonly InitializePackageOptions _options;
private PlayModeImpl _playModeImpl;
private InitializeFileSystemOperation _initializeFileSystemOp;
private EPlayMode _playMode;
private ESteps _steps = ESteps.None;
internal InitializePackageOperation(ResourcePackage package, InitializePackageOptions options)
{
_package = package;
_options = options;
}
internal override void InternalStart()
{
_steps = ESteps.SetPlayMode;
}
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
if (_steps == ESteps.SetPlayMode)
{
if (_options is EditorSimulateModeOptions)
_playMode = EPlayMode.EditorSimulateMode;
else if (_options is OfflinePlayModeOptions)
_playMode = EPlayMode.OfflinePlayMode;
else if (_options is HostPlayModeOptions)
_playMode = EPlayMode.HostPlayMode;
else if (_options is WebPlayModeOptions)
_playMode = EPlayMode.WebPlayMode;
else if (_options is CustomPlayModeOptions)
_playMode = EPlayMode.CustomPlayMode;
else
throw new NotImplementedException($"{_options.GetType().Name}");
_package._playMode = _playMode;
_steps = ESteps.CheckOptions;
}
if (_steps == ESteps.CheckOptions)
{
// 检测初始化参数
if (_options.BundleLoadingMaxConcurrency <= 0)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{nameof(_options.BundleLoadingMaxConcurrency)} value must be greater than zero.";
YooLogger.Error(Error);
return;
}
_steps = ESteps.CheckPlatform;
}
if (_steps == ESteps.CheckPlatform)
{
#if !UNITY_EDITOR
if (_playMode == EPlayMode.EditorSimulateMode)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Editor simulate mode only support unity editor.";
YooLogger.Error(Error);
return;
}
#endif
#if UNITY_WEBGL
if (_playMode != EPlayMode.EditorSimulateMode)
{
if (_playMode != EPlayMode.WebPlayMode)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{_playMode} can not support WebGL plateform !";
YooLogger.Error(Error);
return;
}
}
#endif
#if !UNITY_WEBGL
if (_playMode != EPlayMode.EditorSimulateMode)
{
if (_playMode == EPlayMode.WebPlayMode)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{nameof(EPlayMode.WebPlayMode)} only support WebGL plateform !";
YooLogger.Error(Error);
return;
}
}
#endif
_steps = ESteps.CreateCore;
}
if (_steps == ESteps.CreateCore)
{
string packageName = _package.PackageName;
var resourceManager = new ResourceManager(packageName);
var playModeImpl = new PlayModeImpl(packageName);
resourceManager.Initialize(_options, playModeImpl);
_playModeImpl = playModeImpl;
_package._bundleQuery = playModeImpl;
_package._playModeImpl = playModeImpl;
_package._resourceManager = resourceManager;
_steps = ESteps.InitFileSystem;
}
if (_steps == ESteps.InitFileSystem)
{
if (_initializeFileSystemOp == null)
{
if (_playMode == EPlayMode.EditorSimulateMode)
{
var initializeParameters = _options as EditorSimulateModeOptions;
_initializeFileSystemOp = _playModeImpl.InitializeAsync(initializeParameters.EditorFileSystemParameters);
}
else if (_playMode == EPlayMode.OfflinePlayMode)
{
var initializeParameters = _options as OfflinePlayModeOptions;
_initializeFileSystemOp = _playModeImpl.InitializeAsync(initializeParameters.BuildinFileSystemParameters);
}
else if (_playMode == EPlayMode.HostPlayMode)
{
var initializeParameters = _options as HostPlayModeOptions;
_initializeFileSystemOp = _playModeImpl.InitializeAsync(initializeParameters.BuildinFileSystemParameters, initializeParameters.CacheFileSystemParameters);
}
else if (_playMode == EPlayMode.WebPlayMode)
{
var initializeParameters = _options as WebPlayModeOptions;
_initializeFileSystemOp = _playModeImpl.InitializeAsync(initializeParameters.WebServerFileSystemParameters, initializeParameters.WebRemoteFileSystemParameters);
}
else if (_playMode == EPlayMode.CustomPlayMode)
{
var initializeParameters = _options as CustomPlayModeOptions;
_initializeFileSystemOp = _playModeImpl.InitializeAsync(initializeParameters.FileSystemParameterList);
}
else
{
throw new NotImplementedException(_playMode.ToString());
}
_initializeFileSystemOp.StartOperation();
AddChildOperation(_initializeFileSystemOp);
}
_initializeFileSystemOp.UpdateOperation();
if (_initializeFileSystemOp.IsDone == false)
return;
if (_initializeFileSystemOp.Status == EOperationStatus.Succeed)
{
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
}
else
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = _initializeFileSystemOp.Error;
YooLogger.Error(Error);
}
}
}
internal override string InternalGetDesc()
{
return $"PlayMode : {_playMode}";
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ecb6fb1cbab9e0242849d2657f438478
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -2,41 +2,10 @@
namespace YooAsset namespace YooAsset
{ {
/// <summary>
/// 运行模式
/// </summary>
public enum EPlayMode
{
/// <summary>
/// 编辑器下的模拟模式
/// </summary>
EditorSimulateMode,
/// <summary>
/// 离线运行模式
/// </summary>
OfflinePlayMode,
/// <summary>
/// 联机运行模式
/// </summary>
HostPlayMode,
/// <summary>
/// WebGL运行模式
/// </summary>
WebPlayMode,
/// <summary>
/// 自定义运行模式
/// </summary>
CustomPlayMode,
}
/// <summary> /// <summary>
/// 初始化参数 /// 初始化参数
/// </summary> /// </summary>
public abstract class InitializeParameters public abstract class InitializePackageOptions
{ {
/// <summary> /// <summary>
/// 同时加载Bundle文件的最大并发数 /// 同时加载Bundle文件的最大并发数
@@ -57,7 +26,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 编辑器下模拟运行模式的初始化参数 /// 编辑器下模拟运行模式的初始化参数
/// </summary> /// </summary>
public class EditorSimulateModeParameters : InitializeParameters public class EditorSimulateModeOptions : InitializePackageOptions
{ {
public FileSystemParameters EditorFileSystemParameters; public FileSystemParameters EditorFileSystemParameters;
} }
@@ -65,7 +34,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 离线运行模式的初始化参数 /// 离线运行模式的初始化参数
/// </summary> /// </summary>
public class OfflinePlayModeParameters : InitializeParameters public class OfflinePlayModeOptions : InitializePackageOptions
{ {
public FileSystemParameters BuildinFileSystemParameters; public FileSystemParameters BuildinFileSystemParameters;
} }
@@ -73,7 +42,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 联机运行模式的初始化参数 /// 联机运行模式的初始化参数
/// </summary> /// </summary>
public class HostPlayModeParameters : InitializeParameters public class HostPlayModeOptions : InitializePackageOptions
{ {
public FileSystemParameters BuildinFileSystemParameters; public FileSystemParameters BuildinFileSystemParameters;
public FileSystemParameters CacheFileSystemParameters; public FileSystemParameters CacheFileSystemParameters;
@@ -82,7 +51,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// WebGL运行模式的初始化参数 /// WebGL运行模式的初始化参数
/// </summary> /// </summary>
public class WebPlayModeParameters : InitializeParameters public class WebPlayModeOptions : InitializePackageOptions
{ {
public FileSystemParameters WebServerFileSystemParameters; public FileSystemParameters WebServerFileSystemParameters;
public FileSystemParameters WebRemoteFileSystemParameters; public FileSystemParameters WebRemoteFileSystemParameters;
@@ -91,7 +60,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 自定义运行模式的初始化参数 /// 自定义运行模式的初始化参数
/// </summary> /// </summary>
public class CustomPlayModeParameters : InitializeParameters public class CustomPlayModeOptions : InitializePackageOptions
{ {
/// <summary> /// <summary>
/// 文件系统初始化参数列表 /// 文件系统初始化参数列表

View File

@@ -91,7 +91,7 @@ namespace YooAsset
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Failed; Status = EOperationStatus.Failed;
Error = $"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}"; Error = $"The manifest version is lower than the minimum compatible version : {fileVer} < {ver2025_8_28}";
return; return;
} }
@@ -158,7 +158,7 @@ namespace YooAsset
FillAssetCollection(Manifest, packageAsset, replaceAssetPath); FillAssetCollection(Manifest, packageAsset, replaceAssetPath);
_packageAssetCount--; _packageAssetCount--;
Progress = 1f - _packageAssetCount / _progressTotalValue; Progress = 1f - (_packageAssetCount / (float)_progressTotalValue);
if (IsBusy) if (IsBusy)
break; break;
} }
@@ -192,7 +192,7 @@ namespace YooAsset
FillBundleCollection(Manifest, packageBundle); FillBundleCollection(Manifest, packageBundle);
_packageBundleCount--; _packageBundleCount--;
Progress = 1f - _packageBundleCount / _progressTotalValue; Progress = 1f - (_packageBundleCount / (float)_progressTotalValue);
if (IsBusy) if (IsBusy)
break; break;
} }
@@ -220,14 +220,7 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
while (true) RunBatchExecution();
{
if (ExecuteWhileDone())
{
_steps = ESteps.Done;
break;
}
}
} }
private void CreateAssetCollection(PackageManifest manifest, int assetCount) private void CreateAssetCollection(PackageManifest manifest, int assetCount)

View File

@@ -3,13 +3,12 @@ using System.Linq;
namespace YooAsset namespace YooAsset
{ {
public class InitializationOperation : AsyncOperationBase public class InitializeFileSystemOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
None, None,
Prepare, Prepare,
ClearOldFileSystem,
InitFileSystem, InitFileSystem,
CheckInitResult, CheckInitResult,
Done, Done,
@@ -21,7 +20,7 @@ namespace YooAsset
private FSInitializeFileSystemOperation _initFileSystemOp; private FSInitializeFileSystemOperation _initFileSystemOp;
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
internal InitializationOperation(PlayModeImpl impl, List<FileSystemParameters> parametersList) internal InitializeFileSystemOperation(PlayModeImpl impl, List<FileSystemParameters> parametersList)
{ {
_impl = impl; _impl = impl;
_parametersList = parametersList; _parametersList = parametersList;
@@ -57,18 +56,6 @@ namespace YooAsset
} }
_cloneList = _parametersList.ToList(); _cloneList = _parametersList.ToList();
_steps = ESteps.ClearOldFileSystem;
}
if (_steps == ESteps.ClearOldFileSystem)
{
// 注意:初始化失败后可能会残存一些旧的文件系统!
foreach (var fileSystem in _impl.FileSystems)
{
fileSystem.OnDestroy();
}
_impl.FileSystems.Clear();
_steps = ESteps.InitFileSystem; _steps = ESteps.InitFileSystem;
} }
@@ -121,9 +108,5 @@ namespace YooAsset
} }
} }
} }
internal override string InternalGetDesc()
{
return $"PlayMode : {_impl.PlayMode}";
}
} }
} }

View File

@@ -1,7 +1,7 @@
 
namespace YooAsset namespace YooAsset
{ {
public sealed class UpdatePackageManifestOperation : AsyncOperationBase public sealed class LoadPackageManifestOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
@@ -13,16 +13,14 @@ namespace YooAsset
} }
private readonly PlayModeImpl _impl; private readonly PlayModeImpl _impl;
private readonly string _packageVersion; private readonly LoadPackageManifestOptions _options;
private readonly int _timeout;
private FSLoadPackageManifestOperation _loadPackageManifestOp; private FSLoadPackageManifestOperation _loadPackageManifestOp;
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
internal UpdatePackageManifestOperation(PlayModeImpl impl, string packageVersion, int timeout) internal LoadPackageManifestOperation(PlayModeImpl impl, LoadPackageManifestOptions options)
{ {
_impl = impl; _impl = impl;
_packageVersion = packageVersion; _options = options;
_timeout = timeout;
} }
internal override void InternalStart() internal override void InternalStart()
{ {
@@ -35,7 +33,7 @@ namespace YooAsset
if (_steps == ESteps.CheckParams) if (_steps == ESteps.CheckParams)
{ {
if (string.IsNullOrEmpty(_packageVersion)) if (string.IsNullOrEmpty(_options.PackageVersion))
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Failed; Status = EOperationStatus.Failed;
@@ -50,7 +48,7 @@ namespace YooAsset
if (_steps == ESteps.CheckActiveManifest) if (_steps == ESteps.CheckActiveManifest)
{ {
// 检测当前激活的清单对象 // 检测当前激活的清单对象
if (_impl.ActiveManifest != null && _impl.ActiveManifest.PackageVersion == _packageVersion) if (_impl.ActiveManifest != null && _impl.ActiveManifest.PackageVersion == _options.PackageVersion)
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Succeed; Status = EOperationStatus.Succeed;
@@ -66,7 +64,7 @@ namespace YooAsset
if (_loadPackageManifestOp == null) if (_loadPackageManifestOp == null)
{ {
var mainFileSystem = _impl.GetMainFileSystem(); var mainFileSystem = _impl.GetMainFileSystem();
_loadPackageManifestOp = mainFileSystem.LoadPackageManifestAsync(_packageVersion, _timeout); _loadPackageManifestOp = mainFileSystem.LoadPackageManifestAsync(_options);
_loadPackageManifestOp.StartOperation(); _loadPackageManifestOp.StartOperation();
AddChildOperation(_loadPackageManifestOp); AddChildOperation(_loadPackageManifestOp);
} }
@@ -91,7 +89,7 @@ namespace YooAsset
} }
internal override string InternalGetDesc() internal override string InternalGetDesc()
{ {
return $"PackageVersion : {_packageVersion}"; return $"PackageVersion : {_options.PackageVersion}";
} }
} }
} }

View File

@@ -0,0 +1,22 @@

namespace YooAsset
{
public struct LoadPackageManifestOptions
{
/// <summary>
/// 包裹版本
/// </summary>
public string PackageVersion { private set; get; }
/// <summary>
/// 超时时间
/// </summary>
public int Timeout { private set; get; }
public LoadPackageManifestOptions(string packageVersion, int timeout)
{
PackageVersion = packageVersion;
Timeout = timeout;
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 02958c7c4e947ae4b95472741e166cb6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -16,18 +16,17 @@ namespace YooAsset
} }
private readonly PlayModeImpl _impl; private readonly PlayModeImpl _impl;
private readonly string _packageVersion; private readonly PreDownloadContentOptions _options;
private readonly int _timeout; private readonly int _timeout;
private FSLoadPackageManifestOperation _loadPackageManifestOp; private FSLoadPackageManifestOperation _loadPackageManifestOp;
private PackageManifest _manifest; private PackageManifest _manifest;
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
internal PreDownloadContentOperation(PlayModeImpl impl, string packageVersion, int timeout) internal PreDownloadContentOperation(PlayModeImpl impl, PreDownloadContentOptions options)
{ {
_impl = impl; _impl = impl;
_packageVersion = packageVersion; _options = options;
_timeout = timeout;
} }
internal override void InternalStart() internal override void InternalStart()
{ {
@@ -40,7 +39,7 @@ namespace YooAsset
if (_steps == ESteps.CheckParams) if (_steps == ESteps.CheckParams)
{ {
if (string.IsNullOrEmpty(_packageVersion)) if (string.IsNullOrEmpty(_options.PackageVersion))
{ {
_steps = ESteps.Done; _steps = ESteps.Done;
Status = EOperationStatus.Failed; Status = EOperationStatus.Failed;
@@ -56,7 +55,7 @@ namespace YooAsset
// 检测当前激活的清单对象 // 检测当前激活的清单对象
if (_impl.ActiveManifest != null) if (_impl.ActiveManifest != null)
{ {
if (_impl.ActiveManifest.PackageVersion == _packageVersion) if (_impl.ActiveManifest.PackageVersion == _options.PackageVersion)
{ {
_manifest = _impl.ActiveManifest; _manifest = _impl.ActiveManifest;
_steps = ESteps.Done; _steps = ESteps.Done;
@@ -72,7 +71,8 @@ namespace YooAsset
if (_loadPackageManifestOp == null) if (_loadPackageManifestOp == null)
{ {
var mainFileSystem = _impl.GetMainFileSystem(); var mainFileSystem = _impl.GetMainFileSystem();
_loadPackageManifestOp = mainFileSystem.LoadPackageManifestAsync(_packageVersion, _timeout); var options = new LoadPackageManifestOptions(_options.PackageVersion, _options.Timeout);
_loadPackageManifestOp = mainFileSystem.LoadPackageManifestAsync(options);
_loadPackageManifestOp.StartOperation(); _loadPackageManifestOp.StartOperation();
AddChildOperation(_loadPackageManifestOp); AddChildOperation(_loadPackageManifestOp);
} }

View File

@@ -0,0 +1,22 @@

namespace YooAsset
{
public struct PreDownloadContentOptions
{
/// <summary>
/// 预下载的包裹版本
/// </summary>
public string PackageVersion { private set; get; }
/// <summary>
/// 资源清单请求超时时间
/// </summary>
public int Timeout { private set; get; }
public PreDownloadContentOptions(string packageVersion, int timeout)
{
PackageVersion = packageVersion;
Timeout = timeout;
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e6ccb056c8ca90c49a01cc15aa75a513
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -18,16 +18,14 @@ namespace YooAsset
} }
private readonly PlayModeImpl _impl; private readonly PlayModeImpl _impl;
private readonly bool _appendTimeTicks; private readonly RequestPackageVersionOptions _options;
private readonly int _timeout;
private FSRequestPackageVersionOperation _requestPackageVersionOp; private FSRequestPackageVersionOperation _requestPackageVersionOp;
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
internal RequestPackageVersionImplOperation(PlayModeImpl impl, bool appendTimeTicks, int timeout) internal RequestPackageVersionImplOperation(PlayModeImpl impl, RequestPackageVersionOptions options)
{ {
_impl = impl; _impl = impl;
_appendTimeTicks = appendTimeTicks; _options = options;
_timeout = timeout;
} }
internal override void InternalStart() internal override void InternalStart()
{ {
@@ -43,7 +41,7 @@ namespace YooAsset
if (_requestPackageVersionOp == null) if (_requestPackageVersionOp == null)
{ {
var mainFileSystem = _impl.GetMainFileSystem(); var mainFileSystem = _impl.GetMainFileSystem();
_requestPackageVersionOp = mainFileSystem.RequestPackageVersionAsync(_appendTimeTicks, _timeout); _requestPackageVersionOp = mainFileSystem.RequestPackageVersionAsync(_options);
_requestPackageVersionOp.StartOperation(); _requestPackageVersionOp.StartOperation();
AddChildOperation(_requestPackageVersionOp); AddChildOperation(_requestPackageVersionOp);
} }

View File

@@ -0,0 +1,22 @@

namespace YooAsset
{
public struct RequestPackageVersionOptions
{
/// <summary>
/// 在URL末尾添加时间戳
/// </summary>
public bool AppendTimeTicks { private set; get; }
/// <summary>
/// 超时时间
/// </summary>
public int Timeout { private set; get; }
public RequestPackageVersionOptions(bool appendTimeTicks, int timeout)
{
AppendTimeTicks = appendTimeTicks;
Timeout = timeout;
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e89594016c3fa69499adf8d642490ed6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -7,19 +7,17 @@ namespace YooAsset
internal class PlayModeImpl : IPlayMode, IBundleQuery internal class PlayModeImpl : IPlayMode, IBundleQuery
{ {
public readonly string PackageName; public readonly string PackageName;
public readonly EPlayMode PlayMode;
public readonly List<IFileSystem> FileSystems = new List<IFileSystem>(10); public readonly List<IFileSystem> FileSystems = new List<IFileSystem>(10);
public PlayModeImpl(string packageName, EPlayMode playMode) public PlayModeImpl(string packageName)
{ {
PackageName = packageName; PackageName = packageName;
PlayMode = playMode;
} }
/// <summary> /// <summary>
/// 异步初始化 /// 异步初始化
/// </summary> /// </summary>
public InitializationOperation InitializeAsync(FileSystemParameters fileSystemParameter) public InitializeFileSystemOperation InitializeAsync(FileSystemParameters fileSystemParameter)
{ {
var fileSystemParamList = new List<FileSystemParameters>(); var fileSystemParamList = new List<FileSystemParameters>();
if (fileSystemParameter != null) if (fileSystemParameter != null)
@@ -30,7 +28,7 @@ namespace YooAsset
/// <summary> /// <summary>
/// 异步初始化 /// 异步初始化
/// </summary> /// </summary>
public InitializationOperation InitializeAsync(FileSystemParameters fileSystemParameterA, FileSystemParameters fileSystemParameterB) public InitializeFileSystemOperation InitializeAsync(FileSystemParameters fileSystemParameterA, FileSystemParameters fileSystemParameterB)
{ {
var fileSystemParamList = new List<FileSystemParameters>(); var fileSystemParamList = new List<FileSystemParameters>();
if (fileSystemParameterA != null) if (fileSystemParameterA != null)
@@ -43,9 +41,9 @@ namespace YooAsset
/// <summary> /// <summary>
/// 异步初始化 /// 异步初始化
/// </summary> /// </summary>
public InitializationOperation InitializeAsync(List<FileSystemParameters> fileSystemParameterList) public InitializeFileSystemOperation InitializeAsync(List<FileSystemParameters> fileSystemParameterList)
{ {
var operation = new InitializationOperation(this, fileSystemParameterList); var operation = new InitializeFileSystemOperation(this, fileSystemParameterList);
return operation; return operation;
} }
@@ -70,27 +68,27 @@ namespace YooAsset
/// <summary> /// <summary>
/// 向网络端请求最新的资源版本 /// 向网络端请求最新的资源版本
/// </summary> /// </summary>
RequestPackageVersionOperation IPlayMode.RequestPackageVersionAsync(bool appendTimeTicks, int timeout) RequestPackageVersionOperation IPlayMode.RequestPackageVersionAsync(RequestPackageVersionOptions options)
{ {
var operation = new RequestPackageVersionImplOperation(this, appendTimeTicks, timeout); var operation = new RequestPackageVersionImplOperation(this, options);
return operation; return operation;
} }
/// <summary> /// <summary>
/// 向网络端请求并更新清单 /// 向网络端请求并更新清单
/// </summary> /// </summary>
UpdatePackageManifestOperation IPlayMode.UpdatePackageManifestAsync(string packageVersion, int timeout) LoadPackageManifestOperation IPlayMode.LoadPackageManifestAsync(LoadPackageManifestOptions options)
{ {
var operation = new UpdatePackageManifestOperation(this, packageVersion, timeout); var operation = new LoadPackageManifestOperation(this, options);
return operation; return operation;
} }
/// <summary> /// <summary>
/// 预下载指定版本的包裹内容 /// 预下载指定版本的包裹内容
/// </summary> /// </summary>
PreDownloadContentOperation IPlayMode.PreDownloadContentAsync(string packageVersion, int timeout) PreDownloadContentOperation IPlayMode.PreDownloadContentAsync(PreDownloadContentOptions options)
{ {
var operation = new PreDownloadContentOperation(this, packageVersion, timeout); var operation = new PreDownloadContentOperation(this, options);
return operation; return operation;
} }
@@ -298,7 +296,8 @@ namespace YooAsset
return new List<BundleInfo>(); return new List<BundleInfo>();
// 获取资源对象的资源包和所有依赖资源包 // 获取资源对象的资源包和所有依赖资源包
List<PackageBundle> checkList = new List<PackageBundle>(); HashSet<string> checkSet = new HashSet<string>();
List<PackageBundle> checkList = new List<PackageBundle>(assetInfos.Length);
foreach (var assetInfo in assetInfos) foreach (var assetInfo in assetInfos)
{ {
if (assetInfo.IsInvalid) if (assetInfo.IsInvalid)
@@ -309,15 +308,21 @@ namespace YooAsset
// 注意:如果清单里未找到资源包会抛出异常! // 注意:如果清单里未找到资源包会抛出异常!
PackageBundle mainBundle = manifest.GetMainPackageBundle(assetInfo.Asset); PackageBundle mainBundle = manifest.GetMainPackageBundle(assetInfo.Asset);
if (checkList.Contains(mainBundle) == false) if (checkSet.Contains(mainBundle.BundleGUID) == false)
{
checkSet.Add(mainBundle.BundleGUID);
checkList.Add(mainBundle); checkList.Add(mainBundle);
}
// 注意:如果清单里未找到资源包会抛出异常! // 注意:如果清单里未找到资源包会抛出异常!
List<PackageBundle> mainDependBundles = manifest.GetAssetAllDependencies(assetInfo.Asset); List<PackageBundle> mainDependBundles = manifest.GetAssetAllDependencies(assetInfo.Asset);
foreach (var dependBundle in mainDependBundles) foreach (var dependBundle in mainDependBundles)
{ {
if (checkList.Contains(dependBundle) == false) if (checkSet.Contains(dependBundle.BundleGUID) == false)
{
checkSet.Add(dependBundle.BundleGUID);
checkList.Add(dependBundle); checkList.Add(dependBundle);
}
} }
// 下载主资源包内所有资源对象依赖的资源包 // 下载主资源包内所有资源对象依赖的资源包
@@ -326,14 +331,20 @@ namespace YooAsset
foreach (var otherMainAsset in mainBundle.IncludeMainAssets) foreach (var otherMainAsset in mainBundle.IncludeMainAssets)
{ {
var otherMainBundle = manifest.GetMainPackageBundle(otherMainAsset.BundleID); var otherMainBundle = manifest.GetMainPackageBundle(otherMainAsset.BundleID);
if (checkList.Contains(otherMainBundle) == false) if (checkSet.Contains(otherMainBundle.BundleGUID) == false)
{
checkSet.Add(otherMainBundle.BundleGUID);
checkList.Add(otherMainBundle); checkList.Add(otherMainBundle);
}
List<PackageBundle> otherDependBundles = manifest.GetAssetAllDependencies(otherMainAsset); List<PackageBundle> otherDependBundles = manifest.GetAssetAllDependencies(otherMainAsset);
foreach (var dependBundle in otherDependBundles) foreach (var dependBundle in otherDependBundles)
{ {
if (checkList.Contains(dependBundle) == false) if (checkSet.Contains(dependBundle.BundleGUID) == false)
{
checkSet.Add(dependBundle.BundleGUID);
checkList.Add(dependBundle); checkList.Add(dependBundle);
}
} }
} }
} }

View File

@@ -372,6 +372,8 @@ public class PackageBundle
清单序列化工具类。 清单序列化工具类。
> 注意:`DeserializeFromJson` 仅用于编辑器/调试用途,不保证运行时可用;运行时请优先使用二进制清单 `DeserializeFromBinary`。
```csharp ```csharp
// 验证清单数据完整性 // 验证清单数据完整性
static bool VerifyManifestData(byte[] fileData, string hashValue); static bool VerifyManifestData(byte[] fileData, string hashValue);
@@ -381,6 +383,7 @@ static string SerializeToJson(PackageManifest manifest);
static byte[] SerializeToBinary(PackageManifest manifest); static byte[] SerializeToBinary(PackageManifest manifest);
// 反序列化 // 反序列化
// 注意JSON 反序列化仅用于编辑器/调试用途,运行时请优先使用二进制清单。
static PackageManifest DeserializeFromJson(string jsonContent); static PackageManifest DeserializeFromJson(string jsonContent);
static PackageManifest DeserializeFromBinary(byte[] binaryData); static PackageManifest DeserializeFromBinary(byte[] binaryData);

View File

@@ -8,15 +8,11 @@ namespace YooAsset
{ {
public class ResourcePackage public class ResourcePackage
{ {
private bool _isInitialize = false; private InitializePackageOperation _initializeOp;
private string _initializeError = string.Empty; internal ResourceManager _resourceManager;
private EOperationStatus _initializeStatus = EOperationStatus.None; internal IBundleQuery _bundleQuery;
private EPlayMode _playMode; internal IPlayMode _playModeImpl;
internal EPlayMode _playMode;
// 管理器
private ResourceManager _resourceManager;
private IBundleQuery _bundleQuery;
private IPlayMode _playModeImpl;
/// <summary> /// <summary>
/// 包裹名 /// 包裹名
@@ -28,7 +24,12 @@ namespace YooAsset
/// </summary> /// </summary>
public EOperationStatus InitializeStatus public EOperationStatus InitializeStatus
{ {
get { return _initializeStatus; } get
{
if (_initializeOp == null)
return EOperationStatus.None;
return _initializeOp.Status;
}
} }
/// <summary> /// <summary>
@@ -44,6 +45,15 @@ namespace YooAsset
} }
} }
/// <summary>
/// 包裹优先级(值越大越优先更新)
/// </summary>
public uint PackagePriority
{
get { return OperationSystem.GetSchedulerPriority(PackageName); }
set { OperationSystem.SetSchedulerPriority(PackageName, value); }
}
internal ResourcePackage(string packageName) internal ResourcePackage(string packageName)
{ {
@@ -53,40 +63,10 @@ namespace YooAsset
/// <summary> /// <summary>
/// 销毁资源包裹 /// 销毁资源包裹
/// </summary> /// </summary>
internal void DestroyPackage() internal void InternalDestroy()
{ {
if (_isInitialize) _initializeOp = null;
{ _bundleQuery = null;
_isInitialize = false;
_initializeError = string.Empty;
_initializeStatus = EOperationStatus.None;
// 销毁资源管理器
if (_resourceManager != null)
{
_resourceManager.Destroy();
_resourceManager = null;
}
// 销毁文件系统
if (_playModeImpl != null)
_playModeImpl.DestroyFileSystem();
_bundleQuery = null;
_playModeImpl = null;
}
}
/// <summary>
/// 异步初始化
/// </summary>
public InitializationOperation InitializeAsync(InitializeParameters parameters)
{
// 注意:联机平台因为网络原因可能会初始化失败!
ResetInitializeAfterFailed();
// 检测初始化参数合法性
CheckInitializeParameters(parameters);
// 销毁资源管理器 // 销毁资源管理器
if (_resourceManager != null) if (_resourceManager != null)
@@ -95,147 +75,75 @@ namespace YooAsset
_resourceManager = null; _resourceManager = null;
} }
// 创建资源管理器 // 销毁文件系统
_resourceManager = new ResourceManager(PackageName); if (_playModeImpl != null)
var playModeImpl = new PlayModeImpl(PackageName, _playMode);
_bundleQuery = playModeImpl;
_playModeImpl = playModeImpl;
_resourceManager.Initialize(parameters, _bundleQuery);
// 初始化资源系统
InitializationOperation initializeOperation;
if (_playMode == EPlayMode.EditorSimulateMode)
{ {
var initializeParameters = parameters as EditorSimulateModeParameters; _playModeImpl.DestroyFileSystem();
initializeOperation = playModeImpl.InitializeAsync(initializeParameters.EditorFileSystemParameters); _playModeImpl = null;
} }
else if (_playMode == EPlayMode.OfflinePlayMode)
{
var initializeParameters = parameters as OfflinePlayModeParameters;
initializeOperation = playModeImpl.InitializeAsync(initializeParameters.BuildinFileSystemParameters);
}
else if (_playMode == EPlayMode.HostPlayMode)
{
var initializeParameters = parameters as HostPlayModeParameters;
initializeOperation = playModeImpl.InitializeAsync(initializeParameters.BuildinFileSystemParameters, initializeParameters.CacheFileSystemParameters);
}
else if (_playMode == EPlayMode.WebPlayMode)
{
var initializeParameters = parameters as WebPlayModeParameters;
initializeOperation = playModeImpl.InitializeAsync(initializeParameters.WebServerFileSystemParameters, initializeParameters.WebRemoteFileSystemParameters);
}
else if (_playMode == EPlayMode.CustomPlayMode)
{
var initializeParameters = parameters as CustomPlayModeParameters;
initializeOperation = playModeImpl.InitializeAsync(initializeParameters.FileSystemParameterList);
}
else
{
throw new NotImplementedException();
}
// 监听初始化结果
_isInitialize = true;
OperationSystem.StartOperation(PackageName, initializeOperation);
initializeOperation.Completed += InitializeOperation_Completed;
return initializeOperation;
}
private void ResetInitializeAfterFailed()
{
if (_isInitialize && _initializeStatus == EOperationStatus.Failed)
{
_isInitialize = false;
_initializeStatus = EOperationStatus.None;
_initializeError = string.Empty;
}
}
private void CheckInitializeParameters(InitializeParameters parameters)
{
if (_isInitialize)
throw new YooPackageException(PackageName, $"Package '{PackageName}' is already initialized !");
if (parameters == null)
throw new YooPackageException(PackageName, $"Initialize parameters cannot be null.");
#if !UNITY_EDITOR
if (parameters is EditorSimulateModeParameters)
throw new YooPlatformNotSupportedException($"Editor simulate mode only support unity editor.");
#endif
// 检测初始化参数
if (parameters.BundleLoadingMaxConcurrency <= 0)
throw new YooPackageException(PackageName, $"{nameof(parameters.BundleLoadingMaxConcurrency)} value must be greater than zero.");
// 鉴定运行模式
if (parameters is EditorSimulateModeParameters)
_playMode = EPlayMode.EditorSimulateMode;
else if (parameters is OfflinePlayModeParameters)
_playMode = EPlayMode.OfflinePlayMode;
else if (parameters is HostPlayModeParameters)
_playMode = EPlayMode.HostPlayMode;
else if (parameters is WebPlayModeParameters)
_playMode = EPlayMode.WebPlayMode;
else if (parameters is CustomPlayModeParameters)
_playMode = EPlayMode.CustomPlayMode;
else
throw new NotImplementedException();
// 检测运行时平台
if (_playMode != EPlayMode.EditorSimulateMode)
{
#if UNITY_WEBGL
if (_playMode != EPlayMode.WebPlayMode)
{
throw new YooPlatformNotSupportedException($"{_playMode} can not support WebGL plateform !");
}
#else
if (_playMode == EPlayMode.WebPlayMode)
{
throw new YooPlatformNotSupportedException($"{nameof(EPlayMode.WebPlayMode)} only support WebGL plateform !");
}
#endif
}
}
private void InitializeOperation_Completed(AsyncOperationBase op)
{
_initializeStatus = op.Status;
_initializeError = op.Error;
if (_initializeStatus != EOperationStatus.Succeed)
YooLogger.Error(_initializeError);
} }
/// <summary> /// <summary>
/// 异步销毁 /// 异步初始化包裹
/// </summary> /// </summary>
public DestroyOperation DestroyAsync() public InitializePackageOperation InitializePackageAsync(InitializePackageOptions options)
{ {
var options = new UnloadAllAssetsOptions(); // 注意:联机平台因为网络原因可能会初始化失败!
options.ReleaseAllHandles = true; ResetInitializeAfterFailed();
options.LockLoadOperation = true;
var operation = new DestroyOperation(this, options); // 检测重复初始化
OperationSystem.StartOperation(null, operation); if (_initializeOp != null)
throw new YooPackageException(PackageName, $"Package '{PackageName}' is already initialized !");
// 开始初始化操作
_initializeOp = new InitializePackageOperation(this, options);
OperationSystem.StartOperation(PackageName, _initializeOp);
return _initializeOp;
}
private void ResetInitializeAfterFailed()
{
if (InitializeStatus == EOperationStatus.Failed)
{
InternalDestroy();
}
}
/// <summary>
/// 异步销毁包裹
/// </summary>
public DestroyPackageOperation DestroyPackageAsync()
{
var options = new UnloadAllAssetsOptions(true, true);
var operation = new DestroyPackageOperation(this, options);
OperationSystem.StartOperation(OperationSystem.GLOBAL_SCHEDULER_NAME, operation);
return operation; return operation;
} }
/// <summary> /// <summary>
/// 请求最新的资源版本 /// 请求最新的资源版本
/// 说明超时时间默认60秒
/// </summary> /// </summary>
/// <param name="appendTimeTicks">在URL末尾添加时间戳</param> public RequestPackageVersionOperation RequestPackageVersionAsync()
/// <param name="timeout">超时时间默认值60秒</param> {
public RequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks = true, int timeout = 60) var options = new RequestPackageVersionOptions(true, 60);
return RequestPackageVersionAsync(options);
}
/// <summary>
/// 请求最新的资源版本
/// </summary>
public RequestPackageVersionOperation RequestPackageVersionAsync(RequestPackageVersionOptions options)
{ {
DebugCheckInitialize(false); DebugCheckInitialize(false);
var operation = _playModeImpl.RequestPackageVersionAsync(appendTimeTicks, timeout); var operation = _playModeImpl.RequestPackageVersionAsync(options);
OperationSystem.StartOperation(PackageName, operation); OperationSystem.StartOperation(PackageName, operation);
return operation; return operation;
} }
/// <summary> /// <summary>
/// 更新并加载指定版本的资源清单 /// 加载指定版本的资源清单
/// </summary> /// </summary>
/// <param name="packageVersion">包裹版本</param> public LoadPackageManifestOperation LoadPackageManifestAsync(LoadPackageManifestOptions options)
/// <param name="timeout">超时时间默认值60秒</param>
public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion, int timeout = 60)
{ {
DebugCheckInitialize(false); DebugCheckInitialize(false);
@@ -245,7 +153,7 @@ namespace YooAsset
YooLogger.Warning($"Found loaded bundle before update manifest ! Recommended to call the {nameof(UnloadAllAssetsAsync)} method to release loaded bundle !"); YooLogger.Warning($"Found loaded bundle before update manifest ! Recommended to call the {nameof(UnloadAllAssetsAsync)} method to release loaded bundle !");
} }
var operation = _playModeImpl.UpdatePackageManifestAsync(packageVersion, timeout); var operation = _playModeImpl.LoadPackageManifestAsync(options);
OperationSystem.StartOperation(PackageName, operation); OperationSystem.StartOperation(PackageName, operation);
return operation; return operation;
} }
@@ -253,12 +161,10 @@ namespace YooAsset
/// <summary> /// <summary>
/// 预下载指定版本的包裹资源 /// 预下载指定版本的包裹资源
/// </summary> /// </summary>
/// <param name="packageVersion">包裹版本</param> public PreDownloadContentOperation PreDownloadContentAsync(PreDownloadContentOptions options)
/// <param name="timeout">资源清单下载的超时时间默认值60秒</param>
public PreDownloadContentOperation PreDownloadContentAsync(string packageVersion, int timeout = 60)
{ {
DebugCheckInitialize(false); DebugCheckInitialize(false);
var operation = _playModeImpl.PreDownloadContentAsync(packageVersion, timeout); var operation = _playModeImpl.PreDownloadContentAsync(options);
OperationSystem.StartOperation(PackageName, operation); OperationSystem.StartOperation(PackageName, operation);
return operation; return operation;
} }
@@ -266,30 +172,9 @@ namespace YooAsset
/// <summary> /// <summary>
/// 清理缓存文件 /// 清理缓存文件
/// </summary> /// </summary>
/// <param name="clearMode">清理方式</param> public ClearCacheFilesOperation ClearCacheFilesAsync(ClearCacheFilesOptions options)
/// <param name="clearParam">执行参数</param>
public ClearCacheFilesOperation ClearCacheFilesAsync(EFileClearMode clearMode, object clearParam = null)
{ {
DebugCheckInitialize(false); DebugCheckInitialize(false);
ClearCacheFilesOptions options = new ClearCacheFilesOptions();
options.ClearMode = clearMode.ToString();
options.ClearParam = clearParam;
var operation = _playModeImpl.ClearCacheFilesAsync(options);
OperationSystem.StartOperation(PackageName, operation);
return operation;
}
/// <summary>
/// 清理缓存文件
/// </summary>
/// <param name="clearMode">清理方式</param>
/// <param name="clearParam">执行参数</param>
public ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam = null)
{
DebugCheckInitialize(false);
ClearCacheFilesOptions options = new ClearCacheFilesOptions();
options.ClearMode = clearMode;
options.ClearParam = clearParam;
var operation = _playModeImpl.ClearCacheFilesAsync(options); var operation = _playModeImpl.ClearCacheFilesAsync(options);
OperationSystem.StartOperation(PackageName, operation); OperationSystem.StartOperation(PackageName, operation);
return operation; return operation;
@@ -1154,13 +1039,24 @@ namespace YooAsset
#endregion #endregion
#region #region
[Conditional("DEBUG")]
private void DebugCheckInitialize(bool checkActiveManifest = true) private void DebugCheckInitialize(bool checkActiveManifest = true)
{ {
if (_initializeStatus == EOperationStatus.None) if (InitializeStatus != EOperationStatus.Succeed)
throw new YooPackageException(PackageName, "Package initialize not completed !"); {
else if (_initializeStatus == EOperationStatus.Failed) if (InitializeStatus == EOperationStatus.None)
throw new YooPackageException(PackageName, $"Package initialize failed ! {_initializeError}"); {
throw new YooPackageException(PackageName, "Package not initialize !");
}
else if (InitializeStatus == EOperationStatus.Processing)
{
throw new YooPackageException(PackageName, "Package initialize not completed !");
}
else if (InitializeStatus == EOperationStatus.Failed)
{
string error = _initializeOp == null ? string.Empty : _initializeOp.Error;
throw new YooPackageException(PackageName, $"Package initialize failed ! {error}");
}
}
if (checkActiveManifest) if (checkActiveManifest)
{ {

View File

@@ -5,6 +5,27 @@ using System.Text;
namespace YooAsset namespace YooAsset
{ {
/// <summary>
/// 时间工具类
/// </summary>
internal static class TimeUtility
{
/// <summary>
/// The real time in seconds since the game started
/// </summary>
public static double RealtimeSinceStartup
{
get
{
#if UNITY_2020_3_OR_NEWER
return UnityEngine.Time.realtimeSinceStartupAsDouble;
#else
return UnityEngine.Time.realtimeSinceStartup;
#endif
}
}
}
/// <summary> /// <summary>
/// 路径工具类 /// 路径工具类
/// </summary> /// </summary>

View File

@@ -59,6 +59,7 @@ namespace YooAsset
_driver.AddComponent<RemoteDebuggerInRuntime>(); _driver.AddComponent<RemoteDebuggerInRuntime>();
#endif #endif
// 初始化异步操作系统
OperationSystem.Initialize(); OperationSystem.Initialize();
} }
} }
@@ -75,8 +76,8 @@ namespace YooAsset
if (_driver != null) if (_driver != null)
GameObject.Destroy(_driver); GameObject.Destroy(_driver);
// 终止并清空所有包裹的异步操作 // 销毁异步操作系统
ClearAllPackageOperation(); OperationSystem.DestroyAll();
// 卸载所有AssetBundle // 卸载所有AssetBundle
AssetBundle.UnloadAllAssetBundles(true); AssetBundle.UnloadAllAssetBundles(true);
@@ -97,18 +98,6 @@ namespace YooAsset
} }
} }
/// <summary>
/// 终止并清空所有包裹的异步操作
/// </summary>
internal static void ClearAllPackageOperation()
{
foreach (var package in _packages)
{
OperationSystem.ClearPackageOperation(package.PackageName);
}
OperationSystem.DestroyAll();
}
/// <summary> /// <summary>
/// 创建资源包裹 /// 创建资源包裹
/// </summary> /// </summary>
@@ -123,7 +112,7 @@ namespace YooAsset
/// </summary> /// </summary>
/// <param name="packageName">包裹名称</param> /// <param name="packageName">包裹名称</param>
/// <param name="packagePriority">包裹优先级(值越大越优先更新)</param> /// <param name="packagePriority">包裹优先级(值越大越优先更新)</param>
public static ResourcePackage CreatePackage(string packageName, int packagePriority) public static ResourcePackage CreatePackage(string packageName, uint packagePriority)
{ {
CheckException(packageName); CheckException(packageName);
if (ContainsPackage(packageName)) if (ContainsPackage(packageName))
@@ -194,7 +183,7 @@ namespace YooAsset
string packageName = package.PackageName; string packageName = package.PackageName;
if (package.InitializeStatus != EOperationStatus.None) if (package.InitializeStatus != EOperationStatus.None)
{ {
YooLogger.Error($"The resource package {packageName} has not been destroyed, please call the method {nameof(ResourcePackage.DestroyAsync)} to destroy!"); YooLogger.Error($"The resource package {packageName} has not been destroyed, please call the method {nameof(ResourcePackage.DestroyPackageAsync)} to destroy!");
return false; return false;
} }
@@ -218,17 +207,6 @@ namespace YooAsset
return package != null; return package != null;
} }
/// <summary>
/// 开启一个异步操作
/// </summary>
/// <param name="operation">异步操作对象</param>
public static void StartOperation(GameAsyncOperation operation)
{
// 注意:游戏业务逻辑的包裹填写为空
OperationSystem.StartOperation(string.Empty, operation);
}
private static ResourcePackage GetPackageInternal(string packageName) private static ResourcePackage GetPackageInternal(string packageName)
{ {
foreach (var package in _packages) foreach (var package in _packages)
@@ -270,11 +248,6 @@ namespace YooAsset
/// </summary> /// </summary>
public static void SetOperationSystemMaxTimeSlice(long milliseconds) public static void SetOperationSystemMaxTimeSlice(long milliseconds)
{ {
if (milliseconds < 10)
{
milliseconds = 10;
YooLogger.Warning($"MaxTimeSlice minimum value is 10 milliseconds.");
}
OperationSystem.MaxTimeSlice = milliseconds; OperationSystem.MaxTimeSlice = milliseconds;
} }
#endregion #endregion

View File

@@ -25,7 +25,7 @@ namespace YooAsset
void OnApplicationQuit() void OnApplicationQuit()
{ {
// 说明在编辑器下确保播放被停止时IO类操作被终止。 // 说明在编辑器下确保播放被停止时IO类操作被终止。
YooAssets.ClearAllPackageOperation(); YooAssets.Destroy();
} }
#endif #endif

View File

@@ -0,0 +1,274 @@
using YooAsset;
#region InitializeParameters
/// <summary>
/// 初始化参数
/// </summary>
public abstract class InitializeParameters
{
/// <summary>
/// 同时加载Bundle文件的最大并发数
/// </summary>
public int BundleLoadingMaxConcurrency = int.MaxValue;
/// <summary>
/// 当资源引用计数为零的时候自动释放资源包
/// </summary>
public bool AutoUnloadBundleWhenUnused = false;
/// <summary>
/// WebGL平台强制同步加载资源对象
/// </summary>
public bool WebGLForceSyncLoadAsset = false;
}
/// <summary>
/// 编辑器下模拟运行模式的初始化参数
/// </summary>
public class EditorSimulateModeParameters : InitializeParameters
{
public FileSystemParameters EditorFileSystemParameters;
}
/// <summary>
/// 离线运行模式的初始化参数
/// </summary>
public class OfflinePlayModeParameters : InitializeParameters
{
public FileSystemParameters BuildinFileSystemParameters;
}
/// <summary>
/// 联机运行模式的初始化参数
/// </summary>
public class HostPlayModeParameters : InitializeParameters
{
public FileSystemParameters BuildinFileSystemParameters;
public FileSystemParameters CacheFileSystemParameters;
}
/// <summary>
/// WebGL运行模式的初始化参数
/// </summary>
public class WebPlayModeParameters : InitializeParameters
{
public FileSystemParameters WebServerFileSystemParameters;
public FileSystemParameters WebRemoteFileSystemParameters;
}
#endregion
#region InitializationOperation
public class InitializationOperation : AsyncOperationBase
{
private bool _isDone = false;
private readonly InitializePackageOperation _operation;
internal InitializationOperation(InitializePackageOperation op)
{
_operation = op;
}
internal override void InternalStart()
{
}
internal override void InternalUpdate()
{
if (_isDone)
return;
_operation.UpdateOperation();
if (_operation.IsDone == false)
return;
_isDone = true;
Status = _operation.Status;
Error = _operation.Error;
}
}
#endregion
#region DestroyOperation
public class DestroyOperation : AsyncOperationBase
{
private bool _isDone = false;
private readonly DestroyPackageOperation _operation;
internal DestroyOperation(DestroyPackageOperation op)
{
_operation = op;
}
internal override void InternalStart()
{
}
internal override void InternalUpdate()
{
if (_isDone)
return;
_operation.UpdateOperation();
if (_operation.IsDone == false)
return;
_isDone = true;
Status = _operation.Status;
Error = _operation.Error;
}
}
#endregion
#region UpdatePackageManifestOperation
public class UpdatePackageManifestOperation : AsyncOperationBase
{
private bool _isDone = false;
private readonly LoadPackageManifestOperation _operation;
internal UpdatePackageManifestOperation(LoadPackageManifestOperation op)
{
_operation = op;
}
internal override void InternalStart()
{
}
internal override void InternalUpdate()
{
if (_isDone)
return;
_operation.UpdateOperation();
if (_operation.IsDone == false)
return;
_isDone = true;
Status = _operation.Status;
Error = _operation.Error;
}
}
#endregion
public static class CompatibleOldVersion
{
/// <summary>
/// 兼容Yoo2版本
/// </summary>
public static InitializationOperation InitializeAsync(this ResourcePackage package, InitializeParameters parameters)
{
if (parameters is EditorSimulateModeParameters)
{
var initializeParameters = parameters as EditorSimulateModeParameters;
var options = new EditorSimulateModeOptions();
options.BundleLoadingMaxConcurrency = initializeParameters.BundleLoadingMaxConcurrency;
options.AutoUnloadBundleWhenUnused = initializeParameters.AutoUnloadBundleWhenUnused;
options.WebGLForceSyncLoadAsset = initializeParameters.WebGLForceSyncLoadAsset;
options.EditorFileSystemParameters = initializeParameters.EditorFileSystemParameters;
var operation = package.InitializePackageAsync(options);
var wrapper = new InitializationOperation(operation);
OperationSystem.StartOperation(package.PackageName, wrapper);
return wrapper;
}
else if (parameters is OfflinePlayModeParameters)
{
var initializeParameters = parameters as OfflinePlayModeParameters;
var options = new OfflinePlayModeOptions();
options.BundleLoadingMaxConcurrency = initializeParameters.BundleLoadingMaxConcurrency;
options.AutoUnloadBundleWhenUnused = initializeParameters.AutoUnloadBundleWhenUnused;
options.WebGLForceSyncLoadAsset = initializeParameters.WebGLForceSyncLoadAsset;
options.BuildinFileSystemParameters = initializeParameters.BuildinFileSystemParameters;
var operation = package.InitializePackageAsync(options);
var wrapper = new InitializationOperation(operation);
OperationSystem.StartOperation(package.PackageName, wrapper);
return wrapper;
}
else if (parameters is HostPlayModeParameters)
{
var initializeParameters = parameters as HostPlayModeParameters;
var options = new HostPlayModeOptions();
options.BundleLoadingMaxConcurrency = initializeParameters.BundleLoadingMaxConcurrency;
options.AutoUnloadBundleWhenUnused = initializeParameters.AutoUnloadBundleWhenUnused;
options.WebGLForceSyncLoadAsset = initializeParameters.WebGLForceSyncLoadAsset;
options.BuildinFileSystemParameters = initializeParameters.BuildinFileSystemParameters;
options.CacheFileSystemParameters = initializeParameters.CacheFileSystemParameters;
var operation = package.InitializePackageAsync(options);
var wrapper = new InitializationOperation(operation);
OperationSystem.StartOperation(package.PackageName, wrapper);
return wrapper;
}
else if (parameters is WebPlayModeParameters)
{
var initializeParameters = parameters as WebPlayModeParameters;
var options = new WebPlayModeOptions();
options.BundleLoadingMaxConcurrency = initializeParameters.BundleLoadingMaxConcurrency;
options.AutoUnloadBundleWhenUnused = initializeParameters.AutoUnloadBundleWhenUnused;
options.WebGLForceSyncLoadAsset = initializeParameters.WebGLForceSyncLoadAsset;
options.WebServerFileSystemParameters = initializeParameters.WebServerFileSystemParameters;
options.WebRemoteFileSystemParameters = initializeParameters.WebRemoteFileSystemParameters;
var operation = package.InitializePackageAsync(options);
var wrapper = new InitializationOperation(operation);
OperationSystem.StartOperation(package.PackageName, wrapper);
return wrapper;
}
else
{
throw new System.NotImplementedException();
}
}
/// <summary>
/// 兼容Yoo2版本
/// </summary>
public static DestroyOperation DestroyAsync(this ResourcePackage package)
{
var operation = package.DestroyPackageAsync();
var wrapper = new DestroyOperation(operation);
OperationSystem.StartOperation(package.PackageName, wrapper);
return wrapper;
}
/// <summary>
/// 兼容Yoo2版本
/// </summary>
public static RequestPackageVersionOperation RequestPackageVersionAsync(this ResourcePackage package, bool appendTimeTicks = true, int timeout = 60)
{
var options = new RequestPackageVersionOptions(appendTimeTicks, timeout);
var operation = package.RequestPackageVersionAsync(options);
return operation;
}
/// <summary>
/// 兼容Yoo2版本
/// </summary>
public static UpdatePackageManifestOperation UpdatePackageManifestAsync(this ResourcePackage package, string packageVersion, int timeout = 60)
{
var options = new LoadPackageManifestOptions(packageVersion, timeout);
var operation = package.LoadPackageManifestAsync(options);
var wrapper = new UpdatePackageManifestOperation(operation);
OperationSystem.StartOperation(package.PackageName, wrapper);
return wrapper;
}
/// <summary>
/// 兼容Yoo2版本
/// </summary>
public static PreDownloadContentOperation PreDownloadContentAsync(this ResourcePackage package, string packageVersion, int timeout = 60)
{
var options = new PreDownloadContentOptions(packageVersion, timeout);
var operation = package.PreDownloadContentAsync(options);
return operation;
}
/// <summary>
/// 兼容Yoo2版本
/// </summary>
public static ClearCacheFilesOperation ClearCacheFilesAsync(this ResourcePackage package, EFileClearMode fileClearMode, object clearParam = null)
{
var options = new ClearCacheFilesOptions(fileClearMode, clearParam);
return package.ClearCacheFilesAsync(options);
}
/// <summary>
/// 兼容Yoo2版本
/// </summary>
public static ClearCacheFilesOperation ClearCacheFilesAsync(this ResourcePackage package, string fileClearMode, object clearParam = null)
{
var options = new ClearCacheFilesOptions(fileClearMode, clearParam);
return package.ClearCacheFilesAsync(options);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b974d3d744622f3499d026f99074cd72
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -7,7 +7,7 @@ using YooAsset;
/// <summary> /// <summary>
/// 拷贝内置清单文件到沙盒目录 /// 拷贝内置清单文件到沙盒目录
/// </summary> /// </summary>
public class CopyBuildinManifestOperation : GameAsyncOperation public class CopyBuildinManifestOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
@@ -32,11 +32,11 @@ public class CopyBuildinManifestOperation : GameAsyncOperation
_packageVersion = packageVersion; _packageVersion = packageVersion;
_backend = new UnityWebRequestBackend(); _backend = new UnityWebRequestBackend();
} }
protected override void OnStart() internal override void InternalStart()
{ {
_steps = ESteps.CheckHashFile; _steps = ESteps.CheckHashFile;
} }
protected override void OnUpdate() internal override void InternalUpdate()
{ {
if (_steps == ESteps.None || _steps == ESteps.Done) if (_steps == ESteps.None || _steps == ESteps.Done)
return; return;
@@ -121,9 +121,6 @@ public class CopyBuildinManifestOperation : GameAsyncOperation
} }
} }
} }
protected override void OnAbort()
{
}
private string GetBuildinYooRoot() private string GetBuildinYooRoot()
{ {

View File

@@ -7,7 +7,7 @@ using YooAsset;
/// <summary> /// <summary>
/// 获取包体里的内置资源清单版本 /// 获取包体里的内置资源清单版本
/// </summary> /// </summary>
public class GetBuildinPackageVersionOperation : GameAsyncOperation public class GetBuildinPackageVersionOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
@@ -31,11 +31,11 @@ public class GetBuildinPackageVersionOperation : GameAsyncOperation
_packageName = packageName; _packageName = packageName;
_backend = new UnityWebRequestBackend(); _backend = new UnityWebRequestBackend();
} }
protected override void OnStart() internal override void InternalStart()
{ {
_steps = ESteps.GetPackageVersion; _steps = ESteps.GetPackageVersion;
} }
protected override void OnUpdate() internal override void InternalUpdate()
{ {
if (_steps == ESteps.None || _steps == ESteps.Done) if (_steps == ESteps.None || _steps == ESteps.Done)
return; return;
@@ -68,9 +68,6 @@ public class GetBuildinPackageVersionOperation : GameAsyncOperation
} }
} }
} }
protected override void OnAbort()
{
}
private string GetBuildinYooRoot() private string GetBuildinYooRoot()
{ {

View File

@@ -7,7 +7,7 @@ using YooAsset;
/// <summary> /// <summary>
/// 获取沙盒目录里缓存文件大小 /// 获取沙盒目录里缓存文件大小
/// </summary> /// </summary>
public class GetCacheBundleSizeOperation : GameAsyncOperation public class GetCacheBundleSizeOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
@@ -29,11 +29,11 @@ public class GetCacheBundleSizeOperation : GameAsyncOperation
{ {
_packageName = packageName; _packageName = packageName;
} }
protected override void OnStart() internal override void InternalStart()
{ {
_steps = ESteps.GetCacheFiles; _steps = ESteps.GetCacheFiles;
} }
protected override void OnUpdate() internal override void InternalUpdate()
{ {
if (_steps == ESteps.None || _steps == ESteps.Done) if (_steps == ESteps.None || _steps == ESteps.Done)
return; return;
@@ -57,9 +57,6 @@ public class GetCacheBundleSizeOperation : GameAsyncOperation
Status = EOperationStatus.Succeed; Status = EOperationStatus.Succeed;
} }
} }
protected override void OnAbort()
{
}
private string GetCacheDirectoryRoot() private string GetCacheDirectoryRoot()
{ {

View File

@@ -4,7 +4,7 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using YooAsset; using YooAsset;
public class LoadAssetsByTagOperation<TObject> : GameAsyncOperation where TObject : UnityEngine.Object public class LoadAssetsByTagOperation<TObject> : AsyncOperationBase where TObject : UnityEngine.Object
{ {
private enum ESteps private enum ESteps
{ {
@@ -28,11 +28,11 @@ public class LoadAssetsByTagOperation<TObject> : GameAsyncOperation where TObjec
{ {
_tag = tag; _tag = tag;
} }
protected override void OnStart() internal override void InternalStart()
{ {
_steps = ESteps.LoadAssets; _steps = ESteps.LoadAssets;
} }
protected override void OnUpdate() internal override void InternalUpdate()
{ {
if (_steps == ESteps.None || _steps == ESteps.Done) if (_steps == ESteps.None || _steps == ESteps.Done)
return; return;
@@ -77,7 +77,7 @@ public class LoadAssetsByTagOperation<TObject> : GameAsyncOperation where TObjec
string error = $"资源类型转换失败:{handle.AssetObject.name}"; string error = $"资源类型转换失败:{handle.AssetObject.name}";
Debug.LogError($"{error}"); Debug.LogError($"{error}");
AssetObjects.Clear(); AssetObjects.Clear();
SetFinish(false, error); SetFailed(error);
return; return;
} }
} }
@@ -85,21 +85,23 @@ public class LoadAssetsByTagOperation<TObject> : GameAsyncOperation where TObjec
{ {
Debug.LogError($"{handle.LastError}"); Debug.LogError($"{handle.LastError}");
AssetObjects.Clear(); AssetObjects.Clear();
SetFinish(false, handle.LastError); SetFailed(handle.LastError);
return; return;
} }
} }
SetFinish(true); SetSucceed();
} }
} }
protected override void OnAbort() private void SetSucceed()
{ {
Status = EOperationStatus.Succeed;
_steps = ESteps.Done;
} }
private void SetFinish(bool succeed, string error = "") private void SetFailed(string error)
{ {
Error = error; Error = error;
Status = succeed ? EOperationStatus.Succeed : EOperationStatus.Failed; Status = EOperationStatus.Failed;
_steps = ESteps.Done; _steps = ESteps.Done;
} }

View File

@@ -9,12 +9,12 @@ public static class YooAssetsExtension
public static LoadGameObjectOperation LoadGameObjectAsync(this ResourcePackage resourcePackage, string location, Vector3 position, Quaternion rotation, Transform parent, bool destroyGoOnRelease = false) public static LoadGameObjectOperation LoadGameObjectAsync(this ResourcePackage resourcePackage, string location, Vector3 position, Quaternion rotation, Transform parent, bool destroyGoOnRelease = false)
{ {
var operation = new LoadGameObjectOperation(location, position, rotation, parent, destroyGoOnRelease); var operation = new LoadGameObjectOperation(location, position, rotation, parent, destroyGoOnRelease);
YooAssets.StartOperation(operation); OperationSystem.StartOperation(OperationSystem.GLOBAL_SCHEDULER_NAME, operation);
return operation; return operation;
} }
} }
public class LoadGameObjectOperation : GameAsyncOperation public class LoadGameObjectOperation : AsyncOperationBase
{ {
private enum ESteps private enum ESteps
{ {
@@ -45,11 +45,11 @@ public class LoadGameObjectOperation : GameAsyncOperation
_parent = parent; _parent = parent;
_destroyGoOnRelease = destroyGoOnRelease; _destroyGoOnRelease = destroyGoOnRelease;
} }
protected override void OnStart() internal override void InternalStart()
{ {
_steps = ESteps.LoadAsset; _steps = ESteps.LoadAsset;
} }
protected override void OnUpdate() internal override void InternalUpdate()
{ {
if (_steps == ESteps.None || _steps == ESteps.Done) if (_steps == ESteps.None || _steps == ESteps.Done)
return; return;
@@ -79,9 +79,6 @@ public class LoadGameObjectOperation : GameAsyncOperation
} }
} }
} }
protected override void OnAbort()
{
}
/// <summary> /// <summary>
/// 释放资源句柄 /// 释放资源句柄

View File

@@ -0,0 +1,16 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using YooAsset;
public class OperationHelper
{
/// <summary>
/// 开始一个业务实现的自定义异步任务
/// </summary>
public static void StartOperation(AsyncOperationBase operation)
{
OperationSystem.StartOperation(OperationSystem.GLOBAL_SCHEDULER_NAME, operation);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fd52bc7cb896369498d42a12081816ee
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -6,8 +6,6 @@ public static class OperationMonitor
{ {
public static void RegisterOperationCallback() public static void RegisterOperationCallback()
{ {
OperationSystem.RegisterStartCallback(OperationStartCallback);
OperationSystem.RegisterFinishCallback(OperationFinishCallback);
} }
private static void OperationStartCallback(string packageName, AsyncOperationBase operation) private static void OperationStartCallback(string packageName, AsyncOperationBase operation)

View File

@@ -22,7 +22,8 @@ namespace YooAsset
// 请求资源版本 // 请求资源版本
Debug.Log("请求资源版本信息!"); Debug.Log("请求资源版本信息!");
var requestPackageVersionOp = fileSystem.RequestPackageVersionAsync(true, 60); var requestPackageVersionOptions = new RequestPackageVersionOptions(true, 60);
var requestPackageVersionOp = fileSystem.RequestPackageVersionAsync(requestPackageVersionOptions);
OperationSystem.StartOperation(packageName, requestPackageVersionOp); OperationSystem.StartOperation(packageName, requestPackageVersionOp);
yield return requestPackageVersionOp; yield return requestPackageVersionOp;
if (requestPackageVersionOp.Status != EOperationStatus.Succeed) if (requestPackageVersionOp.Status != EOperationStatus.Succeed)
@@ -34,7 +35,8 @@ namespace YooAsset
// 请求资源清单 // 请求资源清单
string packageVersion = requestPackageVersionOp.PackageVersion; string packageVersion = requestPackageVersionOp.PackageVersion;
Debug.Log($"加载资源清单文件!{packageVersion}"); Debug.Log($"加载资源清单文件!{packageVersion}");
var loadPackageManifestOp = fileSystem.LoadPackageManifestAsync(packageVersion, 60); var loadPackageManifestOptions = new LoadPackageManifestOptions(packageVersion, 60);
var loadPackageManifestOp = fileSystem.LoadPackageManifestAsync(loadPackageManifestOptions);
OperationSystem.StartOperation(packageName, loadPackageManifestOp); OperationSystem.StartOperation(packageName, loadPackageManifestOp);
yield return loadPackageManifestOp; yield return loadPackageManifestOp;
if (loadPackageManifestOp.Status != EOperationStatus.Succeed) if (loadPackageManifestOp.Status != EOperationStatus.Succeed)

View File

@@ -19,7 +19,7 @@ public class Boot : MonoBehaviour
Application.runInBackground = true; Application.runInBackground = true;
DontDestroyOnLoad(this.gameObject); DontDestroyOnLoad(this.gameObject);
} }
IEnumerator Start() void Start()
{ {
// 游戏管理器 // 游戏管理器
GameManager.Instance.Behaviour = this; GameManager.Instance.Behaviour = this;
@@ -34,16 +34,12 @@ public class Boot : MonoBehaviour
var go = Resources.Load<GameObject>("PatchWindow"); var go = Resources.Load<GameObject>("PatchWindow");
GameObject.Instantiate(go); GameObject.Instantiate(go);
// 开始补丁更新流程 // 补丁更新流程
var operation = new PatchOperation("DefaultPackage", PlayMode); PatchManager.Create("DefaultPackage", PlayMode);
YooAssets.StartOperation(operation); PatchManager.Start();
yield return operation; }
private void Update()
// 设置默认的资源包 {
var gamePackage = YooAssets.GetPackage("DefaultPackage"); PatchManager.Update();
YooAssets.SetDefaultPackage(gamePackage);
// 切换到主页面场景
SceneEventDefine.ChangeToHomeScene.SendEventMessage();
} }
} }

View File

@@ -2,19 +2,23 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UniFramework.Machine; using UniFramework.Machine;
using YooAsset;
internal class FsmStartGame : IStateNode internal class FsmStartGame : IStateNode
{ {
private PatchOperation _owner;
void IStateNode.OnCreate(StateMachine machine) void IStateNode.OnCreate(StateMachine machine)
{ {
_owner = machine.Owner as PatchOperation;
} }
void IStateNode.OnEnter() void IStateNode.OnEnter()
{ {
PatchEventDefine.PatchStepsChange.SendEventMessage("开始游戏!"); PatchEventDefine.PatchStepsChange.SendEventMessage("开始游戏!");
_owner.SetFinish();
// 设置默认的资源包
var gamePackage = YooAssets.GetPackage("DefaultPackage");
YooAssets.SetDefaultPackage(gamePackage);
// 切换到主页面场景
SceneEventDefine.ChangeToHomeScene.SendEventMessage();
} }
void IStateNode.OnUpdate() void IStateNode.OnUpdate()
{ {

View File

@@ -3,24 +3,13 @@ using UniFramework.Machine;
using UniFramework.Event; using UniFramework.Event;
using YooAsset; using YooAsset;
public class PatchOperation : GameAsyncOperation public static class PatchManager
{ {
private enum ESteps private static readonly EventGroup _eventGroup = new EventGroup();
private static StateMachine _machine;
public static void Create(string packageName, EPlayMode playMode)
{ {
None,
Update,
Done,
}
private readonly EventGroup _eventGroup = new EventGroup();
private readonly StateMachine _machine;
private readonly string _packageName;
private ESteps _steps = ESteps.None;
public PatchOperation(string packageName, EPlayMode playMode)
{
_packageName = packageName;
// 注册监听事件 // 注册监听事件
_eventGroup.AddListener<UserEventDefine.UserTryInitialize>(OnHandleEventMessage); _eventGroup.AddListener<UserEventDefine.UserTryInitialize>(OnHandleEventMessage);
_eventGroup.AddListener<UserEventDefine.UserBeginDownloadWebFiles>(OnHandleEventMessage); _eventGroup.AddListener<UserEventDefine.UserBeginDownloadWebFiles>(OnHandleEventMessage);
@@ -29,7 +18,7 @@ public class PatchOperation : GameAsyncOperation
_eventGroup.AddListener<UserEventDefine.UserTryDownloadWebFiles>(OnHandleEventMessage); _eventGroup.AddListener<UserEventDefine.UserTryDownloadWebFiles>(OnHandleEventMessage);
// 创建状态机 // 创建状态机
_machine = new StateMachine(this); _machine = new StateMachine(null);
_machine.AddNode<FsmInitializePackage>(); _machine.AddNode<FsmInitializePackage>();
_machine.AddNode<FsmRequestPackageVersion>(); _machine.AddNode<FsmRequestPackageVersion>();
_machine.AddNode<FsmUpdatePackageManifest>(); _machine.AddNode<FsmUpdatePackageManifest>();
@@ -42,37 +31,19 @@ public class PatchOperation : GameAsyncOperation
_machine.SetBlackboardValue("PackageName", packageName); _machine.SetBlackboardValue("PackageName", packageName);
_machine.SetBlackboardValue("PlayMode", playMode); _machine.SetBlackboardValue("PlayMode", playMode);
} }
protected override void OnStart() public static void Start()
{ {
_steps = ESteps.Update;
_machine.Run<FsmInitializePackage>(); _machine.Run<FsmInitializePackage>();
} }
protected override void OnUpdate() public static void Update()
{ {
if (_steps == ESteps.None || _steps == ESteps.Done) _machine.Update();
return;
if (_steps == ESteps.Update)
{
_machine.Update();
}
}
protected override void OnAbort()
{
}
public void SetFinish()
{
_steps = ESteps.Done;
_eventGroup.RemoveAllListener();
Status = EOperationStatus.Succeed;
Debug.Log($"Package {_packageName} patch done !");
} }
/// <summary> /// <summary>
/// 接收事件 /// 接收事件
/// </summary> /// </summary>
private void OnHandleEventMessage(IEventMessage message) private static void OnHandleEventMessage(IEventMessage message)
{ {
if (message is UserEventDefine.UserTryInitialize) if (message is UserEventDefine.UserTryInitialize)
{ {

View File

@@ -59,9 +59,9 @@ public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup
var package = YooAssets.CreatePackage(TestDefine.AssetBundlePackageName); var package = YooAssets.CreatePackage(TestDefine.AssetBundlePackageName);
// 初始化资源包 // 初始化资源包
var initParams = new EditorSimulateModeParameters(); var initParams = new EditorSimulateModeOptions();
initParams.EditorFileSystemParameters = FileSystemParameters.CreateDefaultEditorFileSystemParameters(packageRoot); initParams.EditorFileSystemParameters = FileSystemParameters.CreateDefaultEditorFileSystemParameters(packageRoot);
var initializeOp = package.InitializeAsync(initParams); var initializeOp = package.InitializePackageAsync(initParams);
yield return initializeOp; yield return initializeOp;
if (initializeOp.Status != EOperationStatus.Succeed) if (initializeOp.Status != EOperationStatus.Succeed)
Debug.LogError(initializeOp.Error); Debug.LogError(initializeOp.Error);
@@ -75,11 +75,12 @@ public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup
Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status); Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status);
// 更新资源清单 // 更新资源清单
var updateManifestOp = package.UpdatePackageManifestAsync(requetVersionOp.PackageVersion); var loadPackageManifestOptions = new LoadPackageManifestOptions(requetVersionOp.PackageVersion, 60);
yield return updateManifestOp; var loadPackageManifestOp = package.LoadPackageManifestAsync(loadPackageManifestOptions);
if (updateManifestOp.Status != EOperationStatus.Succeed) yield return loadPackageManifestOp;
Debug.LogError(updateManifestOp.Error); if (loadPackageManifestOp.Status != EOperationStatus.Succeed)
Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status); Debug.LogError(loadPackageManifestOp.Error);
Assert.AreEqual(EOperationStatus.Succeed, loadPackageManifestOp.Status);
} }
// 初始化资源包 RAW_BUNDLE // 初始化资源包 RAW_BUNDLE
@@ -94,9 +95,9 @@ public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup
var package = YooAssets.CreatePackage(TestDefine.RawBundlePackageName); var package = YooAssets.CreatePackage(TestDefine.RawBundlePackageName);
// 初始化资源包 // 初始化资源包
var initParams = new EditorSimulateModeParameters(); var initParams = new EditorSimulateModeOptions();
initParams.EditorFileSystemParameters = FileSystemParameters.CreateDefaultEditorFileSystemParameters(packageRoot); initParams.EditorFileSystemParameters = FileSystemParameters.CreateDefaultEditorFileSystemParameters(packageRoot);
var initializeOp = package.InitializeAsync(initParams); var initializeOp = package.InitializePackageAsync(initParams);
yield return initializeOp; yield return initializeOp;
if (initializeOp.Status != EOperationStatus.Succeed) if (initializeOp.Status != EOperationStatus.Succeed)
Debug.LogError(initializeOp.Error); Debug.LogError(initializeOp.Error);
@@ -110,11 +111,12 @@ public class T1_TestEditorFileSystem : IPrebuildSetup, IPostBuildCleanup
Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status); Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status);
// 更新资源清单 // 更新资源清单
var updateManifestOp = package.UpdatePackageManifestAsync(requetVersionOp.PackageVersion); var loadPackageManifestOptions = new LoadPackageManifestOptions(requetVersionOp.PackageVersion, 60);
yield return updateManifestOp; var loadPackageManifestOp = package.LoadPackageManifestAsync(loadPackageManifestOptions);
if (updateManifestOp.Status != EOperationStatus.Succeed) yield return loadPackageManifestOp;
Debug.LogError(updateManifestOp.Error); if (loadPackageManifestOp.Status != EOperationStatus.Succeed)
Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status); Debug.LogError(loadPackageManifestOp.Error);
Assert.AreEqual(EOperationStatus.Succeed, loadPackageManifestOp.Status);
} }
} }

View File

@@ -59,13 +59,13 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
var package = YooAssets.CreatePackage(TestDefine.AssetBundlePackageName); var package = YooAssets.CreatePackage(TestDefine.AssetBundlePackageName);
// 初始化资源包 // 初始化资源包
var initParams = new OfflinePlayModeParameters(); var initParams = new OfflinePlayModeOptions();
var fileDecryption = new TestFileStreamDecryption(); var fileDecryption = new TestFileStreamDecryption();
var manifestServices = new TestRestoreManifest(); var manifestServices = new TestRestoreManifest();
initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(fileDecryption, packageRoot); initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(fileDecryption, packageRoot);
initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.DISABLE_CATALOG_FILE, true); initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.DISABLE_CATALOG_FILE, true);
initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.MANIFEST_SERVICES, manifestServices); initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.MANIFEST_SERVICES, manifestServices);
var initializeOp = package.InitializeAsync(initParams); var initializeOp = package.InitializePackageAsync(initParams);
yield return initializeOp; yield return initializeOp;
if (initializeOp.Status != EOperationStatus.Succeed) if (initializeOp.Status != EOperationStatus.Succeed)
Debug.LogError(initializeOp.Error); Debug.LogError(initializeOp.Error);
@@ -79,11 +79,12 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status); Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status);
// 更新资源清单 // 更新资源清单
var updateManifestOp = package.UpdatePackageManifestAsync(requetVersionOp.PackageVersion); var loadPackageManifestOptions = new LoadPackageManifestOptions(requetVersionOp.PackageVersion, 60);
yield return updateManifestOp; var loadPackageManifestOp = package.LoadPackageManifestAsync(loadPackageManifestOptions);
if (updateManifestOp.Status != EOperationStatus.Succeed) yield return loadPackageManifestOp;
Debug.LogError(updateManifestOp.Error); if (loadPackageManifestOp.Status != EOperationStatus.Succeed)
Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status); Debug.LogError(loadPackageManifestOp.Error);
Assert.AreEqual(EOperationStatus.Succeed, loadPackageManifestOp.Status);
} }
// 初始化资源包 RAW_BUNDLE // 初始化资源包 RAW_BUNDLE
@@ -98,11 +99,11 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
var package = YooAssets.CreatePackage(TestDefine.RawBundlePackageName); var package = YooAssets.CreatePackage(TestDefine.RawBundlePackageName);
// 初始化资源包 // 初始化资源包
var initParams = new OfflinePlayModeParameters(); var initParams = new OfflinePlayModeOptions();
initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(null, packageRoot); initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(null, packageRoot);
initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, true); initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, true);
initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.DISABLE_CATALOG_FILE, true); initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.DISABLE_CATALOG_FILE, true);
var initializeOp = package.InitializeAsync(initParams); var initializeOp = package.InitializePackageAsync(initParams);
yield return initializeOp; yield return initializeOp;
if (initializeOp.Status != EOperationStatus.Succeed) if (initializeOp.Status != EOperationStatus.Succeed)
Debug.LogError(initializeOp.Error); Debug.LogError(initializeOp.Error);
@@ -116,11 +117,12 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status); Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status);
// 更新资源清单 // 更新资源清单
var updateManifestOp = package.UpdatePackageManifestAsync(requetVersionOp.PackageVersion); var loadPackageManifestOptions = new LoadPackageManifestOptions(requetVersionOp.PackageVersion, 60);
yield return updateManifestOp; var loadPackageManifestOp = package.LoadPackageManifestAsync(loadPackageManifestOptions);
if (updateManifestOp.Status != EOperationStatus.Succeed) yield return loadPackageManifestOp;
Debug.LogError(updateManifestOp.Error); if (loadPackageManifestOp.Status != EOperationStatus.Succeed)
Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status); Debug.LogError(loadPackageManifestOp.Error);
Assert.AreEqual(EOperationStatus.Succeed, loadPackageManifestOp.Status);
} }
} }

View File

@@ -44,7 +44,7 @@ public class T3_TestCacheFileSystem : IPrebuildSetup, IPostBuildCleanup
var package = YooAssets.CreatePackage(TestDefine.AssetBundlePackageName); var package = YooAssets.CreatePackage(TestDefine.AssetBundlePackageName);
// 初始化资源包 // 初始化资源包
var initParams = new HostPlayModeParameters(); var initParams = new HostPlayModeOptions();
var fileDecryption = new TestFileStreamDecryption(); var fileDecryption = new TestFileStreamDecryption();
var manifestServices = new TestRestoreManifest(); var manifestServices = new TestRestoreManifest();
@@ -53,7 +53,7 @@ public class T3_TestCacheFileSystem : IPrebuildSetup, IPostBuildCleanup
initParams.BuildinFileSystemParameters = null; initParams.BuildinFileSystemParameters = null;
initParams.CacheFileSystemParameters = FileSystemParameters.CreateDefaultCacheFileSystemParameters(remoteServices, fileDecryption); initParams.CacheFileSystemParameters = FileSystemParameters.CreateDefaultCacheFileSystemParameters(remoteServices, fileDecryption);
initParams.CacheFileSystemParameters.AddParameter(FileSystemParametersDefine.MANIFEST_SERVICES, manifestServices); initParams.CacheFileSystemParameters.AddParameter(FileSystemParametersDefine.MANIFEST_SERVICES, manifestServices);
var initializeOp = package.InitializeAsync(initParams); var initializeOp = package.InitializePackageAsync(initParams);
yield return initializeOp; yield return initializeOp;
if (initializeOp.Status != EOperationStatus.Succeed) if (initializeOp.Status != EOperationStatus.Succeed)
Debug.LogError(initializeOp.Error); Debug.LogError(initializeOp.Error);
@@ -67,11 +67,12 @@ public class T3_TestCacheFileSystem : IPrebuildSetup, IPostBuildCleanup
Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status); Assert.AreEqual(EOperationStatus.Succeed, requetVersionOp.Status);
// 更新资源清单 // 更新资源清单
var updateManifestOp = package.UpdatePackageManifestAsync(requetVersionOp.PackageVersion); var loadPackageManifestOptions = new LoadPackageManifestOptions(requetVersionOp.PackageVersion, 60);
yield return updateManifestOp; var loadPackageManifestOp = package.LoadPackageManifestAsync(loadPackageManifestOptions);
if (updateManifestOp.Status != EOperationStatus.Succeed) yield return loadPackageManifestOp;
Debug.LogError(updateManifestOp.Error); if (loadPackageManifestOp.Status != EOperationStatus.Succeed)
Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status); Debug.LogError(loadPackageManifestOp.Error);
Assert.AreEqual(EOperationStatus.Succeed, loadPackageManifestOp.Status);
} }
} }
private class TestRemoteServices : IRemoteServices private class TestRemoteServices : IRemoteServices

View File

@@ -37,8 +37,8 @@ public class TestBundlePlaying
// 验证失败结果 // 验证失败结果
UnityEngine.TestTools.LogAssert.ignoreFailingMessages = true; UnityEngine.TestTools.LogAssert.ignoreFailingMessages = true;
var assetsHandle = package.LoadAssetSync<GameObject>("prefab_encryptB"); var assetsHandle = package.LoadAssetSync<GameObject>("prefab_encryptB");
Assert.AreEqual(EOperationStatus.Failed, assetsHandle.Status);
UnityEngine.TestTools.LogAssert.ignoreFailingMessages = false; UnityEngine.TestTools.LogAssert.ignoreFailingMessages = false;
Assert.AreEqual(EOperationStatus.Failed, assetsHandle.Status);
// 清理加载器 // 清理加载器
assetsHandle.Release(); assetsHandle.Release();
@@ -47,7 +47,9 @@ public class TestBundlePlaying
// 验证成功结果 // 验证成功结果
// 说明:同步加载也会触发远端下载任务! // 说明:同步加载也会触发远端下载任务!
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
UnityEngine.TestTools.LogAssert.ignoreFailingMessages = true;
assetsHandle = package.LoadAssetSync<GameObject>("prefab_encryptB"); assetsHandle = package.LoadAssetSync<GameObject>("prefab_encryptB");
UnityEngine.TestTools.LogAssert.ignoreFailingMessages = false;
Assert.AreEqual(EOperationStatus.Succeed, assetsHandle.Status); Assert.AreEqual(EOperationStatus.Succeed, assetsHandle.Status);
} }
} }

View File

@@ -16,7 +16,7 @@ public class TestDestroyPackage
// 销毁旧资源包 ASSET_BUNDLE // 销毁旧资源包 ASSET_BUNDLE
{ {
var package = YooAssets.GetPackage(TestDefine.AssetBundlePackageName); var package = YooAssets.GetPackage(TestDefine.AssetBundlePackageName);
var destroyOp = package.DestroyAsync(); var destroyOp = package.DestroyPackageAsync();
yield return destroyOp; yield return destroyOp;
if (destroyOp.Status != EOperationStatus.Succeed) if (destroyOp.Status != EOperationStatus.Succeed)
Debug.LogError(destroyOp.Error); Debug.LogError(destroyOp.Error);
@@ -30,7 +30,7 @@ public class TestDestroyPackage
if (destroyRawPackage) if (destroyRawPackage)
{ {
var package = YooAssets.GetPackage(TestDefine.RawBundlePackageName); var package = YooAssets.GetPackage(TestDefine.RawBundlePackageName);
var destroyOp = package.DestroyAsync(); var destroyOp = package.DestroyPackageAsync();
yield return destroyOp; yield return destroyOp;
if (destroyOp.Status != EOperationStatus.Succeed) if (destroyOp.Status != EOperationStatus.Succeed)
Debug.LogError(destroyOp.Error); Debug.LogError(destroyOp.Error);

View File

@@ -38,7 +38,13 @@ public class TestLoadAsset
// 同步加载音效 // 同步加载音效
{ {
int loadFrame = Time.frameCount;
var assetHandle = package.LoadAssetSync<AudioClip>("sound_b"); var assetHandle = package.LoadAssetSync<AudioClip>("sound_b");
assetHandle.Completed += (AssetHandle handle) =>
{
Assert.AreEqual(loadFrame, Time.frameCount);
};
Assert.AreEqual(true, assetHandle.Provider.IsFinish);
Assert.AreEqual(EOperationStatus.Succeed, assetHandle.Status); Assert.AreEqual(EOperationStatus.Succeed, assetHandle.Status);
var audioClip = assetHandle.AssetObject as AudioClip; var audioClip = assetHandle.AssetObject as AudioClip;