code style

pull/497/head
何冠峰 2025-02-22 16:29:25 +08:00
parent 64e9734bbe
commit 400c2ccefe
87 changed files with 230 additions and 228 deletions

View File

@ -16,11 +16,11 @@ namespace YooAsset
internal UnityWebDataRequestOperation(string url, int timeout = 60) : base(url, timeout)
{
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateRequest;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -59,7 +59,7 @@ namespace YooAsset
DisposeRequest();
}
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
_steps = ESteps.Done;
DisposeRequest();

View File

@ -12,11 +12,11 @@ namespace YooAsset
{
_fileSavePath = fileSavePath;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateRequest;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -54,7 +54,7 @@ namespace YooAsset
DisposeRequest();
}
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
_steps = ESteps.Done;
DisposeRequest();

View File

@ -16,11 +16,11 @@ namespace YooAsset
internal UnityWebTextRequestOperation(string url, int timeout = 60) : base(url, timeout)
{
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateRequest;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -59,7 +59,7 @@ namespace YooAsset
DisposeRequest();
}
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
_steps = ESteps.Done;
DisposeRequest();

View File

@ -25,11 +25,11 @@ namespace YooAsset
_assetBundle = assetBundle;
_assetInfo = assetInfo;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckBundle;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -25,11 +25,11 @@ namespace YooAsset
_assetBundle = assetBundle;
_assetInfo = assetInfo;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckBundle;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -25,11 +25,11 @@ namespace YooAsset
_loadParams = loadParams;
_suspendLoad = suspendLoad;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadScene;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -107,7 +107,7 @@ namespace YooAsset
internal override void InternalWaitForAsyncComplete()
{
//TODO 场景加载不支持异步转同步,为了支持同步加载方法需要实现该方法!
InternalOnUpdate();
InternalUpdate();
}
public override void UnSuspendLoad()
{

View File

@ -25,11 +25,11 @@ namespace YooAsset
_assetBundle = assetBundle;
_assetInfo = assetInfo;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckBundle;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -3,12 +3,12 @@ namespace YooAsset
{
internal class RawBundleLoadAllAssetsOperation : FSLoadAllAssetsOperation
{
internal override void InternalOnStart()
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadAllAssetsOperation)} not support load all assets !";
Status = EOperationStatus.Failed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
}

View File

@ -3,12 +3,12 @@ namespace YooAsset
{
internal class RawBundleLoadAssetOperation : FSLoadAssetOperation
{
internal override void InternalOnStart()
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadAssetOperation)} not support load asset !";
Status = EOperationStatus.Failed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
}

View File

@ -3,12 +3,12 @@ namespace YooAsset
{
internal class RawBundleLoadSceneOperation : FSLoadSceneOperation
{
internal override void InternalOnStart()
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadSceneOperation)} not support load scene !";
Status = EOperationStatus.Failed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
public override void UnSuspendLoad()

View File

@ -3,12 +3,12 @@ namespace YooAsset
{
internal class RawBundleLoadSubAssetsOperation : FSLoadSubAssetsOperation
{
internal override void InternalOnStart()
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadSubAssetsOperation)} not support load sub assets !";
Status = EOperationStatus.Failed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
}

View File

@ -22,7 +22,7 @@ namespace YooAsset
_packageBundle = packageBundle;
_assetInfo = assetInfo;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
#if UNITY_EDITOR
_steps = ESteps.CheckBundle;
@ -32,7 +32,7 @@ namespace YooAsset
Status = EOperationStatus.Failed;
#endif
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
#if UNITY_EDITOR
if (_steps == ESteps.None || _steps == ESteps.Done)

View File

@ -21,7 +21,7 @@ namespace YooAsset
_packageBundle = packageBundle;
_assetInfo = assetInfo;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
#if UNITY_EDITOR
_steps = ESteps.CheckBundle;
@ -31,7 +31,7 @@ namespace YooAsset
Status = EOperationStatus.Failed;
#endif
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
#if UNITY_EDITOR
if (_steps == ESteps.None || _steps == ESteps.Done)

