【m】yooasset更新

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSInitializeOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bf5e4bb7e7dfb3b43b0bdb3d06011b9f
+guid: 443aa31f081edfd458a90e3385a75203
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs

@@ -11,6 +11,7 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
+            AbortDownload,
             LoadAssetBundle,
             CheckResult,
             Done,
@@ -63,6 +64,17 @@ namespace YooAsset
                 }
             }
 
+            if (_steps == ESteps.DownloadFile)
+            {
+                // 中断下载
+                if (AbortDownloadFile)
+                {
+                    if (_downloadFileOp != null)
+                        _downloadFileOp.AbortOperation();
+                    _steps = ESteps.AbortDownload;
+                }
+            }
+
             if (_steps == ESteps.DownloadFile)
             {
                 if (_downloadFileOp == null)
@@ -94,6 +106,23 @@ namespace YooAsset
                 }
             }
 
+            if (_steps == ESteps.AbortDownload)
+            {
+                if (_downloadFileOp != null)
+                {
+                    if (IsWaitForAsyncComplete)
+                        _downloadFileOp.WaitForAsyncComplete();
+
+                    _downloadFileOp.UpdateOperation();
+                    if (_downloadFileOp.IsDone == false)
+                        return;
+                }
+
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = "Abort download file !";
+            }
+
             if (_steps == ESteps.LoadAssetBundle)
             {
                 if (_bundle.Encrypted)
@@ -251,6 +280,7 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
+            AbortDownload,
             LoadCacheRawBundle,
             Done,
         }
@@ -310,6 +340,17 @@ namespace YooAsset
                 }
             }
 
+            if (_steps == ESteps.DownloadFile)
+            {
+                // 中断下载
+                if (AbortDownloadFile)
+                {
+                    if (_downloadFileOp != null)
+                        _downloadFileOp.AbortOperation();
+                    _steps = ESteps.AbortDownload;
+                }
+            }
+
             if (_steps == ESteps.DownloadFile)
             {
                 if (_downloadFileOp == null)
@@ -341,6 +382,23 @@ namespace YooAsset
                 }
             }
 
