update runtime code

重构了OperationSystem的机制。从列表模式修改为链模式
2025-02-25 12:18:16 +08:00
parent 400c2ccefe
commit c758aa81ff
72 changed files with 385 additions and 260 deletions
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    internal class DownloadCenterOperation : AsyncOperationBase
+    {
+        private readonly DefaultCacheFileSystem _fileSystem;
+        protected readonly Dictionary<string, DefaultDownloadFileOperation> _downloaders = new Dictionary<string, DefaultDownloadFileOperation>(1000);
+        protected readonly List<string> _removeDownloadList = new List<string>(1000);
+
+        public DownloadCenterOperation(DefaultCacheFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+        internal override void InternalStart()
+        {
+        }
+        internal override void InternalUpdate()
+        {
+            // 获取可移除的下载器集合
+            _removeDownloadList.Clear();
+            foreach (var valuePair in _downloaders)
+            {
+                var downloader = valuePair.Value;
+                downloader.UpdateOperation();
+
+                // 注意：主动终止引用计数为零的下载任务
+                if (downloader.RefCount <= 0)
+                {
+                    _removeDownloadList.Add(valuePair.Key);
+                    downloader.AbortOperation();
+                    continue;
+                }
+
+                if (downloader.IsDone)
+                {
+                    _removeDownloadList.Add(valuePair.Key);
+                    continue;
+                }
+            }
+
+            // 移除下载器
+            foreach (var key in _removeDownloadList)
+            {
+                _downloaders.Remove(key);
+            }
+
+            // 最大并发数检测
+            int processCount = GetProcessingOperationCount();
+            if (processCount != _downloaders.Count)
+            {
+                if (processCount < _fileSystem.DownloadMaxConcurrency)
+                {
+                    int startCount = _fileSystem.DownloadMaxConcurrency - processCount;
+                    if (startCount > _fileSystem.DownloadMaxRequestPerFrame)
+                        startCount = _fileSystem.DownloadMaxRequestPerFrame;
+
+                    foreach (var operationPair in _downloaders)
+                    {
+                        var operation = operationPair.Value;
+                        if (operation.Status == EOperationStatus.None)
+                        {
+                            operation.StartOperation();
+                            startCount--;
+                            if (startCount <= 0)
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 创建下载任务
+        /// </summary>
+        public FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
+        {
+            // 查询旧的下载器
+            if (_downloaders.TryGetValue(bundle.BundleGUID, out var oldDownloader))
+            {
+                return oldDownloader;
+            }
+
+            // 设置请求URL
+            if (string.IsNullOrEmpty(param.ImportFilePath))
+            {
+                param.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
+                param.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+            }
+            else
+            {
+                // 注意：把本地文件路径指定为远端下载地址
+                param.MainURL = DownloadSystemHelper.ConvertToWWWPath(param.ImportFilePath);
+                param.FallbackURL = param.MainURL;
+            }
+
+            // 创建新的下载器
+            DefaultDownloadFileOperation newDownloader;
+            if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
+            {
+                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, param);
+                AddChildOperation(newDownloader);
+                _downloaders.Add(bundle.BundleGUID, newDownloader);
+            }
+            else
+            {
+                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, param);
+                AddChildOperation(newDownloader);
+                _downloaders.Add(bundle.BundleGUID, newDownloader);
+            }
+            return newDownloader;
+        }
+
+        /// <summary>
+        /// 获取正在进行中的下载器总数
+        /// </summary>
+        private int GetProcessingOperationCount()
+        {
+            int count = 0;
+            foreach (var operationPair in _downloaders)
+            {
+                var operation = operationPair.Value;
+                if (operation.Status != EOperationStatus.None)
+                    count++;
+            }
+            return count;
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 768ef2df3433df245a26fec28d022e45
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -89,7 +89,8 @@ namespace YooAsset
            {
                var element = new TempFileElement(_tempFilePath, Bundle.FileCRC, Bundle.FileSize);
                _verifyOperation = new VerifyTempFileOperation(element);
-                OperationSystem.StartOperation(_fileSystem.PackageName, _verifyOperation);
+                _verifyOperation.StartOperation();
+                AddChildOperation(_verifyOperation);
                _steps = ESteps.CheckVerifyTempFile;
            }

@@ -99,6 +100,7 @@ namespace YooAsset
                if (IsWaitForAsyncComplete)
                    _verifyOperation.WaitForAsyncComplete();

+                _verifyOperation.UpdateOperation();
                if (_verifyOperation.IsDone == false)
                    return;

@@ -58,9 +58,11 @@ namespace YooAsset
                    string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
                    string webURL = GetWebRequestURL(fileName);
                    _webFileRequestOp = new UnityWebFileRequestOperation(webURL, savePath, _timeout);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _webFileRequestOp);
+                    _webFileRequestOp.StartOperation();
+                    AddChildOperation(_webFileRequestOp);
                }

+                _webFileRequestOp.UpdateOperation();
                if (_webFileRequestOp.IsDone == false)
                    return;

@@ -58,9 +58,11 @@ namespace YooAsset
                    string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
                    string webURL = GetDownloadRequestURL(fileName);
                    _webFileRequestOp = new UnityWebFileRequestOperation(webURL, savePath, _timeout);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _webFileRequestOp);
+                    _webFileRequestOp.StartOperation();
+                    AddChildOperation(_webFileRequestOp);
                }

+                _webFileRequestOp.UpdateOperation();
                if (_webFileRequestOp.IsDone == false)
                    return;

@@ -110,7 +110,8 @@ namespace YooAsset
            {
                var element = new TempFileElement(_tempFilePath, Bundle.FileCRC, Bundle.FileSize);
                _verifyOperation = new VerifyTempFileOperation(element);
-                OperationSystem.StartOperation(_fileSystem.PackageName, _verifyOperation);
+                _verifyOperation.StartOperation();
+                AddChildOperation(_verifyOperation);
                _steps = ESteps.CheckVerifyTempFile;
            }

@@ -120,6 +121,7 @@ namespace YooAsset
                if (IsWaitForAsyncComplete)
                    _verifyOperation.WaitForAsyncComplete();

+                _verifyOperation.UpdateOperation();
                if (_verifyOperation.IsDone == false)
                    return;

@@ -77,9 +77,11 @@ namespace YooAsset
                if (_deserializer == null)
                {
                    _deserializer = new DeserializeManifestOperation(_fileData);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _deserializer);
+                    _deserializer.StartOperation();
+                    AddChildOperation(_deserializer);
                }

+                _deserializer.UpdateOperation();
                Progress = _deserializer.Progress;
                if (_deserializer.IsDone == false)
                    return;
@@ -46,9 +46,11 @@ namespace YooAsset
                    string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
                    string url = GetWebRequestURL(fileName);
                    _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _webTextRequestOp);
+                    _webTextRequestOp.StartOperation();
+                    AddChildOperation(_webTextRequestOp);
                }

+                _webTextRequestOp.UpdateOperation();
                Progress = _webTextRequestOp.Progress;
                if (_webTextRequestOp.IsDone == false)
                    return;