View File

@ -25,7 +25,7 @@ namespace YooAsset
_loadParams = loadParams;
_suspendLoad = suspendLoad;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
#if UNITY_EDITOR
_steps = ESteps.LoadScene;
@ -35,7 +35,7 @@ namespace YooAsset
Status = EOperationStatus.Failed;
#endif
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
#if UNITY_EDITOR
if (_steps == ESteps.None || _steps == ESteps.Done)
@ -113,7 +113,7 @@ namespace YooAsset
internal override void InternalWaitForAsyncComplete()
{
//TODO 场景加载不支持异步转同步,为了支持同步加载方法需要实现该方法!
InternalOnUpdate();
InternalUpdate();
}
public override void UnSuspendLoad()
{

View File

@ -22,7 +22,7 @@ namespace YooAsset
_packageBundle = packageBundle;
_assetInfo = assetInfo;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
#if UNITY_EDITOR
_steps = ESteps.CheckBundle;
@ -32,7 +32,7 @@ namespace YooAsset
Status = EOperationStatus.Failed;
#endif
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
#if UNITY_EDITOR
if (_steps == ESteps.None || _steps == ESteps.Done)

View File

@ -24,7 +24,7 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
#if UNITY_WEBGL
_steps = ESteps.Done;
@ -37,7 +37,7 @@ namespace YooAsset
_steps = ESteps.InitUnpackFileSystem;
#endif
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -29,13 +29,13 @@ namespace YooAsset
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
DownloadProgress = 1f;
DownloadedBytes = _bundle.FileSize;
_steps = ESteps.LoadAssetBundle;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -166,13 +166,13 @@ namespace YooAsset
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
DownloadProgress = 1f;
DownloadedBytes = _bundle.FileSize;
_steps = ESteps.LoadBuildinRawBundle;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -23,11 +23,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_packageVersion = packageVersion;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestBuildinPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -19,11 +19,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -29,11 +29,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -19,11 +19,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadCatalog;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -31,11 +31,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_packageHash = packageHash;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestFileData;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -26,11 +26,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_packageVersion = packageVersion;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -24,11 +24,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -22,7 +22,7 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
#if UNITY_WEBGL
_steps = ESteps.Done;
@ -32,7 +32,7 @@ namespace YooAsset
_steps = ESteps.CheckAppFootPrint;
#endif
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -29,11 +29,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckExist;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -251,11 +251,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckExist;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -30,11 +30,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.DownloadPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -23,11 +23,11 @@ namespace YooAsset
_appendTimeTicks = appendTimeTicks;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.GetPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -23,11 +23,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.GetAllCacheFiles;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -20,11 +20,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.ClearAllCacheFiles;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -27,11 +27,11 @@ namespace YooAsset
_manifest = manifest;
_clearParam = clearParam;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckArgs;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -25,11 +25,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_manifest = manifest;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.GetUnusedCacheFiles;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -22,11 +22,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_manifest = manifest;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.ClearUnusedCacheFiles;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -16,13 +16,13 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
_tempFilePath = _fileSystem.GetTempFilePath(Bundle);
_steps = ESteps.CheckExists;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -157,7 +157,7 @@ namespace YooAsset
}
}
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
_steps = ESteps.Done;
DisposeWebRequest();
@ -167,7 +167,7 @@ namespace YooAsset
//TODO 防止下载器挂起陷入无限死循环!
if (_steps == ESteps.None)
{
InternalOnStart();
InternalStart();
}
while (true)
@ -175,7 +175,7 @@ namespace YooAsset
//TODO 如果是导入或解压本地文件,执行等待完毕
if (_isReuqestLocalFile)
{
InternalOnUpdate();
InternalUpdate();
if (IsDone)
break;
}

