refactor : 重构代码

This commit is contained in:
何冠峰
2026-01-17 18:44:48 +08:00
parent e10888de93
commit 0a1c81faf1
75 changed files with 219 additions and 197 deletions
@@ -39,7 +39,7 @@ namespace YooAsset
if (_assetBundle == null)
{
_steps = ESteps.Done;
Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs !";
Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs.";
Status = EOperationStatus.Failed;
return;
}
@@ -39,7 +39,7 @@ namespace YooAsset
if (_assetBundle == null)
{
_steps = ESteps.Done;
Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs !";
Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs.";
Status = EOperationStatus.Failed;
return;
}
@@ -72,7 +72,7 @@ namespace YooAsset
if (IsWaitForAsyncComplete)
{
//注意:场景加载无法强制异步转同步
YooLogger.Error("The scene is loading asyn !");
YooLogger.Error("The scene is loading asyn.");
}
else
{
@@ -39,7 +39,7 @@ namespace YooAsset
if (_assetBundle == null)
{
_steps = ESteps.Done;
Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs !";
Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs.";
Status = EOperationStatus.Failed;
return;
}
@@ -5,7 +5,7 @@ namespace YooAsset
{
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadAllAssetsOperation)} not support load all assets !";
Error = $"{nameof(RawBundleLoadAllAssetsOperation)} not support load all assets.";
Status = EOperationStatus.Failed;
}
internal override void InternalUpdate()
@@ -5,7 +5,7 @@ namespace YooAsset
{
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadAssetOperation)} not support load asset !";
Error = $"{nameof(RawBundleLoadAssetOperation)} not support load asset.";
Status = EOperationStatus.Failed;
}
internal override void InternalUpdate()
@@ -5,7 +5,7 @@ namespace YooAsset
{
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadSceneOperation)} not support load scene !";
Error = $"{nameof(RawBundleLoadSceneOperation)} not support load scene.";
Status = EOperationStatus.Failed;
}
internal override void InternalUpdate()
@@ -5,7 +5,7 @@ namespace YooAsset
{
internal override void InternalStart()
{
Error = $"{nameof(RawBundleLoadSubAssetsOperation)} not support load sub assets !";
Error = $"{nameof(RawBundleLoadSubAssetsOperation)} not support load sub assets.";
Status = EOperationStatus.Failed;
}
internal override void InternalUpdate()
@@ -28,7 +28,7 @@ namespace YooAsset
_steps = ESteps.CheckBundle;
#else
_steps = ESteps.Done;
Error = $"{nameof(VirtualBundleLoadAllAssetsOperation)} only support unity editor platform !";
Error = $"{nameof(VirtualBundleLoadAllAssetsOperation)} only support unity editor platform.";
Status = EOperationStatus.Failed;
#endif
}
@@ -27,7 +27,7 @@ namespace YooAsset
_steps = ESteps.CheckBundle;
#else
_steps = ESteps.Done;
Error = $"{nameof(VirtualBundleLoadAssetOperation)} only support unity editor platform !";
Error = $"{nameof(VirtualBundleLoadAssetOperation)} only support unity editor platform.";
Status = EOperationStatus.Failed;
#endif
}
@@ -31,7 +31,7 @@ namespace YooAsset
_steps = ESteps.LoadScene;
#else
_steps = ESteps.Done;
Error = $"{nameof(VirtualBundleLoadSceneOperation)} only support unity editor platform !";
Error = $"{nameof(VirtualBundleLoadSceneOperation)} only support unity editor platform.";
Status = EOperationStatus.Failed;
#endif
}
@@ -77,7 +77,7 @@ namespace YooAsset
if (IsWaitForAsyncComplete)
{
// 注意:场景加载无法强制异步转同步
YooLogger.Error("The scene is loading asyn !");
YooLogger.Error("The scene is loading asyn.");
}
else
{
@@ -28,7 +28,7 @@ namespace YooAsset
_steps = ESteps.CheckBundle;
#else
_steps = ESteps.Done;
Error = $"{nameof(VirtualBundleLoadSubAssetsOperation)} only support unity editor platform !";
Error = $"{nameof(VirtualBundleLoadSubAssetsOperation)} only support unity editor platform.";
Status = EOperationStatus.Failed;
#endif
}
@@ -206,7 +206,7 @@ namespace YooAsset
public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData)
{
if (binaryData == null || binaryData.Length == 0)
throw new Exception("Catalog file data is null or empty !");
throw new Exception("Catalog file data is null or empty.");
// 创建缓存器
BufferReader buffer = new BufferReader(binaryData);
@@ -214,7 +214,7 @@ namespace YooAsset
// 读取文件标记
uint fileSign = buffer.ReadUInt32();
if (fileSign != CatalogFileDefine.FileSign)
throw new Exception("Invalid catalog file !");
throw new Exception("Invalid catalog file.");
// 读取文件版本
string fileVersion = buffer.ReadUTF8();
@@ -333,14 +333,14 @@ namespace YooAsset
#if UNITY_ANDROID
//TODO : 安卓平台内置文件属于APK压缩包内的文件。
YooLogger.Error($"Android platform not support read buildin bundle file data !");
YooLogger.Error($"Android platform not support read buildin bundle file data.");
return null;
#else
if (bundle.Encrypted)
{
if (DecryptionServices == null)
{
YooLogger.Error($"The {nameof(IDecryptionServices)} is null !");
YooLogger.Error($"The {nameof(IDecryptionServices)} is null.");
return null;
}
@@ -370,14 +370,14 @@ namespace YooAsset
#if UNITY_ANDROID
//TODO : 安卓平台内置文件属于APK压缩包内的文件。
YooLogger.Error($"Android platform not support read buildin bundle file text !");
YooLogger.Error($"Android platform not support read buildin bundle file text.");
return null;
#else
if (bundle.Encrypted)
{
if (DecryptionServices == null)
{
YooLogger.Error($"The {nameof(IDecryptionServices)} is null !");
YooLogger.Error($"The {nameof(IDecryptionServices)} is null.");
return null;
}
@@ -33,7 +33,7 @@ namespace YooAsset
#if UNITY_WEBGL
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{nameof(DefaultBuildinFileSystem)} is not support WEBGL platform !";
Error = $"{nameof(DefaultBuildinFileSystem)} is not support WEBGL platform.";
#else
if (_fileSystem.CopyBuildinPackageManifest)
_steps = ESteps.LoadBuildinPackageVersion;
@@ -181,7 +181,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Fatal error : catalog is null !";
Error = "Fatal error : catalog is null.";
return;
}
@@ -48,7 +48,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"The {nameof(IBundleDecryptionServices)} is null !";
Error = $"The {nameof(IBundleDecryptionServices)} is null.";
YooLogger.Error(Error);
return;
}
@@ -247,7 +247,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"The {nameof(IDecryptionServices)} is null !";
Error = $"The {nameof(IDecryptionServices)} is null.";
YooLogger.Error(Error);
return;
}
@@ -94,7 +94,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Failed to verify buildin package manifest file !";
Error = "Failed to verify buildin package manifest file.";
}
}
@@ -85,7 +85,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Buildin package hash file content is empty !";
Error = $"Buildin package hash file content is empty.";
}
else
{
@@ -83,7 +83,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Buildin package version file content is empty !";
Error = $"Buildin package version file content is empty.";
}
else
{
@@ -407,7 +407,7 @@ namespace YooAsset
{
if (BundleDecryptionServices == null)
{
YooLogger.Error($"The {nameof(IBundleDecryptionServices)} is null !");
YooLogger.Error($"The {nameof(IBundleDecryptionServices)} is null.");
return null;
}
@@ -435,7 +435,7 @@ namespace YooAsset
{
if (BundleDecryptionServices == null)
{
YooLogger.Error($"The {nameof(IBundleDecryptionServices)} is null !");
YooLogger.Error($"The {nameof(IBundleDecryptionServices)} is null.");
return null;
}
@@ -552,7 +552,7 @@ namespace YooAsset
}
catch (Exception ex)
{
YooLogger.Error($"Failed to write cache file ! {ex.Message}");
YooLogger.Error($"Failed to write cache file. Error: {ex.Message}");
return false;
}
@@ -39,7 +39,7 @@ namespace YooAsset
}
catch (Exception ex)
{
YooLogger.Error($"Failed to delete cache file ! {ex.Message}");
YooLogger.Error($"Failed to delete cache file. Error: {ex.Message}");
return false;
}
}
@@ -28,7 +28,7 @@ namespace YooAsset
#if UNITY_WEBGL
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{nameof(DefaultCacheFileSystem)} is not support WEBGL platform !";
Error = $"{nameof(DefaultCacheFileSystem)} is not support WEBGL platform.";
#else
_steps = ESteps.CheckAppFootPrint;
#endif
@@ -48,23 +48,23 @@ namespace YooAsset
{
if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.None)
{
YooLogger.Warning("Do nothing when overwrite install application !");
YooLogger.Warning("Do nothing when overwrite install application.");
}
else if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.ClearAllCacheFiles)
{
_fileSystem.DeleteAllBundleFiles();
_fileSystem.DeleteAllManifestFiles();
YooLogger.Warning("Delete all cache files when overwrite install application !");
YooLogger.Warning("Delete all cache files when overwrite install application.");
}
else if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.ClearAllBundleFiles)
{
_fileSystem.DeleteAllBundleFiles();
YooLogger.Warning("Delete all bundle files when overwrite install application !");
YooLogger.Warning("Delete all bundle files when overwrite install application.");
}
else if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.ClearAllManifestFiles)
{
_fileSystem.DeleteAllManifestFiles();
YooLogger.Warning("Delete all manifest files when overwrite install application !");
YooLogger.Warning("Delete all manifest files when overwrite install application.");
}
else
{
@@ -120,7 +120,7 @@ namespace YooAsset
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Abort download file !";
Error = "Abort download file.";
}
if (_steps == ESteps.LoadAssetBundle)
@@ -131,7 +131,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"The {nameof(IBundleDecryptionServices)} is null !";
Error = $"The {nameof(IBundleDecryptionServices)} is null.";
YooLogger.Error(Error);
return;
}
@@ -389,7 +389,7 @@ namespace YooAsset
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Abort download file !";
Error = "Abort download file.";
}
if (_steps == ESteps.LoadCacheRawBundle)
@@ -45,7 +45,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Can not found active package manifest !";
Error = "Can not found active package manifest.";
}
else
{
@@ -59,7 +59,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Clear param is null !";
Error = "Clear param is null.";
return;
}
@@ -43,7 +43,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Can not found active package manifest !";
Error = "Can not found active package manifest.";
}
else
{
@@ -57,7 +57,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Clear param is null !";
Error = "Clear param is null.";
return;
}
@@ -41,7 +41,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Can not found active package manifest !";
Error = "Can not found active package manifest.";
}
else
{
@@ -38,7 +38,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Can not found active package manifest !";
Error = "Can not found active package manifest.";
}
else
{
@@ -62,7 +62,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Download file options is invalid !";
Error = "Download file options is invalid.";
Debug.Log(Error);
return;
}
@@ -95,7 +95,7 @@ namespace YooAsset
if (IsWaitForAsyncComplete == false && _failedTryAgain > 0)
{
_steps = ESteps.TryAgain;
YooLogger.Warning($"Failed download : {_downloadFileOp.URL} Try again !");
YooLogger.Warning($"Failed download : {_downloadFileOp.URL} Try again.");
}
else
{
@@ -51,7 +51,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Cache package hash file content is empty !";
Error = $"Cache package hash file content is empty.";
}
else
{
@@ -67,7 +67,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Failed to verify cache package manifest file!";
Error = "Failed to verify cache package manifest file.";
}
}
@@ -62,7 +62,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Remote package version file content is empty !";
Error = $"Remote package version file content is empty.";
}
else
{
@@ -170,7 +170,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{_fileSystem.GetType().FullName} failed to write file !";
Error = $"{_fileSystem.GetType().FullName} failed to write file.";
}
// 注意:缓存完成后直接删除临时文件
@@ -133,7 +133,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{_fileSystem.GetType().FullName} failed to write file !";
Error = $"{_fileSystem.GetType().FullName} failed to write file.";
}
// 注意:缓存完成后直接删除临时文件
@@ -151,7 +151,7 @@ namespace YooAsset
if (_steps != ESteps.Done)
{
// 注意:不中断下载任务,保持后台继续下载
YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote : {URL} !");
YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote : {URL}");
}
}
@@ -63,7 +63,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Failed to verify file : {_element.TempFilePath} ! ErrorCode : {VerifyResult}";
Error = $"Failed to verify file : {_element.TempFilePath} ErrorCode : {VerifyResult}";
}
}
}
@@ -161,7 +161,7 @@ namespace YooAsset
PackageName = packageName;
if (string.IsNullOrEmpty(packageRoot))
throw new YooFileSystemException($"{nameof(DefaultEditorFileSystem)} package root is null or empty !");
throw new YooFileSystemException($"{nameof(DefaultEditorFileSystem)} package root is null or empty.");
_packageRoot = packageRoot;
@@ -105,7 +105,7 @@ namespace YooAsset
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Abort download file !";
Error = "Abort download file.";
}
if (_steps == ESteps.LoadAssetBundle)
@@ -116,7 +116,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Virtual WebGL Mode only support asyn load method !";
Error = "Virtual WebGL Mode only support asyn load method.";
YooLogger.Error(Error);
}
else
@@ -61,7 +61,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Download file options is invalid !";
Error = "Download file options is invalid.";
Debug.Log(Error);
return;
}
@@ -94,7 +94,7 @@ namespace YooAsset
if (IsWaitForAsyncComplete == false && _failedTryAgain > 0)
{
_steps = ESteps.TryAgain;
YooLogger.Warning($"Failed download : {_downloadFileOp.URL} Try again !");
YooLogger.Warning($"Failed download : {_downloadFileOp.URL} Try again.");
}
else
{
@@ -127,7 +127,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Try load bundle {Bundle.BundleName} from remote !";
Error = $"Try load bundle {Bundle.BundleName} from remote.";
YooLogger.Error(Error);
}
}
@@ -67,7 +67,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Failed to verify simulation package manifest file !";
Error = "Failed to verify simulation package manifest file.";
}
}
@@ -67,7 +67,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{nameof(DWRFSLoadAssetBundleOperation)} loaded asset bundle is null !";
Error = $"{nameof(DWRFSLoadAssetBundleOperation)} loaded asset bundle is null.";
}
else
{
@@ -90,7 +90,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "WebGL platform not support sync load method !";
Error = "WebGL platform not support sync load method.";
YooLogger.Error(Error);
}
}
@@ -67,7 +67,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"{nameof(DWSFSLoadAssetBundleOperation)} loaded asset bundle is null !";
Error = $"{nameof(DWSFSLoadAssetBundleOperation)} loaded asset bundle is null.";
}
else
{
@@ -90,7 +90,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "WebGL platform not support sync load method !";
Error = "WebGL platform not support sync load method.";
YooLogger.Error(Error);
}
}
@@ -78,7 +78,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Failed to verify web server package manifest file!";
Error = "Failed to verify web server package manifest file.";
}
}
@@ -59,7 +59,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Web server package hash file content is empty !";
Error = $"Web server package hash file content is empty.";
}
else
{
@@ -56,7 +56,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Web server package version file content is empty !";
Error = $"Web server package version file content is empty.";
}
else
{
@@ -46,7 +46,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"The {nameof(IWebBundleDecryptionServices)} is null !";
Error = $"The {nameof(IWebBundleDecryptionServices)} is null.";
YooLogger.Error(Error);
return;
}
@@ -75,7 +75,7 @@ namespace YooAsset
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Failed load encrypted AssetBundle !";
Error = "Failed load encrypted AssetBundle.";
}
else
{
@@ -89,7 +89,7 @@ namespace YooAsset
if (_failedTryAgain > 0)
{
_steps = ESteps.TryAgain;
YooLogger.Warning($"Failed download : {_unityWebDataRequestOp.URL} Try again !");
YooLogger.Warning($"Failed download : {_unityWebDataRequestOp.URL} Try again.");
}
else
{
@@ -70,7 +70,7 @@ namespace YooAsset
if (_failedTryAgain > 0)
{
_steps = ESteps.TryAgain;
YooLogger.Warning($"Failed download : {_unityAssetBundleRequestOp.URL} Try again !");
YooLogger.Warning($"Failed download : {_unityAssetBundleRequestOp.URL} Try again.");
}
else
{
@@ -88,7 +88,7 @@ internal class LoadWebPackageManifestOperation : AsyncOperationBase
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Failed to verify web package manifest file!";
Error = "Failed to verify web package manifest file.";
}
}
@@ -64,7 +64,7 @@ internal class RequestWebPackageHashOperation : AsyncOperationBase
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Web package hash file content is empty !";
Error = $"Web package hash file content is empty.";
}
else
{
@@ -64,7 +64,7 @@ internal class RequestWebPackageVersionOperation : AsyncOperationBase
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Web package version file content is empty !";
Error = $"Web package version file content is empty.";
}
else
{