+            if (_steps == ESteps.AbortDownload)
+            {
+                if (_downloadFileOp != null)
+                {
+                    if (IsWaitForAsyncComplete)
+                        _downloadFileOp.WaitForAsyncComplete();
+
+                    _downloadFileOp.UpdateOperation();
+                    if (_downloadFileOp.IsDone == false)
+                        return;
+                }
+
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = "Abort download file !";
+            }
+
             if (_steps == ESteps.LoadCacheRawBundle)
             {
                 string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b2060908dd643c4e9889e51b52190b9
+guid: a653cabf995909d48935a0486db6116f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadPackageManifestOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d898ef61a582b3b4abfc4e93382d636d
+guid: 2447826454481704ab785153ae89be3a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSRequestPackageVersionOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec472760a0005f54f819b5d4ff672771
+guid: 856b1334d67ed4d41b31a583f713c449
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3937809f4de6c3d4496ce1b70408dd11
+guid: 3414bfb159816a74f917270b7d48c25f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheBundleFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 73c60cdd885dd3e4f8e4d106e699856e
+guid: daed187502431d347bf11bddcf8d77de
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheManifestFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 532cffec88b27e24eb3ad471607738f9
+guid: 5643382e7031ba14cbb4ab0f4a9acd94
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByLocationsOperaiton.cs

@@ -0,0 +1,142 @@
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    internal class ClearCacheBundleFilesByLocationsOperaiton : FSClearCacheFilesOperation
+    {
+        private enum ESteps
+        {
+            None,
+            CheckManifest,
+            CheckArgs,
+            GetClearCacheFiles,
+            ClearFilterCacheFiles,
+            Done,
+        }
+
+        private readonly DefaultCacheFileSystem _fileSystem;
+        private readonly PackageManifest _manifest;
+        private readonly object _clearParam;
+        private string[] _locations;
+        private List<string> _clearBundleGUIDs;
+        private int _clearFileTotalCount = 0;
+        private ESteps _steps = ESteps.None;
+
+        internal ClearCacheBundleFilesByLocationsOperaiton(DefaultCacheFileSystem fileSystem, PackageManifest manifest, object clearParam)
+        {
+            _fileSystem = fileSystem;
+            _manifest = manifest;
+            _clearParam = clearParam;
+        }
+
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CheckManifest;
+        }
+
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.CheckManifest)
+            {
+                if (_manifest == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Can not found active package manifest !";
+                }
+                else
+                {
+                    _steps = ESteps.CheckArgs;
+                }
+            }
+
+            if (_steps == ESteps.CheckArgs)
+            {
+                if (_clearParam == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Clear param is null !";
+                    return;
+                }
+
+                if (_clearParam is string)
+                {
+                    _locations = new string[] { _clearParam as string };
+                }
+                else if (_clearParam is List<string>)
+                {
+                    var tempList = _clearParam as List<string>;
+                    _locations = tempList.ToArray();
+                }
+                else if (_clearParam is string[])
+                {
+                    _locations = _clearParam as string[];
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Invalid clear param : {_clearParam.GetType().FullName}";
+                    return;
+                }
+
+                _steps = ESteps.GetClearCacheFiles;
+            }
+
+            if (_steps == ESteps.GetClearCacheFiles)
+            {
+                _clearBundleGUIDs = GetBundleGUIDsByLocation();
+                _clearFileTotalCount = _clearBundleGUIDs.Count;
+                _steps = ESteps.ClearFilterCacheFiles;
+            }
+
+            if (_steps == ESteps.ClearFilterCacheFiles)
+            {
+                for (int i = _clearBundleGUIDs.Count - 1; i >= 0; i--)
+                {
+                    string bundleGUID = _clearBundleGUIDs[i];
+                    _fileSystem.DeleteCacheBundleFile(bundleGUID);
+                    _clearBundleGUIDs.RemoveAt(i);
+                    if (OperationSystem.IsBusy)
+                        break;
+                }
+
+                if (_clearFileTotalCount == 0)
+                    Progress = 1.0f;
+                else
+                    Progress = 1.0f - (_clearBundleGUIDs.Count / _clearFileTotalCount);
+
+                if (_clearBundleGUIDs.Count == 0)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+            }
+        }
+
+        private List<string> GetBundleGUIDsByLocation()
+        {
+            List<string> result = new List<string>(_locations.Length);
+
+            foreach (var location in _locations)
+            {
+                string assetPath = _manifest.TryMappingToAssetPath(location);
+                if (_manifest.TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
+                {
+                    PackageBundle bundle = _manifest.GetMainPackageBundle(packageAsset.BundleID);
+
+                    if (bundle != null)
+                    {
+                        result.Add(bundle.BundleGUID);
+                    }
+                }
+            }
+
+            return result;
+        }
+    }
+}

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByLocationsOperaiton.cs.meta

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

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByTagsOperaiton.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 170eae809f785ed45bc2b043a081795a
+guid: c42345c14a903274fb160a813ee174dc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheBundleFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 69b90bce1789fe74a80c3b17df819d15
+guid: be7b242f10abf524fa59e9ca0d12b052
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheManifestFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ea1b7f898bea1234eb035a8058becb33
+guid: d911513cf97d862448df570f0c8e9b38
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadCenterOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8d62d6b21d679dc419a6ca7edf113fc3
+guid: 768ef2df3433df245a26fec28d022e45
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageBundleOperation.cs

@@ -20,7 +20,7 @@ namespace YooAsset
         private UnityDownloadFileOperation _unityDownloadFileOp;
 
         protected int _requestCount = 0;
-        protected float _tryAgainTimer;
+        protected float _tryAgainTimer = 0;
         protected int _failedTryAgain;
         private ESteps _steps = ESteps.None;
 

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageBundleOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ee6d81ad39d45c14db3e2480a5031f0d
+guid: af07b7cdf729e944dbb6d60204c71235
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageHashOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 474112f0231e0304f80d9d861419d5d2
+guid: 8604af2bf2c8a1d4684cb59d81ab9445
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadPackageManifestOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c77d8a3ebdb423c43bf5e4de899d3d23
+guid: 9d5983f1b32b2e14c8b4c5b539bee8fa
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageHashOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bda62e924b79c164999d6b16ff8f7414
+guid: db66f75d31bfeca4e897e9ee0946b1de
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageManifestOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6847d36912014d242a3b81109136aaf3
+guid: acd84795f7cc3e348ab2b6cde03c8a22
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/RequestRemotePackageVersionOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 89cf0b35ecc01ba409d4e9e7b739617e
+guid: 1b078a220cc4f7d4392d77ccc77c001e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/SearchCacheFilesOperation.cs