View File

@ -26,12 +26,12 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(DownloadPackageHashOperation));
_steps = ESteps.CheckExist;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -26,12 +26,12 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(DownloadPackageManifestOperation));
_steps = ESteps.CheckExist;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -20,13 +20,13 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
_tempFilePath = _fileSystem.GetTempFilePath(Bundle);
_steps = ESteps.CheckExists;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -177,7 +177,7 @@ namespace YooAsset
}
}
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
_steps = ESteps.Done;
DisposeWebRequest();
@ -187,7 +187,7 @@ namespace YooAsset
//TODO 防止下载器挂起陷入无限死循环!
if (_steps == ESteps.None)
{
InternalOnStart();
InternalStart();
}
while (true)
@ -195,7 +195,7 @@ namespace YooAsset
//TODO 如果是导入或解压本地文件,执行等待完毕
if (_isReuqestLocalFile)
{
InternalOnUpdate();
InternalUpdate();
if (IsDone)
break;
}

View File

@ -26,11 +26,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_packageVersion = packageVersion;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -32,11 +32,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_packageHash = packageHash;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadFileData;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -29,12 +29,12 @@ namespace YooAsset
_appendTimeTicks = appendTimeTicks;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestRemotePackageVersionOperation));
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -30,12 +30,12 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.Prepare;
_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -37,12 +37,12 @@ namespace YooAsset
_waitingList = elements;
_fileVerifyLevel = fileSystem.FileVerifyLevel;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.InitVerify;
_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -29,11 +29,11 @@ namespace YooAsset
{
_element = element;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.VerifyFile;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -72,7 +72,7 @@ namespace YooAsset
while (true)
{
//TODO 等待子线程验证文件完毕,该操作会挂起主线程
InternalOnUpdate();
InternalUpdate();
if (IsDone)
break;
}

View File

@ -9,11 +9,11 @@ namespace YooAsset
{
_fileSytem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
Status = EOperationStatus.Succeed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
}

View File

@ -22,11 +22,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.DownloadFile;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -23,11 +23,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_packageVersion = packageVersion;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadEditorPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -19,11 +19,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -26,11 +26,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_packageVersion = packageVersion;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -32,11 +32,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_packageHash = packageHash;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadFileData;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -24,11 +24,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -9,11 +9,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
Status = EOperationStatus.Succeed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
}

View File

@ -21,11 +21,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.DownloadAssetBundle;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -25,11 +25,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestWebPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -23,11 +23,11 @@ namespace YooAsset
_appendTimeTicks = appendTimeTicks;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -32,12 +32,12 @@ namespace YooAsset
_packageVersion = packageVersion;
_packageHash = packageHash;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadWebRemotePackageManifestOperation));
_steps = ESteps.RequestFileData;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -29,12 +29,12 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWebRemotePackageHashOperation));
_steps = ESteps.RequestPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -29,12 +29,12 @@ namespace YooAsset
_appendTimeTicks = appendTimeTicks;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWebRemotePackageVersionOperation));
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -21,11 +21,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadCatalogFile;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -21,11 +21,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_bundle = bundle;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.DownloadAssetBundle;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -25,11 +25,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestWebPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -21,11 +21,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -27,11 +27,11 @@ namespace YooAsset
{
_fileSystem = fileSystem;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadCatalog;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -31,11 +31,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_packageHash = packageHash;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestFileData;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -28,11 +28,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageHash;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -26,11 +26,11 @@ namespace YooAsset
_fileSystem = fileSystem;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -17,7 +17,7 @@ namespace YooAsset
{
_error = error;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
if (string.IsNullOrEmpty(_error))
{
@ -29,7 +29,7 @@ namespace YooAsset
Error = _error;
}
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
}

View File

@ -33,12 +33,12 @@ namespace YooAsset
{
_error = error;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
Status = EOperationStatus.Failed;
Error = _error;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
public override void AbortDownloadOperation()

View File

@ -15,11 +15,11 @@ namespace YooAsset
_checkTimeout = checkTimeout;
_decryptionServices = decryptionServices;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateRequest;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -117,7 +117,7 @@ namespace YooAsset
}
}
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
_steps = ESteps.Done;
DisposeWebRequest();

