refactor : 重构内置文件的加载和拷贝逻辑。

优先使用File类拷贝文件
2025-08-04 17:26:57 +08:00
parent 131614687c
commit 227f2332a9
9 changed files with 345 additions and 235 deletions
@@ -8,14 +8,18 @@ namespace YooAsset
        private enum ESteps
        {
            None,
-            CopyBuildinManifest,
+            LoadBuildinPackageVersion,
+            CopyBuildinPackageHash,
+            CopyBuildinPackageManifest,
            InitUnpackFileSystem,
            LoadCatalogFile,
            Done,
        }

        private readonly DefaultBuildinFileSystem _fileSystem;
-        private CopyBuildinPackageManifestOperation _copyBuildinPackageManifestOp;
+        private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
+        private CopyBuildinFileOperation _copyBuildinHashFileOp;
+        private CopyBuildinFileOperation _copyBuildinManifestFileOp;
        private FSInitializeFileSystemOperation _initUnpackFIleSystemOp;
        private LoadBuildinCatalogFileOperation _loadBuildinCatalogFileOp;
        private ESteps _steps = ESteps.None;
@@ -32,7 +36,7 @@ namespace YooAsset
            Error = $"{nameof(DefaultBuildinFileSystem)} is not support WEBGL platform !";
 #else
            if (_fileSystem.CopyBuildinPackageManifest)
-                _steps = ESteps.CopyBuildinManifest;
+                _steps = ESteps.LoadBuildinPackageVersion;
            else
                _steps = ESteps.InitUnpackFileSystem;
 #endif
@@ -42,20 +46,76 @@ namespace YooAsset
            if (_steps == ESteps.None || _steps == ESteps.Done)
                return;

-            if (_steps == ESteps.CopyBuildinManifest)
+            if (_steps == ESteps.LoadBuildinPackageVersion)
            {
-                if (_copyBuildinPackageManifestOp == null)
+                if (_requestBuildinPackageVersionOp == null)
                {
-                    _copyBuildinPackageManifestOp = new CopyBuildinPackageManifestOperation(_fileSystem);
-                    _copyBuildinPackageManifestOp.StartOperation();
-                    AddChildOperation(_copyBuildinPackageManifestOp);
+                    _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem);
+                    _requestBuildinPackageVersionOp.StartOperation();
+                    AddChildOperation(_requestBuildinPackageVersionOp);
                }

-                _copyBuildinPackageManifestOp.UpdateOperation();
-                if (_copyBuildinPackageManifestOp.IsDone == false)
+                _requestBuildinPackageVersionOp.UpdateOperation();
+                if (_requestBuildinPackageVersionOp.IsDone == false)
                    return;

-                if (_copyBuildinPackageManifestOp.Status == EOperationStatus.Succeed)
+                if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.CopyBuildinPackageHash;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _requestBuildinPackageVersionOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CopyBuildinPackageHash)
+            {
+                if (_copyBuildinHashFileOp == null)
+                {
+                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
+                    string destFilePath = GetCopyPackageHashDestPath(packageVersion);
+                    string sourceFilePath = _fileSystem.GetBuildinPackageHashFilePath(packageVersion);
+                    _copyBuildinHashFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath);
+                    _copyBuildinHashFileOp.StartOperation();
+                    AddChildOperation(_copyBuildinHashFileOp);
+                }
+
+                _copyBuildinHashFileOp.UpdateOperation();
+                if (_copyBuildinHashFileOp.IsDone == false)
+                    return;
+
+                if (_copyBuildinHashFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.CopyBuildinPackageManifest;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _copyBuildinHashFileOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CopyBuildinPackageManifest)
+            {
+                if (_copyBuildinManifestFileOp == null)
+                {
+                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
+                    string destFilePath = GetCopyPackageManifestDestPath(packageVersion);
+                    string sourceFilePath = _fileSystem.GetBuildinPackageManifestFilePath(packageVersion);
+                    _copyBuildinManifestFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath);
+                    _copyBuildinManifestFileOp.StartOperation();
+                    AddChildOperation(_copyBuildinManifestFileOp);
+                }
+
+                _copyBuildinManifestFileOp.UpdateOperation();
+                if (_copyBuildinManifestFileOp.IsDone == false)
+                    return;
+
+                if (_copyBuildinManifestFileOp.Status == EOperationStatus.Succeed)
                {
                    _steps = ESteps.InitUnpackFileSystem;
                }
@@ -63,7 +123,7 @@ namespace YooAsset
                {
                    _steps = ESteps.Done;
                    Status = EOperationStatus.Failed;
-                    Error = _copyBuildinPackageManifestOp.Error;
+                    Error = _copyBuildinManifestFileOp.Error;
                }
            }

@@ -116,6 +176,30 @@ namespace YooAsset

                if (_loadBuildinCatalogFileOp.Status == EOperationStatus.Succeed)
                {
+                    var catalog = _loadBuildinCatalogFileOp.Catalog;
+                    if (catalog == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = "Fatal error : catalog is null !";
+                        return;
+                    }
+
+                    if (catalog.PackageName != _fileSystem.PackageName)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                        return;
+                    }
+
+                    foreach (var wrapper in catalog.Wrappers)
+                    {
+                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                    }
+
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
                    _steps = ESteps.Done;
                    Status = EOperationStatus.Succeed;
                }
@@ -127,5 +211,28 @@ namespace YooAsset
                }
            }
        }
+
+        private string GetCopyManifestFileRoot()
+        {
+            string destRoot = _fileSystem.CopyBuildinPackageManifestDestRoot;
+            if (string.IsNullOrEmpty(destRoot))
+            {
+                string defaultCacheRoot = YooAssetSettingsData.GetYooDefaultCacheRoot();
+                destRoot = PathUtility.Combine(defaultCacheRoot, _fileSystem.PackageName, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
+            }
+            return destRoot;
+        }
+        private string GetCopyPackageHashDestPath(string packageVersion)
+        {
+            string fileRoot = GetCopyManifestFileRoot();
+            string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, packageVersion);
+            return PathUtility.Combine(fileRoot, fileName);
+        }
+        private string GetCopyPackageManifestDestPath(string packageVersion)
+        {
+            string fileRoot = GetCopyManifestFileRoot();
+            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, packageVersion);
+            return PathUtility.Combine(fileRoot, fileName);
+        }
    }
 }