@@ -16,7 +16,7 @@ namespace YooAsset
         }
 
         private readonly DefaultCacheFileSystem _fileSystem;
-        private IEnumerator<DirectoryInfo> _filesEnumerator = null;
+        private IEnumerator<string> _filesEnumerator = null;
         private float _verifyStartTime;
         private ESteps _steps = ESteps.None;
 
@@ -42,11 +42,11 @@ namespace YooAsset
 
             if (_steps == ESteps.Prepare)
             {
-                DirectoryInfo rootDirectory = new DirectoryInfo(_fileSystem.GetCacheBundleFilesRoot());
-                if (rootDirectory.Exists)
+                string rootDirectory = _fileSystem.GetCacheBundleFilesRoot();
+                if (Directory.Exists(rootDirectory))
                 {
-                    var directorieInfos = rootDirectory.EnumerateDirectories();
-                    _filesEnumerator = directorieInfos.GetEnumerator();
+                    var directories = Directory.EnumerateDirectories(rootDirectory);
+                    _filesEnumerator = directories.GetEnumerator();
                 }
                 _steps = ESteps.SearchFiles;
             }
@@ -76,15 +76,15 @@ namespace YooAsset
                     break;
 
                 var rootFoder = _filesEnumerator.Current;
-                var childDirectories = rootFoder.GetDirectories();
+                var childDirectories = Directory.EnumerateDirectories(rootFoder);
                 foreach (var chidDirectory in childDirectories)
                 {
-                    string bundleGUID = chidDirectory.Name;
+                    string bundleGUID = Path.GetFileName(chidDirectory);
                     if (_fileSystem.IsRecordBundleFile(bundleGUID))
                         continue;
 
                     // 创建验证元素类
-                    string fileRootPath = chidDirectory.FullName;
+                    string fileRootPath = chidDirectory;
                     string dataFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleDataFileName}";
                     string infoFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleInfoFileName}";
 
@@ -108,17 +108,15 @@ namespace YooAsset
 
             return isFindItem;
         }
-        private string FindDataFileExtension(DirectoryInfo directoryInfo)
+        private string FindDataFileExtension(string directory)
         {
             string dataFileExtension = string.Empty;
-            var fileInfos = directoryInfo.GetFiles();
-            foreach (var fileInfo in fileInfos)
+            string searchPattern = DefaultCacheFileSystemDefine.BundleDataFileName + "*";
+            var dataFiles = Directory.EnumerateFiles(directory, searchPattern);
+            foreach (var filePath in dataFiles)
             {
-                if (fileInfo.Name.StartsWith(DefaultCacheFileSystemDefine.BundleDataFileName))
-                {
-                    dataFileExtension = fileInfo.Extension;
-                    break;
-                }
+                dataFileExtension = Path.GetExtension(filePath);
+                break;
             }
             return dataFileExtension;
         }

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/SearchCacheFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 707dfa6a50e50b94a8abcea09aee6293
+guid: 8adb017a806563548b1d4c47f7b343e2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadFileOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4bfe14e99f4c2ad40b831f085ec1f996
+guid: 40bb5e9391f413c42ae70e48ca90c4b7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadLocalFileOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5a5072270157e049a03a09cebbd3415
+guid: c68640bb1d36552469024324e3357bc2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadNormalFileOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bbe8772581560a6458f68452069f701d
+guid: 759967d543776a0469b625eff171d235
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadResumeFileOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7f5cd6992b887b842b19d35d1ae2712b
+guid: 9bfb785912326f942a31dc77762eb16a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyCacheFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cc4a1a0e478a24344bd01ce96b360fd5
+guid: 5e9325baa24ae234ea0208d70dd3347e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/03.YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/VerifyTempFileOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 88181d45a90c63d4d805dbfb80177783
+guid: 764ac4f47afd3be4a8d583578f51126d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2