View File

@ -13,11 +13,11 @@ namespace YooAsset
{
_disableUnityWebCache = disableUnityWebCache;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateRequest;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -95,7 +95,7 @@ namespace YooAsset
}
}
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
_steps = ESteps.Done;
DisposeWebRequest();

View File

@ -8,6 +8,7 @@ namespace YooAsset
{
public abstract class AsyncOperationBase : IEnumerator, IComparable<AsyncOperationBase>
{
private readonly List<AsyncOperationBase> _childs = new List<AsyncOperationBase>(10);
private Action<AsyncOperationBase> _callback;
private string _packageName = null;
private int _whileFrame = 1000;
@ -15,7 +16,7 @@ namespace YooAsset
/// <summary>
/// 等待异步执行完成
/// </summary>
internal bool IsWaitForAsyncComplete = false;
internal bool IsWaitForAsyncComplete { private set; get; } = false;
/// <summary>
/// 是否已经完成
@ -99,9 +100,9 @@ namespace YooAsset
}
}
internal abstract void InternalOnStart();
internal abstract void InternalOnUpdate();
internal virtual void InternalOnAbort()
internal abstract void InternalStart();
internal abstract void InternalUpdate();
internal virtual void InternalAbort()
{
}
internal virtual void InternalWaitForAsyncComplete()
@ -115,8 +116,11 @@ namespace YooAsset
}
internal void SetStart()
{
Status = EOperationStatus.Processing;
InternalOnStart();
if (Status == EOperationStatus.None)
{
Status = EOperationStatus.Processing;
InternalStart();
}
}
internal void SetFinish()
{
@ -138,7 +142,7 @@ namespace YooAsset
Status = EOperationStatus.Failed;
Error = "user abort";
YooLogger.Warning($"Async operaiton {this.GetType().Name} has been abort !");
InternalOnAbort();
InternalAbort();
}
}
@ -150,7 +154,7 @@ namespace YooAsset
if (IsDone == false)
{
// 执行更新逻辑
InternalOnUpdate();
InternalUpdate();
// 当执行次数用完时
_whileFrame--;
@ -184,6 +188,23 @@ namespace YooAsset
InternalWaitForAsyncComplete();
}
/// <summary>
/// 开启子任务
/// </summary>
internal void StartChildOperation(AsyncOperationBase child)
{
#if UNITY_EDITOR
if (_childs.Contains(child))
throw new Exception($"The child node {child.GetType().Name} already exists !");
#endif
child.SetStart();
_childs.Add(child);
}
#region 调试信息
#endregion
#region 排序接口实现
public int CompareTo(AsyncOperationBase other)
{

View File

@ -3,15 +3,15 @@ namespace YooAsset
{
public abstract class GameAsyncOperation : AsyncOperationBase
{
internal override void InternalOnStart()
internal override void InternalStart()
{
OnStart();
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
OnUpdate();
}
internal override void InternalOnAbort()
internal override void InternalAbort()
{
OnAbort();
}

View File

@ -13,11 +13,6 @@ namespace YooAsset
private static Stopwatch _watch;
private static long _frameTime;
/// <summary>
/// 快速启动模式
/// </summary>
public static bool QuickStartMode = true;
/// <summary>
/// 异步操作的最小时间片段
/// </summary>
@ -82,7 +77,7 @@ namespace YooAsset
continue;
if (operation.IsDone == false)
operation.InternalOnUpdate();
operation.InternalUpdate();
if (operation.IsDone)
operation.SetFinish();
@ -141,11 +136,6 @@ namespace YooAsset
_newList.Add(operation);
operation.SetPackageName(packageName);
operation.SetStart();
if (QuickStartMode)
{
operation.InternalOnUpdate();
}
}
}
}

