diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebDataRequestOperation.cs b/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebDataRequestOperation.cs index 3a26ffc2..3609cbdd 100644 --- a/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebDataRequestOperation.cs +++ b/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebDataRequestOperation.cs @@ -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(); diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebFileRequestOperation.cs b/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebFileRequestOperation.cs index 28936bdf..2ecffca7 100644 --- a/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebFileRequestOperation.cs +++ b/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebFileRequestOperation.cs @@ -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(); diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebTextRequestOperation.cs b/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebTextRequestOperation.cs index ee1ae32c..d0045b18 100644 --- a/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebTextRequestOperation.cs +++ b/Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebTextRequestOperation.cs @@ -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(); diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAllAssetsOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAllAssetsOperation.cs index c07af327..f5bd7f35 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAllAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAllAssetsOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAssetOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAssetOperation.cs index 5989576c..78cc5bfc 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAssetOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAssetOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSceneOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSceneOperation.cs index dc8eca30..95a7a087 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSceneOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSceneOperation.cs @@ -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() { diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSubAssetsOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSubAssetsOperation.cs index 084294b5..c3b9ccae 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSubAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSubAssetsOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAllAssetsOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAllAssetsOperation.cs index 374d0fec..1c227032 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAllAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAllAssetsOperation.cs @@ -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() { } } diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAssetOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAssetOperation.cs index e38e3ed1..e3bdd18e 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAssetOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadAssetOperation.cs @@ -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() { } } diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSceneOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSceneOperation.cs index 51ddc661..763f1d86 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSceneOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSceneOperation.cs @@ -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() diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSubAssetsOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSubAssetsOperation.cs index 259c127d..b8e8635e 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSubAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/RawBundleResult/Operation/RawBundleLoadSubAssetsOperation.cs @@ -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() { } } diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAllAssetsOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAllAssetsOperation.cs index 69b57151..3b9a0a14 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAllAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAllAssetsOperation.cs @@ -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) diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAssetOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAssetOperation.cs index 2da09a24..64d4ae34 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAssetOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadAssetOperation.cs @@ -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) diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSceneOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSceneOperation.cs index 3ca95375..01b23651 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSceneOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSceneOperation.cs @@ -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() { diff --git a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSubAssetsOperation.cs b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSubAssetsOperation.cs index f8d90155..587c3a42 100644 --- a/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSubAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSubAssetsOperation.cs @@ -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) diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs index 5059ff8e..e2e2e5b4 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs index fb7c310e..2a42e6b4 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs index a98b6cea..0f5e9a83 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs index 7cf31bab..b5918cb5 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinPackageManifestOperation.cs index 79971324..c8ceebd3 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs index eb8ca96b..3490e52c 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs index bf040356..f303a0ed 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs index 661f118d..31cf75b2 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs index 3b8b582f..a0de67ca 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSInitializeOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSInitializeOperation.cs index ba0ba810..928f607c 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSInitializeOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSInitializeOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs index 34791c67..8e4c3965 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadPackageManifestOperation.cs index 37bf7b56..b90232ee 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSRequestPackageVersionOperation.cs index 3724c90f..7c72e30f 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSRequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSRequestPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheBundleFilesOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheBundleFilesOperation.cs index 7433f43d..5b3db2ac 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheBundleFilesOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheBundleFilesOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheManifestFilesOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheManifestFilesOperation.cs index 62a737fe..407dc381 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheManifestFilesOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheManifestFilesOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByTagsOperaiton.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByTagsOperaiton.cs index a34045fb..b913af3c 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByTagsOperaiton.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByTagsOperaiton.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheBundleFilesOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheBundleFilesOperation.cs index 962ba9fe..a09baf94 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheBundleFilesOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheBundleFilesOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheManifestFilesOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheManifestFilesOperation.cs index c71cfad7..90d6e22e 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheManifestFilesOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheManifestFilesOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadNormalFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadNormalFileOperation.cs index 0d7b4528..25819600 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadNormalFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadNormalFileOperation.cs @@ -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; } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageHashOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageHashOperation.cs index 655eebc3..d30dded8 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageHashOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageManifestOperation.cs index c279bd64..3258a6da 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadResumeFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadResumeFileOperation.cs index 028b7e87..e892c2bc 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadResumeFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadResumeFileOperation.cs @@ -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; } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageHashOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageHashOperation.cs index b383a370..5f937990 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageHashOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageManifestOperation.cs index 6c2b845f..b846a7f4 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/RequestRemotePackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/RequestRemotePackageVersionOperation.cs index 25ef85d4..12938fe4 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/RequestRemotePackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/RequestRemotePackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/SearchCacheFilesOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/SearchCacheFilesOperation.cs index bae413f8..896b2280 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/SearchCacheFilesOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/SearchCacheFilesOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyCacheFilesOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyCacheFilesOperation.cs index aefad955..79d3d8a4 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyCacheFilesOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyCacheFilesOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyTempFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyTempFileOperation.cs index c9c21b71..032518c0 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyTempFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyTempFileOperation.cs @@ -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; } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSInitializeOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSInitializeOperation.cs index 8172e85e..b9de895d 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSInitializeOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSInitializeOperation.cs @@ -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() { } } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadBundleOperation.cs index 87db4cde..c116146c 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadBundleOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadPackageManifestOperation.cs index afe8a28b..7afef5ca 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSRequestPackageVersionOperation.cs index 58364201..45166057 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSRequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSRequestPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageHashOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageHashOperation.cs index b9f75d56..ecfcdc3f 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageHashOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageManifestOperation.cs index 7a675e08..c7793a63 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageVersionOperation.cs index de0ba026..05a0d7f9 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSInitializeOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSInitializeOperation.cs index 20328f48..05d790db 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSInitializeOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSInitializeOperation.cs @@ -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() { } } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadBundleOperation.cs index 7cd11d27..0bac9cc4 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadBundleOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadPackageManifestOperation.cs index 6691f63b..80a9b4a5 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSRequestPackageVersionOperation.cs index 1b1c9f3b..76556420 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSRequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSRequestPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/LoadWebRemotePackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/LoadWebRemotePackageManifestOperation.cs index 72635b23..c4755b0f 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/LoadWebRemotePackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/LoadWebRemotePackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageHashOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageHashOperation.cs index 9a0dbdad..a4f61216 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageHashOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageVersionOperation.cs index 1e144924..e32d0919 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSInitializeOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSInitializeOperation.cs index 8b4c8f6a..27459d6a 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSInitializeOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSInitializeOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadBundleOperation.cs index e3129a65..c3d19e4d 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadBundleOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadPackageManifestOperation.cs index 1445ab1d..4673fa2a 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSRequestPackageVersionOperation.cs index 448d9bbb..6124cb5d 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSRequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSRequestPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs index 42e5dbc9..2b3b4f6b 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerPackageManifestOperation.cs index 069a7299..f4c984ef 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerPackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageHashOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageHashOperation.cs index c2a7a586..32d4489a 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageHashOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageVersionOperation.cs index c28a4ede..e21b80d0 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/RequestWebServerPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/FileSystem/Operation/FSClearCacheFilesOperation.cs b/Assets/YooAsset/Runtime/FileSystem/Operation/FSClearCacheFilesOperation.cs index 948d64b6..6c72accc 100644 --- a/Assets/YooAsset/Runtime/FileSystem/Operation/FSClearCacheFilesOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/Operation/FSClearCacheFilesOperation.cs @@ -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() { } } diff --git a/Assets/YooAsset/Runtime/FileSystem/Operation/FSLoadBundleFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/Operation/FSLoadBundleFileOperation.cs index 135dc792..a0753cae 100644 --- a/Assets/YooAsset/Runtime/FileSystem/Operation/FSLoadBundleFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/Operation/FSLoadBundleFileOperation.cs @@ -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() diff --git a/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs index 9636dd88..9424b3a2 100644 --- a/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs @@ -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(); diff --git a/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebNormalAssetBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebNormalAssetBundleOperation.cs index 844e1cab..527999b9 100644 --- a/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebNormalAssetBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebNormalAssetBundleOperation.cs @@ -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(); diff --git a/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs b/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs index 5bf52324..f3c6d34d 100644 --- a/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs +++ b/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs @@ -8,6 +8,7 @@ namespace YooAsset { public abstract class AsyncOperationBase : IEnumerator, IComparable { + private readonly List _childs = new List(10); private Action _callback; private string _packageName = null; private int _whileFrame = 1000; @@ -15,7 +16,7 @@ namespace YooAsset /// /// 等待异步执行完成 /// - internal bool IsWaitForAsyncComplete = false; + internal bool IsWaitForAsyncComplete { private set; get; } = false; /// /// 是否已经完成 @@ -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(); } + /// + /// 开启子任务 + /// + 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) { diff --git a/Assets/YooAsset/Runtime/OperationSystem/GameAsyncOperation.cs b/Assets/YooAsset/Runtime/OperationSystem/GameAsyncOperation.cs index 279ae463..7552ac25 100644 --- a/Assets/YooAsset/Runtime/OperationSystem/GameAsyncOperation.cs +++ b/Assets/YooAsset/Runtime/OperationSystem/GameAsyncOperation.cs @@ -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(); } diff --git a/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs b/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs index 67ce8280..8b217004 100644 --- a/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs +++ b/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs @@ -13,11 +13,6 @@ namespace YooAsset private static Stopwatch _watch; private static long _frameTime; - /// - /// 快速启动模式 - /// - public static bool QuickStartMode = true; - /// /// 异步操作的最小时间片段 /// @@ -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(); - } } } } \ No newline at end of file diff --git a/Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs index 75b85e68..7a2a3f13 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs index 6f0182cf..ceeb0718 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadAllAssetsOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadAllAssetsOperation.cs index 968bca50..c1f318af 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadAllAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadAllAssetsOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs index 981b795d..91d52a76 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs index 630d53e8..580d2589 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs index 837cdbe3..a6e4e3f3 100644 --- a/Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs +++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs @@ -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) { diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs index 85dd3cea..a36f9ad0 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/DestroyOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/DestroyOperation.cs index d69646c2..e1b969f2 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/DestroyOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/DestroyOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs index 1997d577..37407312 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs index 10bdaf10..f4671218 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs index 1c4a21cf..4e4b8d34 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs index 1d9c3fca..d97ccecb 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs @@ -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() { } diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/RequestPackageVersionOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/RequestPackageVersionOperation.cs index 86e9e60a..0b51e322 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/RequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/RequestPackageVersionOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs index d3d64f26..6809e338 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs @@ -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; diff --git a/Assets/YooAsset/Runtime/YooAssets.cs b/Assets/YooAsset/Runtime/YooAssets.cs index 276c8e12..cb0f5c7b 100644 --- a/Assets/YooAsset/Runtime/YooAssets.cs +++ b/Assets/YooAsset/Runtime/YooAssets.cs @@ -222,15 +222,6 @@ namespace YooAsset } OperationSystem.MaxTimeSlice = milliseconds; } - - /// - /// 设置异步系统参数，快速启动模式的开关 - /// 注意：该模式默认开启 - /// - public static void SetOperationSystemQuickStartMode(bool state) - { - OperationSystem.QuickStartMode = state; - } #endregion #region 调试信息