View File

@ -43,11 +43,11 @@ namespace YooAsset
_worldPositionStays = worldPositionStays;
_actived = actived;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadObject;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -55,11 +55,11 @@ namespace YooAsset
_resourceManager = resourceManager;
LoadBundleInfo = bundleInfo;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.LoadFile;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -38,11 +38,11 @@ namespace YooAsset
_resManager = resourceManager;
_options = options;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckOptions;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -42,11 +42,11 @@ namespace YooAsset
throw new System.NotImplementedException();
}
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckError;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -22,11 +22,11 @@ namespace YooAsset
_resManager = resourceManager;
_loopCount = loopCount;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.UnloadUnused;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -96,12 +96,12 @@ namespace YooAsset
}
}
}
internal override void InternalOnStart()
internal override void InternalStart()
{
DebugBeginRecording();
_steps = ESteps.LoadBundleFile;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -320,7 +320,7 @@ namespace YooAsset
}
[Conditional("DEBUG")]
protected void DebugBeginRecording()
private void DebugBeginRecording()
{
if (_watch == null)
{

View File

@ -35,11 +35,11 @@ namespace YooAsset
_clearMode = clearMode;
_clearParam = clearParam;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.ClearFileSystemA;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -22,11 +22,11 @@ namespace YooAsset
_resourcePackage = resourcePackage;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckInitStatus;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -116,12 +116,12 @@ namespace YooAsset
// 统计下载信息
CalculatDownloaderInfo();
}
internal override void InternalOnStart()
internal override void InternalStart()
{
YooLogger.Log($"Begine to download {TotalDownloadCount} files and {TotalDownloadBytes} bytes");
_steps = ESteps.Check;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -31,11 +31,11 @@ namespace YooAsset
_impl = impl;
_parameters = parameters;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateFileSystem;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.CreateFileSystem)
{
@ -108,11 +108,11 @@ namespace YooAsset
_impl = impl;
_parameters = parameters;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateFileSystem;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -189,11 +189,11 @@ namespace YooAsset
_impl = impl;
_parameters = parameters;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateBuildinFileSystem;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -312,11 +312,11 @@ namespace YooAsset
_impl = impl;
_parameters = parameters;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CreateWebServerFileSystem;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -34,11 +34,11 @@ namespace YooAsset
{
_buffer = new BufferReader(binaryData);
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.DeserializeFileHeader;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -63,11 +63,11 @@ namespace YooAsset
{
_impl = impl;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
Status = EOperationStatus.Succeed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
@ -100,11 +100,11 @@ namespace YooAsset
{
_impl = impl;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
Status = EOperationStatus.Succeed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}
@ -154,11 +154,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckParams;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
@ -297,11 +297,11 @@ namespace YooAsset
{
_impl = impl;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
Status = EOperationStatus.Succeed;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
}

View File

@ -32,11 +32,11 @@ namespace YooAsset
_appendTimeTicks = appendTimeTicks;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.RequestPackageVersion;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -33,11 +33,11 @@ namespace YooAsset
_packageVersion = packageVersion;
_timeout = timeout;
}
internal override void InternalOnStart()
internal override void InternalStart()
{
_steps = ESteps.CheckParams;
}
internal override void InternalOnUpdate()
internal override void InternalUpdate()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;

View File

@ -222,15 +222,6 @@ namespace YooAsset
}
OperationSystem.MaxTimeSlice = milliseconds;
}
/// <summary>
/// 设置异步系统参数,快速启动模式的开关
/// 注意:该模式默认开启
/// </summary>
public static void SetOperationSystemQuickStartMode(bool state)
{
OperationSystem.QuickStartMode = state;
}
#endregion
#region 调试信息