update sapce shooter

优化了Debugger窗口的显示页面

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,82 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.0-preview] - 2025-02-19
+
+### Improvements
+
+资源收集窗口列表元素支持手动上下拖拽排序！
+
+资源扫描窗口列表元素支持手动上下拖拽排序！
+
+### Added
+
+- 新增了UIElements扩展类ReorderableListView
+
+- 新增初始化方法
+
+  ```csharp
+  public class YooAssets
+  {
+      /// <summary>
+      /// 设置异步系统参数，快速启动模式的开关
+      /// 注意：该模式默认开启
+      /// </summary>
+      public static void SetOperationSystemQuickStartMode(bool state)
+  }
+  ```
+
+- 新增打包构建参数
+
+  ```csharp
+  public class BuildParameters
+  {
+      /// <summary>
+      /// 旧版依赖模式
+      /// 说明：兼容YooAssets1.5.x版本
+      /// </summary>
+      public bool LegacyDependency = false;    
+  }
+  ```
+
+### Fixed
+
+- (#472) 修复了Unity6平台，TableView视图无法显示问题。
+- 修复了微信小游戏和抖音小游戏未正确使用插件的卸载方法。
+
+## [2.2.12] - 2025-02-14
+
+### Improvements
+
+- WebGL网页平台支持文件加密。
+- 微信小游戏平台支持文件加密。
+- 抖音小游戏平台支持文件加密。
+
+### Fixed
+
+- (#466) 修复了微信小游戏文件系统查询机制不生效！
+- (#341) 修复了微信小游戏的下载进度异常问题。
+- (#471) 修复了Unity2019,Unity2020平台上，TableView视图无法显示的问题。
+
+### Added
+
+- 新增了ResourcePackage.UnloadAllAssetsAsync(UnloadAllAssetsOptions options)方法
+
+  ```csharp
+  public sealed class UnloadAllAssetsOptions
+  {
+      /// <summary>
+      /// 释放所有资源句柄，防止卸载过程中触发完成回调！
+      /// </summary>
+      public bool ReleaseAllHandles = true;
+       
+      /// <summary>
+      /// 卸载过程中锁定加载操作，防止新的任务请求！
+      /// </summary>
+      public bool LockLoadOperation = true;
+  }
+  ```
+
 ## [2.2.11] - 2025-02-10
 
 ### Improvements

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs

@@ -69,7 +69,6 @@ namespace YooAsset.Editor
                 _scannerListView = root.Q<ListView>("ScannerListView");
                 _scannerListView.makeItem = MakeScannerListViewItem;
                 _scannerListView.bindItem = BindScannerListViewItem;
-
 #if UNITY_2022_3_OR_NEWER
                 _scannerListView.selectionChanged += ScannerListView_onSelectionChange;
 #elif  UNITY_2020_1_OR_NEWER
@@ -277,12 +276,23 @@ namespace YooAsset.Editor
         {
             _scannerListView.Clear();
             _scannerListView.ClearSelection();
-            _scannerListView.itemsSource = FilterScanners();
-            _scannerListView.Rebuild();
 
-            if (_lastModifyScannerIndex >= 0 && _lastModifyScannerIndex < _scannerListView.itemsSource.Count)
+            var filterItems = FilterScanners();
+            if (AssetArtScannerSettingData.Setting.Scanners.Count == filterItems.Count)
             {
-                _scannerListView.selectedIndex = _lastModifyScannerIndex;
+#if UNITY_2020_3_OR_NEWER
+                _scannerListView.reorderable = true;
+#endif
+                _scannerListView.itemsSource = AssetArtScannerSettingData.Setting.Scanners;
+                _scannerListView.Rebuild();
+            }
+            else
+            {
+#if UNITY_2020_3_OR_NEWER
+                _scannerListView.reorderable = false;
+#endif
+                _scannerListView.itemsSource = filterItems;
+                _scannerListView.Rebuild();
             }
         }
         private List<AssetArtScanner> FilterScanners()
@@ -344,31 +354,7 @@ namespace YooAsset.Editor
 
             // 显示检视面板
             var scanSchema = selectScanner.LoadSchema();
-            if (scanSchema != null)
-            {
-                var inspector = scanSchema.CreateInspector();
-                if (inspector == null)
-                {
-                    UIElementsTools.SetElementVisible(_inspectorContainer, false);
-                }
-                else
-                {
-                    if (inspector.Containner is VisualElement container)
-                    {
-                        UIElementsTools.SetElementVisible(_inspectorContainer, true);
-                        _inspectorContainer.Clear();
-                        _inspectorContainer.Add(container);
-                        _inspectorContainer.style.width = inspector.Width;
-                        _inspectorContainer.style.minWidth = inspector.MinWidth;
-                        _inspectorContainer.style.maxWidth = inspector.MaxWidth;
-                    }
-                    else
-                    {
-                        Debug.LogWarning($"{nameof(ScannerSchema)} inspector container is invalid !");
-                        UIElementsTools.SetElementVisible(_inspectorContainer, false);
-                    }
-                }
-            }
+            RefreshInspector(scanSchema);
 
             // 设置Schema对象
             if (scanSchema == null)
@@ -521,6 +507,38 @@ namespace YooAsset.Editor
             AssetArtScannerSettingData.RemoveCollector(selectSacnner, selectCollector);
             FillCollectorViewData();
         }
+
+        // 属性面板相关
+        private void RefreshInspector(ScannerSchema scanSchema)
+        {
+            if (scanSchema == null)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+                return;
+            }
+
+            var inspector = scanSchema.CreateInspector();
+            if (inspector == null)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+                return;
+            }
+
+            if (inspector.Containner is VisualElement container)
+            {
+                UIElementsTools.SetElementVisible(_inspectorContainer, true);
+                _inspectorContainer.Clear();
+                _inspectorContainer.Add(container);
+                _inspectorContainer.style.width = inspector.Width;
+                _inspectorContainer.style.minWidth = inspector.MinWidth;
+                _inspectorContainer.style.maxWidth = inspector.MaxWidth;
+            }
+            else
+            {
+                Debug.LogWarning($"{nameof(ScannerSchema)} inspector container is invalid !");
+                UIElementsTools.SetElementVisible(_inspectorContainer, false);
+            }
+        }
     }
 }
 #endif

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.uxml

@@ -9,7 +9,7 @@
         <ui:VisualElement name="ScannerListContainer" style="width: 250px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
             <ui:Label text="Scanner List" display-tooltip-when-elided="true" name="ScannerListTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 3px; border-right-width: 3px; border-top-width: 3px; border-bottom-width: 3px; font-size: 12px;" />
             <uie:ToolbarSearchField focusable="true" name="ScannerSearchField" style="width: 230px;" />
-            <ui:ListView focusable="true" name="ScannerListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="ScannerListView" item-height="20" virtualization-method="DynamicHeight" reorder-mode="Animated" reorderable="true" style="flex-grow: 1;" />
             <ui:VisualElement name="ScannerAddContainer" style="justify-content: center; flex-direction: row; flex-shrink: 0;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />

Assets/YooAsset/Editor/AssetArtScanner/SchemaInspector.cs

@@ -6,7 +6,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 检视界面的UI元素容器（UIElements元素）
         /// </summary>
-        public object Containner;
+        public object Containner { private set; get; }
 
         /// <summary>
         /// 检视界面宽度
@@ -22,5 +22,24 @@ namespace YooAsset.Editor
         /// 检视界面最大宽度
         /// </summary>
         public int MaxWidth = 250;
+
+        public SchemaInspector(object containner)
+        {
+            Containner = containner;
+        }
+        public SchemaInspector(object containner, int width)
+        {
+            Containner = containner;
+            Width = width;
+            MinWidth = width;
+            MaxWidth = width;
+        }
+        public SchemaInspector(object containner, int width, int minWidth, int maxWidth)
+        {
+            Containner = containner;
+            Width = width;
+            MinWidth = minWidth;
+            MaxWidth = maxWidth;
+        }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -56,13 +56,13 @@ namespace YooAsset.Editor
         public string EncryptedFilePath { set; get; }
         #endregion
 
-        private readonly HashSet<string> _assetPaths = new HashSet<string>();
+        private readonly Dictionary<string, BuildAssetInfo> _packAssetDic = new Dictionary<string, BuildAssetInfo>(100);
 
         /// <summary>
         /// 参与构建的资源列表
         /// 注意：不包含零依赖资源和冗余资源
         /// </summary>
-        public readonly List<BuildAssetInfo> MainAssets = new List<BuildAssetInfo>();
+        public readonly List<BuildAssetInfo> AllPackAssets = new List<BuildAssetInfo>(100);
 
         /// <summary>
         /// 资源包名称
@@ -86,51 +86,68 @@ namespace YooAsset.Editor
         public void PackAsset(BuildAssetInfo buildAsset)
         {
             string assetPath = buildAsset.AssetInfo.AssetPath;
-            if (_assetPaths.Contains(assetPath))
+            if (_packAssetDic.ContainsKey(assetPath))
                 throw new System.Exception($"Should never get here ! Asset is existed : {assetPath}");
 
-            _assetPaths.Add(assetPath);
-            MainAssets.Add(buildAsset);
+            _packAssetDic.Add(assetPath, buildAsset);
+            AllPackAssets.Add(buildAsset);
         }
 
         /// <summary>
         /// 是否包含指定资源
         /// </summary>
-        public bool IsContainsAsset(string assetPath)
+        public bool IsContainsPackAsset(string assetPath)
         {
-            return _assetPaths.Contains(assetPath);
+            return _packAssetDic.ContainsKey(assetPath);
         }
 
         /// <summary>
         /// 获取构建的资源路径列表
         /// </summary>
-        public string[] GetAllMainAssetPaths()
+        public string[] GetAllPackAssetPaths()
         {
-            return MainAssets.Select(t => t.AssetInfo.AssetPath).ToArray();
+            return AllPackAssets.Select(t => t.AssetInfo.AssetPath).ToArray();
         }
 
         /// <summary>
-        /// 获取该资源包内的所有资源（包括零依赖资源和冗余资源）
+        /// 获取构建的主资源信息
         /// </summary>
-        public List<string> GetAllBuiltinAssetPaths()
+        public BuildAssetInfo GetPackAssetInfo(string assetPath)
         {
-            var packAssets = GetAllMainAssetPaths();
-            List<string> result = new List<string>(packAssets);
-            foreach (var buildAsset in MainAssets)
+            if (_packAssetDic.TryGetValue(assetPath, out BuildAssetInfo value))
             {
-                if (buildAsset.AllDependAssetInfos == null)
-                    continue;
-                foreach (var dependAssetInfo in buildAsset.AllDependAssetInfos)
+                return value;
+            }
+            else
+            {
+                throw new Exception($"Can not found pack asset info {assetPath} in bundle : {BundleName}");
+            }
+        }
+
+        /// <summary>
+        /// 获取资源包内部所有资产
+        /// </summary>
+        public List<AssetInfo> GetBundleContents()
+        {
+            Dictionary<string, AssetInfo> result = new Dictionary<string, AssetInfo>(AllPackAssets.Count);
+            foreach (var packAsset in AllPackAssets)
+            {
+                result.Add(packAsset.AssetInfo.AssetPath, packAsset.AssetInfo);
+                if (packAsset.AllDependAssetInfos != null)
                 {
-                    // 注意：依赖资源里只添加零依赖资源和冗余资源
-                    if (dependAssetInfo.HasBundleName() == false)
+                    foreach (var dependAssetInfo in packAsset.AllDependAssetInfos)
                     {
-                        if (result.Contains(dependAssetInfo.AssetInfo.AssetPath) == false)
-                            result.Add(dependAssetInfo.AssetInfo.AssetPath);
+                        // 注意：依赖资源里只添加零依赖资源和冗余资源
+                        if (dependAssetInfo.HasBundleName() == false)
+                        {
+                            string dependAssetPath = dependAssetInfo.AssetInfo.AssetPath;
+                            if (result.ContainsKey(dependAssetPath) == false)
+                                result.Add(dependAssetPath, dependAssetInfo.AssetInfo);
+                        }
                     }
                 }
             }
-            return result;
+            return result.Values.ToList();
         }
 
         /// <summary>
@@ -142,7 +159,7 @@ namespace YooAsset.Editor
             AssetBundleBuild build = new AssetBundleBuild();
             build.assetBundleName = BundleName;
             build.assetBundleVariant = string.Empty;
-            build.assetNames = GetAllMainAssetPaths();
+            build.assetNames = GetAllPackAssetPaths();
             return build;
         }
 
@@ -151,7 +168,7 @@ namespace YooAsset.Editor
         /// </summary>
         public BuildAssetInfo[] GetAllManifestAssetInfos()
         {
-            return MainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
+            return AllPackAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
         }
 
         /// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs

@@ -43,17 +43,21 @@ namespace YooAsset.Editor
             manifest.AssetList = CreatePackageAssetList(buildMapContext);
             manifest.BundleList = CreatePackageBundleList(buildMapContext);
 
-            // 处理资源清单的ID数据
-            ProcessPacakgeIDs(manifest);
+            // 1. 处理资源清单的资源对象
+            ProcessPacakgeAsset(manifest);
 
-            // 处理资源包的依赖列表
+            // 2. 处理资源包的依赖列表
             if (processBundleDepends)
                 ProcessBundleDepends(context, manifest);
 
-            // 处理资源包的标签集合
+            // 3. 处理资源包的标签集合
             if (processBundleTags)
                 ProcessBundleTags(manifest);
 
+            // 4. 处理内置资源包
+            if (processBundleDepends)
+                ProcessBuiltinBundleDependency(context, manifest);
+
             // 创建补丁清单文本文件
             {
                 string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
@@ -64,17 +68,13 @@ namespace YooAsset.Editor
 
             // 创建补丁清单二进制文件
             string packageHash;
+            string packagePath;
             {
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-                string filePath = $"{packageOutputDirectory}/{fileName}";
-                ManifestTools.SerializeToBinary(filePath, manifest);
-                packageHash = HashUtility.FileCRC32(filePath);
-                BuildLogger.Log($"Create package manifest file: {filePath}");
-
-                ManifestContext manifestContext = new ManifestContext();
-                byte[] bytesData = FileUtility.ReadAllBytes(filePath);
-                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
-                context.SetContextObject(manifestContext);
+                packagePath = $"{packageOutputDirectory}/{fileName}";
+                ManifestTools.SerializeToBinary(packagePath, manifest);
+                packageHash = HashUtility.FileCRC32(packagePath);
+                BuildLogger.Log($"Create package manifest file: {packagePath}");
             }
 
             // 创建补丁清单哈希文件
@@ -92,6 +92,14 @@ namespace YooAsset.Editor
                 FileUtility.WriteAllText(filePath, buildParameters.PackageVersion);
                 BuildLogger.Log($"Create package manifest version file: {filePath}");
             }
+
+            // 填充上下文
+            {
+                ManifestContext manifestContext = new ManifestContext();
+                byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
+                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
+                context.SetContextObject(manifestContext);
+            }
         }
 
         /// <summary>
@@ -137,7 +145,7 @@ namespace YooAsset.Editor
                     packageAsset.AssetPath = assetInfo.AssetInfo.AssetPath;
                     packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetInfo.AssetGUID : string.Empty;
                     packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
-                    packageAsset.BundleNameInEditor = assetInfo.BundleName;
+                    packageAsset.TempDataInEditor = assetInfo;
                     result.Add(packageAsset);
                 }
             }
@@ -165,9 +173,9 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 处理资源清单的ID数据
+        /// 处理资源清单的资源对象列表
         /// </summary>
-        private void ProcessPacakgeIDs(PackageManifest manifest)
+        private void ProcessPacakgeAsset(PackageManifest manifest)
         {
             // 注意：优先缓存资源包索引
             for (int index = 0; index < manifest.BundleList.Count; index++)
@@ -176,10 +184,19 @@ namespace YooAsset.Editor
                 _cachedBundleIndexIDs.Add(bundleName, index);
             }
 
+            // 记录资源对象所属的资源包ID
             foreach (var packageAsset in manifest.AssetList)
             {
-                string bundleName = packageAsset.BundleNameInEditor;
-                packageAsset.BundleID = GetCachedBundleIndexID(bundleName);
+                var assetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
+                packageAsset.BundleID = GetCachedBundleIndexID(assetInfo.BundleName);
+            }
+
+            // 记录资源对象依赖的资源包ID集合
+            // 注意：依赖关系非引擎构建结果里查询！
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                var mainAssetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
+                packageAsset.DependBundleIDs = GetAssetDependBundleIDs(mainAssetInfo);
             }
         }
 
@@ -192,15 +209,18 @@ namespace YooAsset.Editor
             foreach (var packageBundle in manifest.BundleList)
             {
                 int mainBundleID = GetCachedBundleIndexID(packageBundle.BundleName);
-                var depends = GetBundleDepends(context, packageBundle.BundleName);
-                List<int> dependIDs = new List<int>(depends.Length);
-                foreach (var dependBundleName in depends)
+                string[] dependNames = GetBundleDepends(context, packageBundle.BundleName);
+                List<int> dependIDs = new List<int>(dependNames.Length);
+                foreach (var dependName in dependNames)
                 {
-                    int bundleID = GetCachedBundleIndexID(dependBundleName);
-                    if (bundleID != mainBundleID)
-                        dependIDs.Add(bundleID);
+                    int dependBundleID = GetCachedBundleIndexID(dependName);
+                    if (dependBundleID != mainBundleID)
+                        dependIDs.Add(dependBundleID);
                 }
-                packageBundle.DependIDs = dependIDs.ToArray();
+
+                // 排序并填充数据
+                dependIDs.Sort();
+                packageBundle.DependBundleIDs = dependIDs.ToArray();
             }
         }
 
@@ -209,23 +229,27 @@ namespace YooAsset.Editor
         /// </summary>
         private void ProcessBundleTags(PackageManifest manifest)
         {
+            foreach (var packageBundle in manifest.BundleList)
+            {
+                packageBundle.Tags = Array.Empty<string>();
+            }
+
             // 将主资源的标签信息传染给其依赖的资源包集合
             foreach (var packageAsset in manifest.AssetList)
             {
                 var assetTags = packageAsset.AssetTags;
                 int bundleID = packageAsset.BundleID;
                 CacheBundleTags(bundleID, assetTags);
-
-                var packageBundle = manifest.BundleList[bundleID];
-                if (packageBundle.DependIDs != null)
+                if (packageAsset.DependBundleIDs != null)
                 {
-                    foreach (var dependBundleID in packageBundle.DependIDs)
+                    foreach (var dependBundleID in packageAsset.DependBundleIDs)
                     {
                         CacheBundleTags(dependBundleID, assetTags);
                     }
                 }
             }
 
+            // 将缓存的资源标签赋值给资源包
             for (int index = 0; index < manifest.BundleList.Count; index++)
             {
                 var packageBundle = manifest.BundleList[index];
@@ -264,5 +288,94 @@ namespace YooAsset.Editor
             }
             return value;
         }
+
+        /// <summary>
+        /// 是否包含该资源包的索引ID
+        /// </summary>
+        private bool ContainsCachedBundleIndexID(string bundleName)
+        {
+            return _cachedBundleIndexIDs.ContainsKey(bundleName);
+        }
+
+        #region YOOASSET_LEGACY_DEPENDENCY
+        private void ProcessBuiltinBundleDependency(BuildContext context, PackageManifest manifest)
+        {
+            // 注意：如果是可编程构建管线，需要补充内置资源包
+            // 注意：该步骤依赖前面的操作！
+            var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
+            if (buildResultContext != null)
+            {
+                // 注意：初始化资源清单建立引用关系
+                ManifestTools.InitManifest(manifest);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.BuiltinShadersBundleName);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.MonoScriptsBundleName);
+            }
+        }
+        private void ProcessBuiltinBundleReference(BuildContext context, PackageManifest manifest, string builtinBundleName)
+        {
+            if (string.IsNullOrEmpty(builtinBundleName))
+                return;
+
+            // 查询内置资源包是否存在
+            if (ContainsCachedBundleIndexID(builtinBundleName) == false)
+                return;
+
+            // 获取内置资源包
+            int builtinBundleID = GetCachedBundleIndexID(builtinBundleName);
+            var builtinPackageBundle = manifest.BundleList[builtinBundleID];
+
+            // 更新依赖资源包ID集合
+            HashSet<int> cacheBundleIDs = new HashSet<int>(builtinPackageBundle.ReferenceBundleIDs);
+            HashSet<string> tempTags = new HashSet<string>();
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                if (cacheBundleIDs.Contains(packageAsset.BundleID))
+                {
+                    if (packageAsset.DependBundleIDs.Contains(builtinBundleID) == false)
+                    {
+                        var tempBundleIDs = new List<int>(packageAsset.DependBundleIDs);
+                        tempBundleIDs.Add(builtinBundleID);
+                        packageAsset.DependBundleIDs = tempBundleIDs.ToArray();
+                    }
+
+                    foreach (var tag in packageAsset.AssetTags)
+                    {
+                        if (tempTags.Contains(tag) == false)
+                            tempTags.Add(tag);
+                    }
+                }
+            }
+
+            // 更新内置资源包的标签集合
+            foreach (var tag in builtinPackageBundle.Tags)
+            {
+                if (tempTags.Contains(tag) == false)
+                    tempTags.Add(tag);
+            }
+            builtinPackageBundle.Tags = tempTags.ToArray();
+        }
+        private int[] GetAssetDependBundleIDs(BuildAssetInfo mainAssetInfo)
+        {
+            HashSet<int> result = new HashSet<int>();
+            int mainBundleID = GetCachedBundleIndexID(mainAssetInfo.BundleName);
+            foreach (var dependAssetInfo in mainAssetInfo.AllDependAssetInfos)
+            {
+                if (dependAssetInfo.HasBundleName())
+                {
+                    int bundleID = GetCachedBundleIndexID(dependAssetInfo.BundleName);
+                    if (mainBundleID != bundleID)
+                    {
+                        if (result.Contains(bundleID) == false)
+                            result.Add(bundleID);
+                    }
+                }
+            }
+
+            // 排序并返回数据
+            List<int> listResult = new List<int>(result);
+            listResult.Sort();
+            return listResult.ToArray();
+        }
+        #endregion
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs

@@ -18,11 +18,7 @@ namespace YooAsset.Editor
 
             // 概述信息
             {
-#if UNITY_2019_4_OR_NEWER
-                UnityEditor.PackageManager.PackageInfo packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(BuildReport).Assembly);
-                if (packageInfo != null)
-                    buildReport.Summary.YooVersion = packageInfo.version;
-#endif
+                buildReport.Summary.YooVersion = EditorTools.GetPackageManagerYooVersion();
                 buildReport.Summary.UnityVersion = UnityEngine.Application.unityVersion;
                 buildReport.Summary.BuildDate = DateTime.Now.ToString();
                 buildReport.Summary.BuildSeconds = BuildRunner.TotalSeconds;
@@ -38,36 +34,34 @@ namespace YooAsset.Editor
                 buildReport.Summary.EnableAddressable = buildMapContext.Command.EnableAddressable;
                 buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
                 buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-                buildReport.Summary.IgnoreRuleName = buildMapContext.Command.IgnoreRule.GetType().FullName;
                 buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders;
+                buildReport.Summary.IgnoreRuleName = buildMapContext.Command.IgnoreRule.GetType().FullName;
 
                 // 构建参数
                 buildReport.Summary.ClearBuildCacheFiles = buildParameters.ClearBuildCacheFiles;
                 buildReport.Summary.UseAssetDependencyDB = buildParameters.UseAssetDependencyDB;
                 buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
+                buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
+                buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                 buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
-                if (buildParameters.BuildPipeline == nameof(BuiltinBuildPipeline))
+                if (buildParameters is BuiltinBuildParameters)
                 {
                     var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                     buildReport.Summary.CompressOption = builtinBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = builtinBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = builtinBuildParameters.IgnoreTypeTreeChanges;
                 }
-                else if (buildParameters.BuildPipeline == nameof(ScriptableBuildPipeline))
+                else if (buildParameters is ScriptableBuildParameters)
                 {
                     var scriptableBuildParameters = buildParameters as ScriptableBuildParameters;
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                     buildReport.Summary.CompressOption = scriptableBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = scriptableBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = scriptableBuildParameters.IgnoreTypeTreeChanges;
-                }
-                else
-                {
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
-                    buildReport.Summary.CompressOption = ECompressOption.Uncompressed;
-                    buildReport.Summary.DisableWriteTypeTree = false;
-                    buildReport.Summary.IgnoreTypeTreeChanges = false;
+                    buildReport.Summary.WriteLinkXML = scriptableBuildParameters.WriteLinkXML;
+                    buildReport.Summary.CacheServerHost = scriptableBuildParameters.CacheServerHost;
+                    buildReport.Summary.CacheServerPort = scriptableBuildParameters.CacheServerPort;
+                    buildReport.Summary.BuiltinShadersBundleName = scriptableBuildParameters.BuiltinShadersBundleName;
+                    buildReport.Summary.MonoScriptsBundleName = scriptableBuildParameters.MonoScriptsBundleName;
                 }
 
                 // 构建结果
@@ -91,7 +85,8 @@ namespace YooAsset.Editor
                 reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(packageAsset.AssetPath);
                 reportAssetInfo.MainBundleName = mainBundle.BundleName;
                 reportAssetInfo.MainBundleSize = mainBundle.FileSize;
-                reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
+                reportAssetInfo.DependAssets = GetAssetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
+                reportAssetInfo.DependBundles = GetAssetDependBundles(manifest, packageAsset);
                 buildReport.AssetInfos.Add(reportAssetInfo);
             }
 
@@ -107,8 +102,9 @@ namespace YooAsset.Editor
                 reportBundleInfo.FileSize = packageBundle.FileSize;
                 reportBundleInfo.Encrypted = packageBundle.Encrypted;
                 reportBundleInfo.Tags = packageBundle.Tags;
-                reportBundleInfo.DependBundles = GetDependBundles(manifest, packageBundle);
-                reportBundleInfo.AllBuiltinAssets = GetAllBuiltinAssets(buildMapContext, packageBundle.BundleName);
+                reportBundleInfo.DependBundles = GetBundleDependBundles(manifest, packageBundle);
+                reportBundleInfo.ReferenceBundles = GetBundleReferenceBundles(manifest, packageBundle);
+                reportBundleInfo.BundleContents = GetBundleContents(buildMapContext, packageBundle.BundleName);
                 buildReport.BundleInfos.Add(reportBundleInfo);
             }
 
@@ -123,12 +119,28 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 获取资源对象依赖的所有资源包
+        /// 获取资源对象依赖的其它所有资源
         /// </summary>
-        private List<string> GetDependBundles(PackageManifest manifest, PackageBundle packageBundle)
+        private List<AssetInfo> GetAssetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
         {
-            List<string> dependBundles = new List<string>(packageBundle.DependIDs.Length);
-            foreach (int index in packageBundle.DependIDs)
+            List<AssetInfo> result = new List<AssetInfo>();
+            var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
+            var assetInfo = bundleInfo.GetPackAssetInfo(assetPath);
+            foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
+            {
+                result.Add(dependAssetInfo.AssetInfo);
+            }
+            result.Sort();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取资源对象依赖的资源包集合
+        /// </summary>
+        private List<string> GetAssetDependBundles(PackageManifest manifest, PackageAsset packageAsset)
+        {
+            List<string> dependBundles = new List<string>(packageAsset.DependBundleIDs.Length);
+            foreach (int index in packageAsset.DependBundleIDs)
             {
                 string dependBundleName = manifest.BundleList[index].BundleName;
                 dependBundles.Add(dependBundleName);
@@ -138,42 +150,42 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 获取资源对象依赖的其它所有资源
+        /// 获取资源包依赖的资源包集合
         /// </summary>
-        private List<string> GetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
+        private List<string> GetBundleDependBundles(PackageManifest manifest, PackageBundle packageBundle)
         {
-            List<string> result = new List<string>();
-            var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
+            List<string> dependBundles = new List<string>(packageBundle.DependBundleIDs.Length);
+            foreach (int index in packageBundle.DependBundleIDs)
             {
-                BuildAssetInfo findAssetInfo = null;
-                foreach (var buildAsset in bundleInfo.MainAssets)
-                {
-                    if (buildAsset.AssetInfo.AssetPath == assetPath)
-                    {
-                        findAssetInfo = buildAsset;
-                        break;
-                    }
-                }
-                if (findAssetInfo == null)
-                {
-                    throw new Exception($"Should never get here ! Not found asset {assetPath} in bunlde {bundleName}");
-                }
-                foreach (var dependAssetInfo in findAssetInfo.AllDependAssetInfos)
-                {
-                    result.Add(dependAssetInfo.AssetInfo.AssetPath);
-                }
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                dependBundles.Add(dependBundleName);
             }
-            result.Sort();
-            return result;
+            dependBundles.Sort();
+            return dependBundles;
         }
 
         /// <summary>
-        /// 获取该资源包内的所有资源
+        /// 获取引用该资源包的资源包集合
         /// </summary>
-        private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
+        private List<string> GetBundleReferenceBundles(PackageManifest manifest, PackageBundle packageBundle)
+        {
+            List<string> referenceBundles = new List<string>(packageBundle.ReferenceBundleIDs.Count);
+            foreach (int index in packageBundle.ReferenceBundleIDs)
+            {
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                referenceBundles.Add(dependBundleName);
+            }
+            referenceBundles.Sort();
+            return referenceBundles;
+        }
+
+        /// <summary>
+        /// 获取资源包内部所有资产
+        /// </summary>
+        private List<AssetInfo> GetBundleContents(BuildMapContext buildMapContext, string bundleName)
         {
             var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
-            List<string> result = bundleInfo.GetAllBuiltinAssetPaths();
+            List<AssetInfo> result = bundleInfo.GetBundleContents();
             result.Sort();
             return result;
         }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskUpdateBundleInfo_ESBP.cs

@@ -45,7 +45,7 @@ namespace YooAsset.Editor
         {
             long tempSize = 0;
 
-            var assetPaths = bundleInfo.GetAllMainAssetPaths();
+            var assetPaths = bundleInfo.GetAllPackAssetPaths();
             foreach (var assetPath in assetPaths)
             {
                 long size = FileUtility.GetFileSize(assetPath);

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs

@@ -23,7 +23,7 @@ namespace YooAsset.Editor
             foreach (var bundleInfo in buildMapContext.Collection)
             {
                 string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-                foreach (var buildAsset in bundleInfo.MainAssets)
+                foreach (var buildAsset in bundleInfo.AllPackAssets)
                 {
                     EditorTools.CopyFile(buildAsset.AssetInfo.AssetPath, dest, true);
                 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs

@@ -27,7 +27,7 @@ namespace YooAsset.Editor
             // 注意：原生文件资源包只能包含一个原生文件
             foreach (var bundleInfo in buildMapContext.Collection)
             {
-                if (bundleInfo.MainAssets.Count != 1)
+                if (bundleInfo.AllPackAssets.Count != 1)
                 {
                     string message = BuildLogger.GetErrorMessage(ErrorCode.NotSupportMultipleRawAsset, $"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
                     throw new Exception(message);

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs

@@ -13,6 +13,8 @@ namespace YooAsset.Editor
         public class BuildResultContext : IContextObject
         {
             public IBundleBuildResults Results;
+            public string BuiltinShadersBundleName;
+            public string MonoScriptsBundleName;
         }
 
         void IBuildTask.Run(BuildContext context)
@@ -53,6 +55,8 @@ namespace YooAsset.Editor
             BuildLogger.Log("UnityEngine build success!");
             BuildResultContext buildResultContext = new BuildResultContext();
             buildResultContext.Results = buildResults;
+            buildResultContext.BuiltinShadersBundleName = builtinShadersBundleName;
+            buildResultContext.MonoScriptsBundleName = monoScriptsBundleName;
             context.SetContextObject(buildResultContext);
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/BuildContext.cs

@@ -9,7 +9,7 @@ namespace YooAsset.Editor
         private readonly Dictionary<System.Type, IContextObject> _contextObjects = new Dictionary<System.Type, IContextObject>();
 
         /// <summary>
-        /// 清空所有情景对象
+        /// 清空所有上下文对象
         /// </summary>
         public void ClearAllContext()
         {
@@ -17,7 +17,7 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 设置情景对象
+        /// 设置上下文对象
         /// </summary>
         public void SetContextObject(IContextObject contextObject)
         {
@@ -32,7 +32,7 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 获取情景对象
+        /// 获取上下文对象
         /// </summary>
         public T GetContextObject<T>() where T : IContextObject
         {
@@ -46,5 +46,21 @@ namespace YooAsset.Editor
                 throw new Exception($"Not found context object : {type}");
             }
         }
+
+        /// <summary>
+        /// 获取上下文对象
+        /// </summary>
+        public T TryGetContextObject<T>() where T : IContextObject
+        {
+            var type = typeof(T);
+            if (_contextObjects.TryGetValue(type, out IContextObject contextObject))
+            {
+                return (T)contextObject;
+            }
+            else
+            {
+                return default;
+            }
+        }
     }
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -28,7 +28,7 @@
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
         <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
             <ui:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
-            <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
             <ui:VisualElement name="PackageAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
@@ -38,7 +38,7 @@
             <ui:Label text="Groups" display-tooltip-when-elided="true" name="GroupTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
             <ui:TextField picking-mode="Ignore" label="Package Name" name="PackageName" style="flex-direction: column;" />
             <ui:TextField picking-mode="Ignore" label="Package Desc" name="PackageDesc" style="flex-direction: column;" />
-            <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
             <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -272,7 +272,7 @@ namespace YooAsset.Editor
                     packageData.ProviderInfos.Sort();
                     foreach (var providerInfo in packageData.ProviderInfos)
                     {
-                        providerInfo.DependBundleInfos.Sort();
+                        providerInfo.DependBundles.Sort();
                     }
                 }
 

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.cs

@@ -13,6 +13,7 @@ namespace YooAsset.Editor
     {
         private class ProviderTableData : DefaultTableData
         {
+            public DebugPackageData PackageData;
             public DebugProviderInfo ProviderInfo;
         }
         private class DependTableData : DefaultTableData
@@ -205,7 +206,7 @@ namespace YooAsset.Editor
                 {
                     StyleColor textColor;
                     var providerTableData = data as ProviderTableData;
-                    if(providerTableData.ProviderInfo.Status == EOperationStatus.Failed.ToString())
+                    if (providerTableData.ProviderInfo.Status == EOperationStatus.Failed.ToString())
                         textColor = new StyleColor(Color.yellow);
                     else
                         textColor = new StyleColor(Color.white);
@@ -309,6 +310,7 @@ namespace YooAsset.Editor
                 foreach (var providerInfo in packageData.ProviderInfos)
                 {
                     var rowData = new ProviderTableData();
+                    rowData.PackageData = packageData;
                     rowData.ProviderInfo = providerInfo;
                     rowData.AddAssetPathCell("PackageName", packageData.PackageName);
                     rowData.AddStringValueCell("AssetPath", providerInfo.AssetPath);
@@ -368,12 +370,14 @@ namespace YooAsset.Editor
         private void OnProviderTableViewSelectionChanged(ITableData data)
         {
             var providerTableData = data as ProviderTableData;
+            DebugPackageData packageData = providerTableData.PackageData;
             DebugProviderInfo providerInfo = providerTableData.ProviderInfo;
 
             // 填充依赖数据
-            var sourceDatas = new List<ITableData>(providerInfo.DependBundleInfos.Count);
-            foreach (var dependBundleInfo in providerInfo.DependBundleInfos)
+            var sourceDatas = new List<ITableData>(providerInfo.DependBundles.Count);
+            foreach (var bundleName in providerInfo.DependBundles)
             {
+                var dependBundleInfo = packageData.GetBundleInfo(bundleName);
                 var rowData = new DependTableData();
                 rowData.BundleInfo = dependBundleInfo;
                 rowData.AddStringValueCell("DependBundles", dependBundleInfo.BundleName);

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.uxml

@@ -2,7 +2,7 @@
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
         <YooAsset.Editor.TableView name="TopTableView" />
     </ui:VisualElement>
-    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
+    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex; flex-grow: 1;">
         <YooAsset.Editor.TableView name="BottomTableView" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.cs

@@ -13,19 +13,24 @@ namespace YooAsset.Editor
     {
         private class BundleTableData : DefaultTableData
         {
-            public string PackageName;
+            public DebugPackageData PackageData;
             public DebugBundleInfo BundleInfo;
         }
         private class UsingTableData : DefaultTableData
         {
             public DebugProviderInfo ProviderInfo;
         }
+        private class ReferenceTableData : DefaultTableData
+        {
+            public DebugBundleInfo BundleInfo;
+        }
 
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
 
         private TableView _bundleTableView;
         private TableView _usingTableView;
+        private TableView _referenceTableView;
 
         private DebugReport _debugReport;
         private List<ITableData> _sourceDatas;
@@ -44,20 +49,25 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 资源包列表
-            _bundleTableView = _root.Q<TableView>("TopTableView");
+            _bundleTableView = _root.Q<TableView>("BundleTableView");
             _bundleTableView.SelectionChangedEvent = OnBundleTableViewSelectionChanged;
             CreateBundleTableViewColumns();
 
             // 使用列表
-            _usingTableView = _root.Q<TableView>("BottomTableView");
+            _usingTableView = _root.Q<TableView>("UsingTableView");
             CreateUsingTableViewColumns();
 
+            // 引用列表
+            _referenceTableView = _root.Q<TableView>("ReferenceTableView");
+            CreateReferenceTableViewColumns();
+
 #if UNITY_2020_3_OR_NEWER
             var topGroup = _root.Q<VisualElement>("TopGroup");
             var bottomGroup = _root.Q<VisualElement>("BottomGroup");
             topGroup.style.minHeight = 100;
             bottomGroup.style.minHeight = 100f;
             PanelSplitView.SplitVerticalPanel(_root, topGroup, bottomGroup);
+            PanelSplitView.SplitVerticalPanel(bottomGroup, _usingTableView, _referenceTableView);
 #endif
         }
         private void CreateBundleTableViewColumns()
@@ -269,6 +279,79 @@ namespace YooAsset.Editor
                 _usingTableView.AddColumn(column);
             }
         }
+        private void CreateReferenceTableViewColumns()
+        {
+            // BundleName
+            {
+                var columnStyle = new ColumnStyle(600, 500, 1000);
+                columnStyle.Stretchable = true;
+                columnStyle.Searchable = true;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("ReferenceBundle", "Reference Bundle", columnStyle);
+                column.MakeCell = () =>
+                {
+                    var label = new Label();
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
+                };
+                _referenceTableView.AddColumn(column);
+            }
+
+            // RefCount
+            {
+                var columnStyle = new ColumnStyle(100);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("RefCount", "Ref Count", columnStyle);
+                column.MakeCell = () =>
+                {
+                    var label = new Label();
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
+                };
+                _referenceTableView.AddColumn(column);
+            }
+
+            // Status
+            {
+                var columnStyle = new ColumnStyle(100);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("Status", "Status", columnStyle);
+                column.MakeCell = () =>
+                {
+                    var label = new Label();
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    StyleColor textColor;
+                    var feferenceTableData = data as ReferenceTableData;
+                    if (feferenceTableData.BundleInfo.Status == EOperationStatus.Failed)
+                        textColor = new StyleColor(Color.yellow);
+                    else
+                        textColor = new StyleColor(Color.white);
+
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
+                    infoLabel.style.color = textColor;
+                };
+                _referenceTableView.AddColumn(column);
+            }
+        }
 
         /// <summary>
         /// 填充页面数据
@@ -280,30 +363,22 @@ namespace YooAsset.Editor
             // 清空旧数据
             _bundleTableView.ClearAll(false, true);
             _usingTableView.ClearAll(false, true);
+            _referenceTableView.ClearAll(false, true);
 
             // 填充数据源
             _sourceDatas = new List<ITableData>(1000);
             foreach (var packageData in debugReport.PackageDatas)
             {
-                var tempDic = new HashSet<string>();
-                foreach (var providerInfo in packageData.ProviderInfos)
+                foreach (var bundleInfo in packageData.BundleInfos)
                 {
-                    foreach (var bundleInfo in providerInfo.DependBundleInfos)
-                    {
-                        if (tempDic.Contains(bundleInfo.BundleName) == false)
-                        {
-                            tempDic.Add(bundleInfo.BundleName);
-
-                            var rowData = new BundleTableData();
-                            rowData.PackageName = packageData.PackageName;
-                            rowData.BundleInfo = bundleInfo;
-                            rowData.AddAssetPathCell("PackageName", packageData.PackageName);
-                            rowData.AddStringValueCell("BundleName", bundleInfo.BundleName);
-                            rowData.AddLongValueCell("RefCount", bundleInfo.RefCount);
-                            rowData.AddStringValueCell("Status", bundleInfo.Status.ToString());
-                            _sourceDatas.Add(rowData);
-                        }
-                    }
+                    var rowData = new BundleTableData();
+                    rowData.PackageData = packageData;
+                    rowData.BundleInfo = bundleInfo;
+                    rowData.AddAssetPathCell("PackageName", packageData.PackageName);
+                    rowData.AddStringValueCell("BundleName", bundleInfo.BundleName);
+                    rowData.AddLongValueCell("RefCount", bundleInfo.RefCount);
+                    rowData.AddStringValueCell("Status", bundleInfo.Status.ToString());
+                    _sourceDatas.Add(rowData);
                 }
             }
             _bundleTableView.itemsSource = _sourceDatas;
@@ -322,6 +397,8 @@ namespace YooAsset.Editor
             _bundleTableView.RebuildView();
             _usingTableView.ClearAll(false, true);
             _usingTableView.RebuildView();
+            _referenceTableView.ClearAll(false, true);
+            _referenceTableView.RebuildView();
         }
 
         /// <summary>
@@ -355,19 +432,17 @@ namespace YooAsset.Editor
         private void OnBundleTableViewSelectionChanged(ITableData data)
         {
             var bundleTableData = data as BundleTableData;
+            var packageData = bundleTableData.PackageData;
+            var selectBundleInfo = bundleTableData.BundleInfo;
 
-            // 填充依赖数据
-            var sourceDatas = new List<ITableData>(1000);
-            foreach (var packageData in _debugReport.PackageDatas)
+            // 填充UsingTableView
             {
-                if (packageData.PackageName != bundleTableData.PackageName)
-                    continue;
-
+                var sourceDatas = new List<ITableData>(1000);
                 foreach (var providerInfo in packageData.ProviderInfos)
                 {
-                    foreach (var bundleInfo in providerInfo.DependBundleInfos)
+                    foreach (var dependBundleName in providerInfo.DependBundles)
                     {
-                        if (bundleInfo.BundleName == bundleTableData.BundleInfo.BundleName)
+                        if (dependBundleName == selectBundleInfo.BundleName)
                         {
                             var rowData = new UsingTableData();
                             rowData.ProviderInfo = providerInfo;
@@ -381,9 +456,26 @@ namespace YooAsset.Editor
                         }
                     }
                 }
+                _usingTableView.itemsSource = sourceDatas;
+                _usingTableView.RebuildView();
+            }
+
+            // 填充ReferenceTableView
+            {
+                var sourceDatas = new List<ITableData>(1000);
+                foreach (string referenceBundleName in selectBundleInfo.ReferenceBundles)
+                {
+                    var bundleInfo = packageData.GetBundleInfo(referenceBundleName);
+                    var rowData = new ReferenceTableData();
+                    rowData.BundleInfo = bundleInfo;
+                    rowData.AddStringValueCell("BundleName", bundleInfo.BundleName);
+                    rowData.AddLongValueCell("RefCount", bundleInfo.RefCount);
+                    rowData.AddStringValueCell("Status", bundleInfo.Status.ToString());
+                    sourceDatas.Add(rowData);
+                }
+                _referenceTableView.itemsSource = sourceDatas;
+                _referenceTableView.RebuildView();
             }
-            _usingTableView.itemsSource = sourceDatas;
-            _usingTableView.RebuildView();
         }
     }
 }

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.uxml

@@ -1,8 +1,9 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
-        <YooAsset.Editor.TableView name="TopTableView" />
+        <YooAsset.Editor.TableView name="BundleTableView" />
     </ui:VisualElement>
-    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
-        <YooAsset.Editor.TableView name="BottomTableView" />
+    <ui:VisualElement name="BottomGroup" style="height: 400px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
+        <YooAsset.Editor.TableView name="UsingTableView" />
+        <YooAsset.Editor.TableView name="ReferenceTableView" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleReporter/ReportAssetInfo.cs

@@ -39,8 +39,14 @@ namespace YooAsset.Editor
         public long MainBundleSize;
 
         /// <summary>
-        /// 依赖的资源路径列表
+        /// 依赖的资源集合
         /// </summary>
-        public List<string> DependAssets = new List<string>();
+        public List<AssetInfo> DependAssets = new List<AssetInfo>();
+
+        /// <summary>
+        /// 依赖的资源包集合
+        /// 说明：框架层收集查询结果
+        /// </summary>
+        public List<string> DependBundles = new List<string>();
     }
 }

Assets/YooAsset/Editor/AssetBundleReporter/ReportBundleInfo.cs

@@ -44,14 +44,21 @@ namespace YooAsset.Editor
         public string[] Tags;
 
         /// <summary>
-        /// 资源包的依赖集合
+        /// 依赖的资源包集合
+        /// 说明：引擎层构建查询结果
         /// </summary>
-        public List<string> DependBundles;
+        public List<string> DependBundles = new List<string>();
 
         /// <summary>
-        /// 该资源包内包含的所有资源
+        /// 引用该资源包的资源包集合
+        /// 说明：谁依赖该资源包
         /// </summary>
-        public List<string> AllBuiltinAssets = new List<string>();
+        public List<string> ReferenceBundles = new List<string>();
+
+        /// <summary>
+        /// 资源包内部所有资产
+        /// </summary>
+        public List<AssetInfo> BundleContents = new List<AssetInfo>();
 
         /// <summary>
         /// 获取资源分类标签的字符串

Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs

@@ -70,11 +70,19 @@ namespace YooAsset.Editor
         public bool ClearBuildCacheFiles;
         public bool UseAssetDependencyDB;
         public bool EnableSharePackRule;
+        public bool SingleReferencedPackAlone;
         public string EncryptionClassName;
         public EFileNameStyle FileNameStyle;
+
+        // 引擎参数
         public ECompressOption CompressOption;
         public bool DisableWriteTypeTree;
         public bool IgnoreTypeTreeChanges;
+        public bool WriteLinkXML = true;
+        public string CacheServerHost;
+        public int CacheServerPort;
+        public string BuiltinShadersBundleName;
+        public string MonoScriptsBundleName;
 
         // 构建结果
         public int AssetFileTotalCount;

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.cs

@@ -72,6 +72,7 @@ namespace YooAsset.Editor
                 columnStyle.Stretchable = true;
                 columnStyle.Searchable = true;
                 columnStyle.Sortable = true;
+                columnStyle.Counter = true;
                 var column = new TableColumn("AssetPath", "Asset Path", columnStyle);
                 column.MakeCell = () =>
                 {
@@ -116,6 +117,7 @@ namespace YooAsset.Editor
                 columnStyle.Stretchable = true;
                 columnStyle.Searchable = true;
                 columnStyle.Sortable = true;
+                columnStyle.Counter = true;
                 var column = new TableColumn("DependBundles", "Depend Bundles", columnStyle);
                 column.MakeCell = () =>
                 {

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.uxml

@@ -1,8 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
-        <YooAsset.Editor.TableView name="TopTableView" />
+        <YooAsset.Editor.TableView name="TopTableView" style="flex-grow: 1;" />
     </ui:VisualElement>
-    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
-        <YooAsset.Editor.TableView name="BottomTableView" />
+    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex; flex-grow: 1;">
+        <YooAsset.Editor.TableView name="BottomTableView" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs

@@ -72,6 +72,7 @@ namespace YooAsset.Editor
                 columnStyle.Stretchable = true;
                 columnStyle.Searchable = true;
                 columnStyle.Sortable = true;
+                columnStyle.Counter = true;
                 var column = new TableColumn("BundleName", "Bundle Name", columnStyle);
                 column.MakeCell = () =>
                 {
@@ -181,6 +182,7 @@ namespace YooAsset.Editor
                 columnStyle.Stretchable = true;
                 columnStyle.Searchable = true;
                 columnStyle.Sortable = true;
+                columnStyle.Counter = true;
                 var column = new TableColumn("IncludeAssets", "Include Assets", columnStyle);
                 column.MakeCell = () =>
                 {
@@ -320,15 +322,15 @@ namespace YooAsset.Editor
                     sourceDatas.Add(rowData);
                 }
             }
-            foreach (string assetPath in bundleInfo.AllBuiltinAssets)
+            foreach (var assetInfo in bundleInfo.BundleContents)
             {
-                if (mainAssetDic.Contains(assetPath) == false)
+                if (mainAssetDic.Contains(assetInfo.AssetPath) == false)
                 {
                     var rowData = new IncludeTableData();
                     rowData.AssetInfo = null;
-                    rowData.AddAssetPathCell("IncludeAssets", assetPath);
+                    rowData.AddAssetPathCell("IncludeAssets", assetInfo.AssetPath);
                     rowData.AddStringValueCell("AssetSource", "BuiltinAsset");
-                    rowData.AddStringValueCell("AssetGUID", "--");
+                    rowData.AddStringValueCell("AssetGUID", assetInfo.AssetGUID);
                     sourceDatas.Add(rowData);
                 }
             }

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml

@@ -1,8 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
-        <YooAsset.Editor.TableView name="TopTableView" />
+        <YooAsset.Editor.TableView name="TopTableView" style="flex-grow: 1;" />
     </ui:VisualElement>
-    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
-        <YooAsset.Editor.TableView name="BottomTableView" />
+    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex; flex-grow: 1;">
+        <YooAsset.Editor.TableView name="BottomTableView" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs

@@ -11,24 +11,9 @@ namespace YooAsset.Editor
 {
     internal class ReporterSummaryViewer
     {
-        private class ItemWrapper
-        {
-            public string Title { private set; get; }
-            public string Value { private set; get; }
-
-            public ItemWrapper(string title, string value)
-            {
-                Title = title;
-                Value = value;
-            }
-        }
-
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
-
-        private ListView _listView;
-        private readonly List<ItemWrapper> _items = new List<ItemWrapper>();
-
+        private ScrollView _scrollView;
 
         /// <summary>
         /// 初始化页面
@@ -44,9 +29,7 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 概述列表
-            _listView = _root.Q<ListView>("ListView");
-            _listView.makeItem = MakeListViewItem;
-            _listView.bindItem = BindListViewItem;
+            _scrollView = _root.Q<ScrollView>("ScrollView");
         }
 
         /// <summary>
@@ -54,52 +37,49 @@ namespace YooAsset.Editor
         /// </summary>
         public void FillViewData(BuildReport buildReport)
         {
-            _items.Clear();
+            _scrollView.Clear();
 
-            _items.Add(new ItemWrapper("YooAsset Version", buildReport.Summary.YooVersion));
-            _items.Add(new ItemWrapper("UnityEngine Version", buildReport.Summary.UnityVersion));
-            _items.Add(new ItemWrapper("Build Date", buildReport.Summary.BuildDate));
-            _items.Add(new ItemWrapper("Build Seconds", ConvertTime(buildReport.Summary.BuildSeconds)));
-            _items.Add(new ItemWrapper("Build Target", $"{buildReport.Summary.BuildTarget}"));
-            _items.Add(new ItemWrapper("Build Pipeline", $"{buildReport.Summary.BuildPipeline}"));
-            _items.Add(new ItemWrapper("Build Bundle Type", buildReport.Summary.BuildBundleType.ToString()));
-            _items.Add(new ItemWrapper("Package Name", buildReport.Summary.BuildPackageName));
-            _items.Add(new ItemWrapper("Package Version", buildReport.Summary.BuildPackageVersion));
-            _items.Add(new ItemWrapper("Package Note", buildReport.Summary.BuildPackageNote));
+            BindListViewHeader("Build Infos");
+            BindListViewItem("YooAsset Version", buildReport.Summary.YooVersion);
+            BindListViewItem("UnityEngine Version", buildReport.Summary.UnityVersion);
+            BindListViewItem("Build Date", buildReport.Summary.BuildDate);
+            BindListViewItem("Build Seconds", ConvertTime(buildReport.Summary.BuildSeconds));
+            BindListViewItem("Build Target", $"{buildReport.Summary.BuildTarget}");
+            BindListViewItem("Build Pipeline", $"{buildReport.Summary.BuildPipeline}");
+            BindListViewItem("Build Bundle Type", buildReport.Summary.BuildBundleType.ToString());
+            BindListViewItem("Package Name", buildReport.Summary.BuildPackageName);
+            BindListViewItem("Package Version", buildReport.Summary.BuildPackageVersion);
+            BindListViewItem("Package Note", buildReport.Summary.BuildPackageNote);
+            BindListViewItem(string.Empty, string.Empty);
 
-            _items.Add(new ItemWrapper(string.Empty, string.Empty));
-            _items.Add(new ItemWrapper("Collect Settings", string.Empty));
-            _items.Add(new ItemWrapper("Unique Bundle Name", $"{buildReport.Summary.UniqueBundleName}"));
-            _items.Add(new ItemWrapper("Enable Addressable", $"{buildReport.Summary.EnableAddressable}"));
-            _items.Add(new ItemWrapper("Location To Lower", $"{buildReport.Summary.LocationToLower}"));
-            _items.Add(new ItemWrapper("Include Asset GUID", $"{buildReport.Summary.IncludeAssetGUID}"));
-            _items.Add(new ItemWrapper("Auto Collect Shaders", $"{buildReport.Summary.AutoCollectShaders}"));
-            _items.Add(new ItemWrapper("Ignore Rule Name", $"{buildReport.Summary.IgnoreRuleName}"));
+            BindListViewHeader("Collect Settings");
+            BindListViewItem("Unique Bundle Name", $"{buildReport.Summary.UniqueBundleName}");
+            BindListViewItem("Enable Addressable", $"{buildReport.Summary.EnableAddressable}");
+            BindListViewItem("Location To Lower", $"{buildReport.Summary.LocationToLower}");
+            BindListViewItem("Include Asset GUID", $"{buildReport.Summary.IncludeAssetGUID}");
+            BindListViewItem("Auto Collect Shaders", $"{buildReport.Summary.AutoCollectShaders}");
+            BindListViewItem("Ignore Rule Name", $"{buildReport.Summary.IgnoreRuleName}");
+            BindListViewItem(string.Empty, string.Empty);
 
-            _items.Add(new ItemWrapper(string.Empty, string.Empty));
-            _items.Add(new ItemWrapper("Build Params", string.Empty));
-            _items.Add(new ItemWrapper("Clear Build Cache Files", $"{buildReport.Summary.ClearBuildCacheFiles}"));
-            _items.Add(new ItemWrapper("Use Asset Dependency DB", $"{buildReport.Summary.UseAssetDependencyDB}"));
-            _items.Add(new ItemWrapper("Enable Share Pack Rule", $"{buildReport.Summary.EnableSharePackRule}"));
-            _items.Add(new ItemWrapper("Encryption Class Name", buildReport.Summary.EncryptionClassName));
-            _items.Add(new ItemWrapper("FileNameStyle", $"{buildReport.Summary.FileNameStyle}"));
-            _items.Add(new ItemWrapper("CompressOption", $"{buildReport.Summary.CompressOption}"));
-            _items.Add(new ItemWrapper("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}"));
-            _items.Add(new ItemWrapper("IgnoreTypeTreeChanges", $"{buildReport.Summary.IgnoreTypeTreeChanges}"));
+            BindListViewHeader("Build Params");
+            BindListViewItem("Clear Build Cache Files", $"{buildReport.Summary.ClearBuildCacheFiles}");
+            BindListViewItem("Use Asset Dependency DB", $"{buildReport.Summary.UseAssetDependencyDB}");
+            BindListViewItem("Enable Share Pack Rule", $"{buildReport.Summary.EnableSharePackRule}");
+            BindListViewItem("Single Referenced Pack Alone", $"{buildReport.Summary.SingleReferencedPackAlone}");
+            BindListViewItem("Encryption Class Name", buildReport.Summary.EncryptionClassName);
+            BindListViewItem("FileNameStyle", $"{buildReport.Summary.FileNameStyle}");
+            BindListViewItem("CompressOption", $"{buildReport.Summary.CompressOption}");
+            BindListViewItem("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}");
+            BindListViewItem("IgnoreTypeTreeChanges", $"{buildReport.Summary.IgnoreTypeTreeChanges}");
+            BindListViewItem(string.Empty, string.Empty);
 
-            _items.Add(new ItemWrapper(string.Empty, string.Empty));
-            _items.Add(new ItemWrapper("Build Results", string.Empty));
-            _items.Add(new ItemWrapper("Asset File Total Count", $"{buildReport.Summary.AssetFileTotalCount}"));
-            _items.Add(new ItemWrapper("Main Asset Total Count", $"{buildReport.Summary.MainAssetTotalCount}"));
-            _items.Add(new ItemWrapper("All Bundle Total Count", $"{buildReport.Summary.AllBundleTotalCount}"));
-            _items.Add(new ItemWrapper("All Bundle Total Size", ConvertSize(buildReport.Summary.AllBundleTotalSize)));
-            _items.Add(new ItemWrapper("Encrypted Bundle Total Count", $"{buildReport.Summary.EncryptedBundleTotalCount}"));
-            _items.Add(new ItemWrapper("Encrypted Bundle Total Size", ConvertSize(buildReport.Summary.EncryptedBundleTotalSize)));
-
-            _listView.Clear();
-            _listView.ClearSelection();
-            _listView.itemsSource = _items;
-            _listView.Rebuild();
+            BindListViewHeader("Build Results");
+            BindListViewItem("Asset File Total Count", $"{buildReport.Summary.AssetFileTotalCount}");
+            BindListViewItem("Main Asset Total Count", $"{buildReport.Summary.MainAssetTotalCount}");
+            BindListViewItem("All Bundle Total Count", $"{buildReport.Summary.AllBundleTotalCount}");
+            BindListViewItem("All Bundle Total Size", ConvertSize(buildReport.Summary.AllBundleTotalSize));
+            BindListViewItem("Encrypted Bundle Total Count", $"{buildReport.Summary.EncryptedBundleTotalCount}");
+            BindListViewItem("Encrypted Bundle Total Size", ConvertSize(buildReport.Summary.EncryptedBundleTotalSize));
         }
 
         /// <summary>
@@ -119,45 +99,60 @@ namespace YooAsset.Editor
         }
 
         // 列表相关
+        private void BindListViewHeader(string titile)
+        {
+            Toolbar toolbar = new Toolbar();
+            _scrollView.Add(toolbar);
+
+            ToolbarButton titleButton = new ToolbarButton();
+            titleButton.text = titile;
+            titleButton.style.unityTextAlign = TextAnchor.MiddleCenter;
+            titleButton.style.width = 200;
+            toolbar.Add(titleButton);
+
+            ToolbarButton valueButton = new ToolbarButton();
+            valueButton.style.unityTextAlign = TextAnchor.MiddleCenter;
+            valueButton.style.width = 150;
+            valueButton.style.flexShrink = 1;
+            valueButton.style.flexGrow = 1;
+            valueButton.SetEnabled(false);
+            toolbar.Add(valueButton);
+        }
+        private void BindListViewItem(string name, string value)
+        {
+            VisualElement element = MakeListViewItem();
+            _scrollView.Add(element);
+
+            // Title
+            var titleLabel = element.Q<Label>("TitleLabel");
+            titleLabel.text = name;
+
+            // Value
+            var valueLabel = element.Q<Label>("ValueLabel");
+            valueLabel.text = value;
+        }
         private VisualElement MakeListViewItem()
         {
             VisualElement element = new VisualElement();
             element.style.flexDirection = FlexDirection.Row;
 
-            {
-                var label = new Label();
-                label.name = "Label1";
-                label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                label.style.marginLeft = 3f;
-                //label.style.flexGrow = 1f;
-                label.style.width = 200;
-                element.Add(label);
-            }
+            var titleLabel = new Label();
+            titleLabel.name = "TitleLabel";
+            titleLabel.style.unityTextAlign = TextAnchor.MiddleLeft;
+            titleLabel.style.marginLeft = 3f;
+            titleLabel.style.width = 200;
+            element.Add(titleLabel);
 
-            {
-                var label = new Label();
-                label.name = "Label2";
-                label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                label.style.marginLeft = 3f;
-                label.style.flexGrow = 1f;
-                label.style.width = 150;
-                element.Add(label);
-            }
+            var valueLabel = new Label();
+            valueLabel.name = "ValueLabel";
+            valueLabel.style.unityTextAlign = TextAnchor.MiddleLeft;
+            valueLabel.style.marginLeft = 3f;
+            valueLabel.style.flexGrow = 1f;
+            valueLabel.style.width = 150;
+            element.Add(valueLabel);
 
             return element;
         }
-        private void BindListViewItem(VisualElement element, int index)
-        {
-            var itemWrapper = _items[index];
-
-            // Title
-            var label1 = element.Q<Label>("Label1");
-            label1.text = itemWrapper.Title;
-
-            // Value
-            var label2 = element.Q<Label>("Label2");
-            label2.text = itemWrapper.Value;
-        }
 
         private string ConvertTime(int time)
         {

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.uxml

@@ -1,9 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
-        <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
-            <uie:ToolbarButton text="Info" display-tooltip-when-elided="true" name="TopBar1" style="width: 200px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Param" display-tooltip-when-elided="true" name="TopBar2" style="width: 150px; -unity-text-align: middle-left; flex-grow: 1;" />
-        </uie:Toolbar>
-        <ui:ListView focusable="true" name="ListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+        <ui:ScrollView name="ScrollView" horizontal-scroller-visibility="Hidden" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/Common/AssetInfo.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 namespace YooAsset.Editor
 {
     [Serializable]
-    public class AssetInfo
+    public class AssetInfo : IComparable<AssetInfo>
     {
         private string _fileExtension = null;
 
@@ -37,6 +37,7 @@ namespace YooAsset.Editor
             }
         }
 
+
         public AssetInfo(string assetPath)
         {
             AssetPath = assetPath;
@@ -60,5 +61,10 @@ namespace YooAsset.Editor
             else
                 return false;
         }
+
+        public int CompareTo(AssetInfo other)
+        {
+            return this.AssetPath.CompareTo(other.AssetPath);
+        }
     }
 }

Assets/YooAsset/Editor/EditorTools.cs

@@ -129,6 +129,21 @@ namespace YooAsset.Editor
         }
         #endregion
 
+        #region PackageManager
+        public static string GetPackageManagerYooVersion()
+        {
+#if UNITY_2019_4_OR_NEWER
+            UnityEditor.PackageManager.PackageInfo packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(YooAssets).Assembly);
+            if (packageInfo != null)
+                return packageInfo.version;
+            else
+                return string.Empty;
+#else
+            return string.Empty;
+#endif
+        }
+        #endregion
+
         #region EditorUtility
         /// <summary>
         /// 搜集资源
@@ -559,7 +574,7 @@ namespace YooAsset.Editor
         {
             return path.Replace('\\', '/').Replace("\\", "/"); //替换为Linux路径格式
         }
-    
+
         /// <summary>
         /// 移除路径里的后缀名
         /// </summary>

Assets/YooAsset/Editor/UIElements/ElementsDefine/PanelSplitView.cs

@@ -12,15 +12,9 @@ namespace YooAsset.Editor
     /// </summary>
     public class PanelSplitView : TwoPaneSplitView
     {
-#if UNITY_6000_0_OR_NEWER
-        public new class UxmlFactory : UxmlElementAttribute
-        {
-        }
-#else
         public new class UxmlFactory : UxmlFactory<PanelSplitView, UxmlTraits>
         {
         }
-#endif
 
         /// <summary>
         /// 竖版分屏

Assets/YooAsset/Editor/UIElements/ElementsDefine/ReorderableListView.cs

@@ -0,0 +1,627 @@
+#if UNITY_2021_3_OR_NEWER
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    public class ReorderableListView : VisualElement
+    {
+        public new class UxmlFactory : UxmlFactory<ReorderableListView, UxmlTraits>
+        {
+        }
+        
+        /// <summary>
+        /// 制作元素委托
+        /// </summary>
+        /// <returns></returns>
+        public delegate VisualElement MakeElementDelegate();
+
+        /// <summary>
+        /// 绑定元素委托
+        /// </summary>
+        public delegate void BindElementDelegqate(VisualElement element, int index);
+
+        private Foldout _foldout;
+        private ListView _listView;
+        private Label _headerLabel;
+        private Button _addButton;
+        private Button _removeButton;
+        private string _headerName = nameof(ReorderableListView);
+
+        /// <summary>
+        /// 源数据
+        /// </summary>
+        public IList SourceData
+        {
+            set
+            {
+                if (value is ArrayList)
+                    throw new Exception($"{nameof(SourceData)} not support {nameof(ArrayList)}");
+
+                _listView.Clear();
+                _listView.ClearSelection();
+                _listView.itemsSource = value;
+                _listView.Rebuild();
+                RefreshFoldoutName();
+                RefreshRemoveButton();
+            }
+            get
+            {
+                return _listView.itemsSource;
+            }
+        }
+
+        /// <summary>
+        /// 元素固定高度
+        /// </summary>
+        public float ElementHeight
+        {
+            set
+            {
+                _listView.fixedItemHeight = value;
+                _listView.Rebuild();
+            }
+            get
+            {
+                return _listView.fixedItemHeight;
+            }
+        }
+
+        /// <summary>
+        /// 增加按钮显隐
+        /// </summary>
+        public bool DisplayAdd
+        {
+            set
+            {
+                UIElementsTools.SetElementVisible(_addButton, value);
+            }
+            get
+            {
+                return _addButton.style.visibility == Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// 移除按钮显隐
+        /// </summary>
+        public bool DisplayRemove
+        {
+            set
+            {
+                UIElementsTools.SetElementVisible(_removeButton, value);
+            }
+            get
+            {
+                return _removeButton.style.visibility == Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// 标题名称
+        /// </summary>
+        public string HeaderName
+        {
+            set
+            {
+                _headerName = value;
+                RefreshFoldoutName();
+            }
+            get
+            {
+                return _headerName;
+            }
+        }
+
+        /// <summary>
+        /// 制作元素的回调
+        /// </summary>
+        public MakeElementDelegate MakeElementCallback;
+
+        /// <summary>
+        /// 绑定元素的回调
+        /// </summary>
+        public BindElementDelegqate BindElementCallback;
+
+
+        public ReorderableListView()
+        {
+            CreateView(true);
+        }
+        public ReorderableListView(bool foldout)
+        {
+            CreateView(foldout);
+        }
+        private void CreateView(bool foldout)
+        {
+            this.style.flexGrow = 1;
+            this.style.flexShrink = 1;
+
+            // 折叠栏
+            if (foldout)
+            {
+                _foldout = new Foldout();
+                _foldout.style.flexGrow = 1f;
+                _foldout.style.flexShrink = 1f;
+                _foldout.text = $"{nameof(ReorderableListView)}";
+            }
+            else
+            {
+                _headerLabel = new Label();
+            }
+
+            // 列表视图
+            _listView = new ListView();
+            _listView.style.flexGrow = 1;
+            _listView.style.flexShrink = 1;
+            _listView.reorderable = true;
+            _listView.reorderMode = ListViewReorderMode.Animated;
+            _listView.makeItem = MakeListViewElement;
+            _listView.bindItem = BindListViewElement;
+#if UNITY_2022_3_OR_NEWER
+            _listView.selectionChanged += OnSelectionChanged;
+#elif UNITY_2020_1_OR_NEWER
+            _listView.onSelectionChange += OnSelectionChanged;
+#else
+            _listView.onSelectionChanged += OnSelectionChanged;
+#endif
+
+            // 按钮组
+            var buttonContainer = new VisualElement();
+            buttonContainer.style.flexDirection = FlexDirection.RowReverse;
+
+            // 移除按钮
+            _removeButton = new Button();
+            _removeButton.text = " - ";
+            _removeButton.clicked += OnClickRemoveButton;
+            _removeButton.SetEnabled(false);
+            buttonContainer.Add(_removeButton);
+
+            // 增加按钮
+            _addButton = new Button();
+            _addButton.text = " + ";
+            _addButton.clicked += OnClickAddButton;
+            buttonContainer.Add(_addButton);
+
+            // 组织页面
+            if (foldout)
+            {
+                _foldout.Add(_listView);
+                _foldout.Add(buttonContainer);
+                this.Add(_foldout);
+            }
+            else
+            {
+                this.Add(_headerLabel);
+                this.Add(_listView);
+                this.Add(buttonContainer);
+            }
+        }
+        private void OnClickAddButton()
+        {
+            if (_listView.itemsSource != null)
+            {
+                object defaultValue = GetElementDefaultValue();
+                _listView.itemsSource.Add(defaultValue);
+                _listView.Rebuild();
+                RefreshFoldoutName();
+                RefreshRemoveButton();
+            }
+            else
+            {
+                Debug.LogWarning("The source data is null !");
+            }
+        }
+        private void OnClickRemoveButton()
+        {
+            if (_listView.itemsSource != null)
+            {
+                if (_listView.selectedIndex >= 0)
+                {
+                    _listView.itemsSource.RemoveAt(_listView.selectedIndex);
+                    _listView.Rebuild();
+                    RefreshFoldoutName();
+                    RefreshRemoveButton();
+                }
+            }
+            else
+            {
+                Debug.LogWarning("The source data is null !");
+            }
+        }
+        private void OnSelectionChanged(IEnumerable<object> objs)
+        {
+            RefreshRemoveButton();
+        }
+
+        /// <summary>
+        /// 生成元素
+        /// </summary>
+        private VisualElement MakeListViewElement()
+        {
+            if (MakeElementCallback != null)
+            {
+                return MakeElementCallback.Invoke();
+            }
+
+            Type elementType = GetElementType();
+            if (elementType == typeof(string))
+            {
+                TextField textField = new TextField();
+                textField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)textField.userData;
+                    _listView.itemsSource[itemIndex] = textField.value;
+                });
+                return textField;
+            }
+            else if (elementType == typeof(int))
+            {
+                IntegerField intField = new IntegerField();
+                intField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)intField.userData;
+                    _listView.itemsSource[itemIndex] = intField.value;
+                });
+                return intField;
+            }
+            else if (elementType == typeof(long))
+            {
+                LongField longField = new LongField();
+                longField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)longField.userData;
+                    _listView.itemsSource[itemIndex] = longField.value;
+                });
+                return longField;
+            }
+            else if (elementType == typeof(float))
+            {
+                FloatField floatField = new FloatField();
+                floatField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)floatField.userData;
+                    _listView.itemsSource[itemIndex] = floatField.value;
+                });
+                return floatField;
+            }
+            else if (elementType == typeof(double))
+            {
+                DoubleField doubleField = new DoubleField();
+                doubleField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)doubleField.userData;
+                    _listView.itemsSource[itemIndex] = doubleField.value;
+                });
+                return doubleField;
+            }
+            else if (elementType == typeof(bool))
+            {
+                Toggle toggle = new Toggle();
+                toggle.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)toggle.userData;
+                    _listView.itemsSource[itemIndex] = toggle.value;
+                });
+                return toggle;
+            }
+            else if (elementType == typeof(Hash128))
+            {
+                Hash128Field hash128Field = new Hash128Field();
+                hash128Field.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)hash128Field.userData;
+                    _listView.itemsSource[itemIndex] = hash128Field.value;
+                });
+                return hash128Field;
+            }
+            else if (elementType == typeof(Vector2))
+            {
+                Vector2Field vector2Field = new Vector2Field();
+                vector2Field.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)vector2Field.userData;
+                    _listView.itemsSource[itemIndex] = vector2Field.value;
+                });
+                return vector2Field;
+            }
+            else if (elementType == typeof(Vector3))
+            {
+                Vector3Field vector3Field = new Vector3Field();
+                vector3Field.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)vector3Field.userData;
+                    _listView.itemsSource[itemIndex] = vector3Field.value;
+                });
+                return vector3Field;
+            }
+            else if (elementType == typeof(Vector4))
+            {
+                Vector4Field vector4Field = new Vector4Field();
+                vector4Field.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)vector4Field.userData;
+                    _listView.itemsSource[itemIndex] = vector4Field.value;
+                });
+                return vector4Field;
+            }
+            else if (elementType == typeof(Rect))
+            {
+                RectField rectField = new RectField();
+                rectField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)rectField.userData;
+                    _listView.itemsSource[itemIndex] = rectField.value;
+                });
+                return rectField;
+            }
+            else if (elementType == typeof(Bounds))
+            {
+                BoundsField boundsField = new BoundsField();
+                boundsField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)boundsField.userData;
+                    _listView.itemsSource[itemIndex] = boundsField.value;
+                });
+                return boundsField;
+            }
+            else if (elementType == typeof(Color))
+            {
+                ColorField colorField = new ColorField();
+                colorField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)colorField.userData;
+                    _listView.itemsSource[itemIndex] = colorField.value;
+                });
+                return colorField;
+            }
+            else if (elementType == typeof(Gradient))
+            {
+                GradientField gradientField = new GradientField();
+                gradientField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)gradientField.userData;
+                    _listView.itemsSource[itemIndex] = gradientField.value;
+                });
+                return gradientField;
+            }
+            else if (elementType == typeof(AnimationCurve))
+            {
+                CurveField curveField = new CurveField();
+                curveField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)curveField.userData;
+                    _listView.itemsSource[itemIndex] = curveField.value;
+                });
+                return curveField;
+            }
+            else if (elementType == typeof(UnityEngine.Object))
+            {
+                ObjectField objectField = new ObjectField();
+                objectField.objectType = typeof(UnityEngine.Object);
+                objectField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)objectField.userData;
+                    _listView.itemsSource[itemIndex] = objectField.value;
+                });
+                return objectField;
+            }
+            else if (elementType.IsEnum)
+            {
+                EnumField enumField = new EnumField();
+                enumField.RegisterValueChangedCallback(evt =>
+                {
+                    int itemIndex = (int)enumField.userData;
+                    _listView.itemsSource[itemIndex] = enumField.value;
+                });
+                return enumField;
+            }
+            else
+            {
+                Label label = new Label();
+                label.text = $"Not support element type : {elementType.Name}";
+                return label;
+            }
+        }
+
+        /// <summary>
+        /// 绑定元素
+        /// </summary>
+        private void BindListViewElement(VisualElement listViewElement, int index)
+        {
+            if (BindElementCallback != null)
+            {
+                BindElementCallback.Invoke(listViewElement, index);
+                return;
+            }
+
+            var elementValue = _listView.itemsSource[index];
+            string elementName = GetElementName(index);
+            Type elementType = GetElementType();
+            if (elementType == typeof(string))
+            {
+                TextField textField = listViewElement as TextField;
+                textField.userData = index;
+                textField.label = elementName;
+                textField.SetValueWithoutNotify(elementValue as string);
+            }
+            else if (elementType == typeof(int))
+            {
+                IntegerField intField = listViewElement as IntegerField;
+                intField.userData = index;
+                intField.label = elementName;
+                intField.SetValueWithoutNotify((int)elementValue);
+            }
+            else if (elementType == typeof(long))
+            {
+                LongField longField = listViewElement as LongField;
+                longField.userData = index;
+                longField.label = elementName;
+                longField.SetValueWithoutNotify((long)elementValue);
+            }
+            else if (elementType == typeof(float))
+            {
+                FloatField floatField = listViewElement as FloatField;
+                floatField.userData = index;
+                floatField.label = elementName;
+                floatField.SetValueWithoutNotify((float)elementValue);
+            }
+            else if (elementType == typeof(double))
+            {
+                DoubleField doubleField = listViewElement as DoubleField;
+                doubleField.userData = index;
+                doubleField.label = elementName;
+                doubleField.SetValueWithoutNotify((double)elementValue);
+            }
+            else if (elementType == typeof(bool))
+            {
+                Toggle toggle = listViewElement as Toggle;
+                toggle.userData = index;
+                toggle.label = elementName;
+                toggle.SetValueWithoutNotify((bool)elementValue);
+            }
+            else if (elementType == typeof(Hash128))
+            {
+                Hash128Field hash128Field = listViewElement as Hash128Field;
+                hash128Field.userData = index;
+                hash128Field.label = elementName;
+                hash128Field.SetValueWithoutNotify((Hash128)elementValue);
+            }
+            else if (elementType == typeof(Vector2))
+            {
+                Vector2Field vector2Field = listViewElement as Vector2Field;
+                vector2Field.userData = index;
+                vector2Field.label = elementName;
+                vector2Field.SetValueWithoutNotify((Vector2)elementValue);
+            }
+            else if (elementType == typeof(Vector3))
+            {
+                Vector3Field vector3Field = listViewElement as Vector3Field;
+                vector3Field.userData = index;
+                vector3Field.label = elementName;
+                vector3Field.SetValueWithoutNotify((Vector3)elementValue);
+            }
+            else if (elementType == typeof(Vector4))
+            {
+                Vector4Field vector4Field = listViewElement as Vector4Field;
+                vector4Field.userData = index;
+                vector4Field.label = elementName;
+                vector4Field.SetValueWithoutNotify((Vector4)elementValue);
+            }
+            else if (elementType == typeof(Rect))
+            {
+                RectField rectField = listViewElement as RectField;
+                rectField.userData = index;
+                rectField.label = elementName;
+                rectField.SetValueWithoutNotify((Rect)elementValue);
+            }
+            else if (elementType == typeof(Bounds))
+            {
+                BoundsField boundsField = listViewElement as BoundsField;
+                boundsField.userData = index;
+                boundsField.label = elementName;
+                boundsField.SetValueWithoutNotify((Bounds)elementValue);
+            }
+            else if (elementType == typeof(Color))
+            {
+                ColorField colorField = listViewElement as ColorField;
+                colorField.userData = index;
+                colorField.label = elementName;
+                colorField.SetValueWithoutNotify((Color)elementValue);
+            }
+            else if (elementType == typeof(Gradient))
+            {
+                GradientField gradientField = listViewElement as GradientField;
+                gradientField.userData = index;
+                gradientField.label = elementName;
+                gradientField.SetValueWithoutNotify((Gradient)elementValue);
+            }
+            else if (elementType == typeof(AnimationCurve))
+            {
+                CurveField curveField = listViewElement as CurveField;
+                curveField.userData = index;
+                curveField.label = elementName;
+                curveField.SetValueWithoutNotify((AnimationCurve)elementValue);
+            }
+            else if (elementType == typeof(UnityEngine.Object))
+            {
+                ObjectField objectField = listViewElement as ObjectField;
+                objectField.userData = index;
+                objectField.label = elementName;
+                objectField.SetValueWithoutNotify(elementValue as UnityEngine.Object);
+            }
+            else if (elementType.IsEnum)
+            {
+                EnumField enumField = listViewElement as EnumField;
+                enumField.userData = index;
+                enumField.label = elementName;
+                enumField.Init((Enum)elementValue);
+                enumField.SetValueWithoutNotify((Enum)elementValue);
+            }
+            else
+            {
+            }
+        }
+
+        private Type GetElementType()
+        {
+            Type elementType = _listView.itemsSource.GetType().GetGenericArguments()[0];
+            return elementType;
+        }
+        private object GetElementDefaultValue()
+        {
+            Type type = GetElementType();
+            if (type.IsValueType)
+            {
+                return Activator.CreateInstance(type);
+            }
+            return null;
+        }
+        private string GetElementName(int index)
+        {
+            return $"Element {index}";
+        }
+
+        private void RefreshRemoveButton()
+        {
+            if (_listView.itemsSource == null)
+            {
+                _removeButton.SetEnabled(false);
+                return;
+            }
+
+            // 注意：数据列表移除元素的时候有可能会越界！
+            if (_listView.selectedIndex >= _listView.itemsSource.Count)
+                _listView.ClearSelection();
+
+            if (_listView.selectedIndex >= 0)
+                _removeButton.SetEnabled(true);
+            else
+                _removeButton.SetEnabled(false);
+        }
+        private void RefreshFoldoutName()
+        {
+            if (_listView.itemsSource == null)
+            {
+                if (_foldout != null)
+                    _foldout.text = _headerName;
+                if (_headerLabel != null)
+                    _headerLabel.text = _headerName;
+            }
+            else
+            {
+                if (_foldout != null)
+                    _foldout.text = _headerName + $" ({_listView.itemsSource.Count}) ";
+                if (_headerLabel != null)
+                    _headerLabel.text = _headerName + $" ({_listView.itemsSource.Count}) ";
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Editor/UIElements/ElementsDefine/ReorderableListView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 640ec7bd883b8314db53b508278aea6e
+guid: 111ec0d18888d7e4396b2192f7b4f347
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/UIElements/ElementsDefine/ResizeHandle.cs

@@ -9,15 +9,9 @@ namespace YooAsset.Editor
 {
     public class ResizeHandle : VisualElement
     {
-#if UNITY_6000_0_OR_NEWER
-        public new class UxmlFactory : UxmlElementAttribute
-        {
-        }
-#else
         public new class UxmlFactory : UxmlFactory<ResizeHandle, UxmlTraits>
         {
         }
-#endif
 
         private bool _isResizing = false;
         private float _initialWidth;

Assets/YooAsset/Editor/UIElements/TableView/ColumnStyle.cs

@@ -41,6 +41,11 @@ namespace YooAsset.Editor
         /// </summary>
         public bool Sortable = false;
 
+        /// <summary>
+        /// 统计数量
+        /// </summary>
+        public bool Counter = false;
+
         public ColumnStyle(Length width)
         {
             if (width.value > MaxValue)

Assets/YooAsset/Editor/UIElements/TableView/TableView.cs

@@ -15,15 +15,9 @@ namespace YooAsset.Editor
     /// </summary>
     public class TableView : VisualElement
     {
-#if UNITY_6000_0_OR_NEWER
-        public new class UxmlFactory : UxmlElementAttribute
-        {
-        }
-#else
         public new class UxmlFactory : UxmlFactory<TableView, UxmlTraits>
         {
         }
-#endif
 
         private readonly Toolbar _toolbar;
         private readonly ListView _listView;
@@ -33,7 +27,7 @@ namespace YooAsset.Editor
         private List<ITableData> _sortingDatas;
 
         // 排序相关
-        private string _sortingHeaderElement = string.Empty;
+        private string _sortingHeader;
         private bool _descendingSort = true;
 
         /// <summary>
@@ -90,10 +84,16 @@ namespace YooAsset.Editor
 
         public TableView()
         {
-            _toolbar = new Toolbar();
-            this.Add(_toolbar);
+            this.style.flexShrink = 1f;
+            this.style.flexGrow = 1f;
 
+            // 定义标题栏
+            _toolbar = new Toolbar();
+
+            // 定义列表视图
             _listView = new ListView();
+            _listView.style.flexShrink = 1f;
+            _listView.style.flexGrow = 1f;
             _listView.makeItem = MakeListViewElement;
             _listView.bindItem = BindListViewElement;
             _listView.selectionType = SelectionType.Multiple;
@@ -107,6 +107,7 @@ namespace YooAsset.Editor
             _listView.onSelectionChanged += OnSelectionChanged;
 #endif
 
+            this.Add(_toolbar);
             this.Add(_listView);
         }
 
@@ -190,6 +191,38 @@ namespace YooAsset.Editor
             _listView.ClearSelection();
             _listView.itemsSource = itemsSource.ToList();
             _listView.Rebuild();
+
+            // 刷新标题栏
+            RefreshToobar();
+        }
+        private void RefreshToobar()
+        {
+            // 设置为原始标题
+            foreach (var column in _columns)
+            {
+                var toobarButton = _toolbar.Q<ToolbarButton>(column.ElementName);
+                toobarButton.text = column.HeaderTitle;
+            }
+
+            // 设置元素数量
+            foreach (var column in _columns)
+            {
+                if (column.ColumnStyle.Counter)
+                {
+                    var toobarButton = GetHeaderElement(column.ElementName) as ToolbarButton;
+                    toobarButton.text = $"{toobarButton.text} ({itemsSource.Count()})";
+                }
+            }
+
+            // 设置升降符号
+            if (string.IsNullOrEmpty(_sortingHeader) == false)
+            {
+                var _toobarButton = _toolbar.Q<ToolbarButton>(_sortingHeader);
+                if (_descendingSort)
+                    _toobarButton.text = $"{_toobarButton.text} ↓";
+                else
+                    _toobarButton.text = $"{_toobarButton.text} ↑";
+            }
         }
 
         /// <summary>
@@ -236,9 +269,9 @@ namespace YooAsset.Editor
             if (clickedColumn.ColumnStyle.Sortable == false)
                 return;
 
-            if (_sortingHeaderElement != clickedColumn.ElementName)
+            if (_sortingHeader != clickedColumn.ElementName)
             {
-                _sortingHeaderElement = clickedColumn.ElementName;
+                _sortingHeader = clickedColumn.ElementName;
                 _descendingSort = false;
             }
             else
@@ -246,17 +279,6 @@ namespace YooAsset.Editor
                 _descendingSort = !_descendingSort;
             }
 
-            // 升降符号
-            foreach (var column in _columns)
-            {
-                var button = _toolbar.Q<ToolbarButton>(column.ElementName);
-                button.text = column.HeaderTitle;
-            }
-            if (_descendingSort)
-                toolbarBtn.text = $"{clickedColumn.HeaderTitle} ↓";
-            else
-                toolbarBtn.text = $"{clickedColumn.HeaderTitle} ↑";
-
             // 升降排序
             if (_descendingSort)
                 _sortingDatas = _itemsSource.OrderByDescending(tableData => tableData.Cells[clickedColumn.ColumnIndex]).ToList();

Assets/YooAsset/Runtime/DiagnosticSystem/DebugBundleInfo.cs

@@ -22,6 +22,11 @@ namespace YooAsset
         /// </summary>
         public EOperationStatus Status;
 
+        /// <summary>
+        /// 谁引用了该资源包
+        /// </summary>
+        public List<string> ReferenceBundles;
+
         public int CompareTo(DebugBundleInfo other)
         {
             return Compare(this, other);

Assets/YooAsset/Runtime/DiagnosticSystem/DebugPackageData.cs

@@ -17,5 +17,44 @@ namespace YooAsset
         /// 调试数据列表
         /// </summary>
         public List<DebugProviderInfo> ProviderInfos = new List<DebugProviderInfo>(1000);
+
+        /// <summary>
+        /// 调试数据列表
+        /// </summary>
+        public List<DebugBundleInfo> BundleInfos = new List<DebugBundleInfo>(1000);
+
+
+        [NonSerialized]
+        public Dictionary<string, DebugBundleInfo> BundleInfoDic = new Dictionary<string, DebugBundleInfo>();
+        private bool _isParse = false;
+
+        /// <summary>
+        /// 获取调试资源包信息类
+        /// </summary>
+        public DebugBundleInfo GetBundleInfo(string bundleName)
+        {
+            // 解析数据
+            if (_isParse == false)
+            {
+                _isParse = true;
+                foreach (var bundleInfo in BundleInfos)
+                {
+                    if (BundleInfoDic.ContainsKey(bundleInfo.BundleName) == false)
+                    {
+                        BundleInfoDic.Add(bundleInfo.BundleName, bundleInfo);
+                    }
+                }
+            }
+
+            if (BundleInfoDic.TryGetValue(bundleName, out DebugBundleInfo value))
+            {
+                return value;
+            }
+            else
+            {
+                UnityEngine.Debug.LogError($"Can not found {nameof(DebugBundleInfo)} : {bundleName}");
+                return null;
+            }
+        }
     }
 }

Assets/YooAsset/Runtime/DiagnosticSystem/DebugProviderInfo.cs

@@ -45,7 +45,7 @@ namespace YooAsset
         /// <summary>
         /// 依赖的资源包列表
         /// </summary>
-        public List<DebugBundleInfo> DependBundleInfos;
+        public List<string> DependBundles;
 
         public int CompareTo(DebugProviderInfo other)
         {

Assets/YooAsset/Runtime/DiagnosticSystem/DebugReport.cs

@@ -22,7 +22,6 @@ namespace YooAsset
         /// </summary>
         public List<DebugPackageData> PackageDatas = new List<DebugPackageData>(10);
 
-
         /// <summary>
         /// 序列化
         /// </summary>

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs

@@ -21,7 +21,7 @@ namespace YooAsset
         }
 
         protected readonly Dictionary<string, FileWrapper> _wrappers = new Dictionary<string, FileWrapper>(10000);
-        protected readonly Dictionary<string, string> _buildinFilePaths = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, string> _buildinFilePathMapping = new Dictionary<string, string>(10000);
         protected IFileSystem _unpackFileSystem;
         protected string _packageRoot;
 
@@ -309,10 +309,10 @@ namespace YooAsset
         }
         public string GetBuildinFileLoadPath(PackageBundle bundle)
         {
-            if (_buildinFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            if (_buildinFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
             {
                 filePath = PathUtility.Combine(_packageRoot, bundle.FileName);
-                _buildinFilePaths.Add(bundle.BundleGUID, filePath);
+                _buildinFilePathMapping.Add(bundle.BundleGUID, filePath);
             }
             return filePath;
         }

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/DefaultCacheFileSystem.cs

@@ -11,10 +11,10 @@ namespace YooAsset
     /// </summary>
     internal class DefaultCacheFileSystem : IFileSystem
     {
-        protected readonly Dictionary<string, RecordFileElement> _wrappers = new Dictionary<string, RecordFileElement>(10000);
-        protected readonly Dictionary<string, string> _bundleDataFilePaths = new Dictionary<string, string>(10000);
-        protected readonly Dictionary<string, string> _bundleInfoFilePaths = new Dictionary<string, string>(10000);
-        protected readonly Dictionary<string, string> _tempFilePaths = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, RecordFileElement> _records = new Dictionary<string, RecordFileElement>(10000);
+        protected readonly Dictionary<string, string> _bundleDataFilePathMapping = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, string> _bundleInfoFilePathMapping = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, string> _tempFilePathMapping = new Dictionary<string, string>(10000);
         protected DefaultCacheDownloadCenter _downloadCenter;
 
         protected string _packageRoot;
@@ -45,7 +45,7 @@ namespace YooAsset
         {
             get
             {
-                return _wrappers.Count;
+                return _records.Count;
             }
         }
 
@@ -245,7 +245,7 @@ namespace YooAsset
         }
         public virtual bool Exists(PackageBundle bundle)
         {
-            return _wrappers.ContainsKey(bundle.BundleGUID);
+            return _records.ContainsKey(bundle.BundleGUID);
         }
         public virtual bool NeedDownload(PackageBundle bundle)
         {
@@ -330,60 +330,60 @@ namespace YooAsset
         #region 缓存相关
         public List<string> GetAllCachedBundleGUIDs()
         {
-            return _wrappers.Keys.ToList();
+            return _records.Keys.ToList();
         }
 
         public string GetTempFilePath(PackageBundle bundle)
         {
-            if (_tempFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            if (_tempFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
             {
                 filePath = PathUtility.Combine(_tempFilesRoot, bundle.BundleGUID);
-                _tempFilePaths.Add(bundle.BundleGUID, filePath);
+                _tempFilePathMapping.Add(bundle.BundleGUID, filePath);
             }
             return filePath;
         }
         public string GetBundleDataFilePath(PackageBundle bundle)
         {
-            if (_bundleDataFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            if (_bundleDataFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
             {
                 string folderName = bundle.FileHash.Substring(0, 2);
                 filePath = PathUtility.Combine(_cacheBundleFilesRoot, folderName, bundle.BundleGUID, DefaultCacheFileSystemDefine.BundleDataFileName);
                 if (AppendFileExtension)
                     filePath += bundle.FileExtension;
-                _bundleDataFilePaths.Add(bundle.BundleGUID, filePath);
+                _bundleDataFilePathMapping.Add(bundle.BundleGUID, filePath);
             }
             return filePath;
         }
         public string GetBundleInfoFilePath(PackageBundle bundle)
         {
-            if (_bundleInfoFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            if (_bundleInfoFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
             {
                 string folderName = bundle.FileHash.Substring(0, 2);
                 filePath = PathUtility.Combine(_cacheBundleFilesRoot, folderName, bundle.BundleGUID, DefaultCacheFileSystemDefine.BundleInfoFileName);
-                _bundleInfoFilePaths.Add(bundle.BundleGUID, filePath);
+                _bundleInfoFilePathMapping.Add(bundle.BundleGUID, filePath);
             }
             return filePath;
         }
 
         public bool IsRecordBundleFile(string bundleGUID)
         {
-            return _wrappers.ContainsKey(bundleGUID);
+            return _records.ContainsKey(bundleGUID);
         }
         public bool RecordBundleFile(string bundleGUID, RecordFileElement element)
         {
-            if (_wrappers.ContainsKey(bundleGUID))
+            if (_records.ContainsKey(bundleGUID))
             {
                 YooLogger.Error($"{nameof(DefaultCacheFileSystem)} has element : {bundleGUID}");
                 return false;
             }
 
-            _wrappers.Add(bundleGUID, element);
+            _records.Add(bundleGUID, element);
             return true;
         }
 
         public EFileVerifyResult VerifyCacheFile(PackageBundle bundle)
         {
-            if (_wrappers.TryGetValue(bundle.BundleGUID, out RecordFileElement wrapper) == false)
+            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement wrapper) == false)
                 return EFileVerifyResult.CacheNotFound;
 
             EFileVerifyResult result = FileVerifyHelper.FileVerify(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EFileVerifyLevel.High);
@@ -391,7 +391,7 @@ namespace YooAsset
         }
         public bool WriteCacheBundleFile(PackageBundle bundle, string copyPath)
         {
-            if (_wrappers.ContainsKey(bundle.BundleGUID))
+            if (_records.ContainsKey(bundle.BundleGUID))
             {
                 throw new Exception("Should never get here !");
             }
@@ -426,7 +426,7 @@ namespace YooAsset
         }
         public bool DeleteCacheBundleFile(string bundleGUID)
         {
-            if (_wrappers.TryGetValue(bundleGUID, out RecordFileElement wrapper))
+            if (_records.TryGetValue(bundleGUID, out RecordFileElement wrapper))
             {
                 try
                 {
@@ -434,7 +434,7 @@ namespace YooAsset
                     FileInfo fileInfo = new FileInfo(dataFilePath);
                     if (fileInfo.Exists)
                         fileInfo.Directory.Delete(true);
-                    _wrappers.Remove(bundleGUID);
+                    _records.Remove(bundleGUID);
                     return true;
                 }
                 catch (Exception e)

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/DefaultWebRemoteFileSystem.cs

@@ -47,6 +47,11 @@ namespace YooAsset
         /// 自定义参数：跨域下载服务接口
         /// </summary>
         public IRemoteServices RemoteServices { private set; get; } = null;
+
+        /// <summary>
+        ///  自定义参数：解密方法类
+        /// </summary>
+        public IWebDecryptionServices DecryptionServices { private set; get; }
         #endregion
 
 
@@ -108,6 +113,10 @@ namespace YooAsset
             {
                 RemoteServices = (IRemoteServices)value;
             }
+            else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
+            {
+                DecryptionServices = (IWebDecryptionServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadBundleOperation.cs

@@ -1,6 +1,4 @@
 
-using UnityEngine;
-
 namespace YooAsset
 {
     internal class DWRFSLoadAssetBundleOperation : FSLoadBundleOperation
@@ -8,13 +6,13 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            DownloadFile,
+            DownloadAssetBundle,
             Done,
         }
 
         private readonly DefaultWebRemoteFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
-        private DownloadHandlerAssetBundleOperation _downloadhanlderAssetBundleOp;
+        private DownloadAssetBundleOperation _downloadAssetBundleOp;
         private ESteps _steps = ESteps.None;
 
 
@@ -25,38 +23,47 @@ namespace YooAsset
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.DownloadFile;
+            _steps = ESteps.DownloadAssetBundle;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.DownloadFile)
+            if (_steps == ESteps.DownloadAssetBundle)
             {
-                if (_downloadhanlderAssetBundleOp == null)
+                if (_downloadAssetBundleOp == null)
                 {
                     DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
                     downloadParam.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
                     downloadParam.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
-                    _downloadhanlderAssetBundleOp = new DownloadHandlerAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, downloadParam);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _downloadhanlderAssetBundleOp);
+
+                    if (_bundle.Encrypted)
+                    {
+                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, downloadParam);
+                        OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                    }
+                    else
+                    {
+                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, downloadParam);
+                        OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                    }
                 }
 
-                DownloadProgress = _downloadhanlderAssetBundleOp.DownloadProgress;
-                DownloadedBytes = _downloadhanlderAssetBundleOp.DownloadedBytes;
-                Progress = _downloadhanlderAssetBundleOp.Progress;
-                if (_downloadhanlderAssetBundleOp.IsDone == false)
+                DownloadProgress = _downloadAssetBundleOp.DownloadProgress;
+                DownloadedBytes = _downloadAssetBundleOp.DownloadedBytes;
+                Progress = _downloadAssetBundleOp.Progress;
+                if (_downloadAssetBundleOp.IsDone == false)
                     return;
 
-                if (_downloadhanlderAssetBundleOp.Status == EOperationStatus.Succeed)
+                if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed)
                 {
-                    var assetBundle = _downloadhanlderAssetBundleOp.Result;
-                    if(assetBundle == null)
+                    var assetBundle = _downloadAssetBundleOp.Result;
+                    if (assetBundle == null)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"{nameof(DownloadHandlerAssetBundleOperation)} loaded asset bundle is null !";
+                        Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !";
                     }
                     else
                     {
@@ -69,7 +76,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _downloadhanlderAssetBundleOp.Error;
+                    Error = _downloadAssetBundleOp.Error;
                 }
             }
         }
@@ -85,10 +92,10 @@ namespace YooAsset
         }
         public override void AbortDownloadOperation()
         {
-            if (_steps == ESteps.DownloadFile)
+            if (_steps == ESteps.DownloadAssetBundle)
             {
-                if (_downloadhanlderAssetBundleOp != null)
-                    _downloadhanlderAssetBundleOp.SetAbort();
+                if (_downloadAssetBundleOp != null)
+                    _downloadAssetBundleOp.SetAbort();
             }
         }
     }

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs

@@ -21,7 +21,7 @@ namespace YooAsset
         }
 
         protected readonly Dictionary<string, FileWrapper> _wrappers = new Dictionary<string, FileWrapper>(10000);
-        protected readonly Dictionary<string, string> _webFilePaths = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, string> _webFilePathMapping = new Dictionary<string, string>(10000);
         protected string _webPackageRoot = string.Empty;
 
         /// <summary>
@@ -56,6 +56,11 @@ namespace YooAsset
         /// 禁用Unity的网络缓存
         /// </summary>
         public bool DisableUnityWebCache { private set; get; } = false;
+
+        /// <summary>
+        ///  自定义参数：解密方法类
+        /// </summary>
+        public IWebDecryptionServices DecryptionServices { private set; get; }
         #endregion
 
 
@@ -113,6 +118,10 @@ namespace YooAsset
             {
                 DisableUnityWebCache = (bool)value;
             }
+            else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
+            {
+                DecryptionServices = (IWebDecryptionServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");
@@ -173,10 +182,10 @@ namespace YooAsset
         }
         public string GetWebFileLoadPath(PackageBundle bundle)
         {
-            if (_webFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            if (_webFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
             {
                 filePath = PathUtility.Combine(_webPackageRoot, bundle.FileName);
-                _webFilePaths.Add(bundle.BundleGUID, filePath);
+                _webFilePathMapping.Add(bundle.BundleGUID, filePath);
             }
             return filePath;
         }

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadBundleOperation.cs

@@ -6,13 +6,13 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            DownloadFile,
+            DownloadAssetBundle,
             Done,
         }
 
         private readonly DefaultWebServerFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
-        private DownloadHandlerAssetBundleOperation _downloadhanlderAssetBundleOp;
+        private DownloadAssetBundleOperation _downloadAssetBundleOp;
         private ESteps _steps = ESteps.None;
 
 
@@ -23,39 +23,48 @@ namespace YooAsset
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.DownloadFile;
+            _steps = ESteps.DownloadAssetBundle;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.DownloadFile)
+            if (_steps == ESteps.DownloadAssetBundle)
             {
-                if (_downloadhanlderAssetBundleOp == null)
+                if (_downloadAssetBundleOp == null)
                 {
                     DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
                     string fileLoadPath = _fileSystem.GetWebFileLoadPath(_bundle);
                     downloadParam.MainURL = DownloadSystemHelper.ConvertToWWWPath(fileLoadPath);
                     downloadParam.FallbackURL = downloadParam.MainURL;
-                    _downloadhanlderAssetBundleOp = new DownloadHandlerAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, downloadParam);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _downloadhanlderAssetBundleOp);
+
+                    if (_bundle.Encrypted)
+                    {
+                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, downloadParam);
+                        OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                    }
+                    else
+                    {
+                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, downloadParam);
+                        OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                    }
                 }
 
-                DownloadProgress = _downloadhanlderAssetBundleOp.DownloadProgress;
-                DownloadedBytes = _downloadhanlderAssetBundleOp.DownloadedBytes;
-                Progress = _downloadhanlderAssetBundleOp.Progress;
-                if (_downloadhanlderAssetBundleOp.IsDone == false)
+                DownloadProgress = _downloadAssetBundleOp.DownloadProgress;
+                DownloadedBytes = _downloadAssetBundleOp.DownloadedBytes;
+                Progress = _downloadAssetBundleOp.Progress;
+                if (_downloadAssetBundleOp.IsDone == false)
                     return;
 
-                if (_downloadhanlderAssetBundleOp.Status == EOperationStatus.Succeed)
+                if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed)
                 {
-                    var assetBundle = _downloadhanlderAssetBundleOp.Result;
+                    var assetBundle = _downloadAssetBundleOp.Result;
                     if (assetBundle == null)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"{nameof(DownloadHandlerAssetBundleOperation)} loaded asset bundle is null !";
+                        Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !";
                     }
                     else
                     {
@@ -68,7 +77,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _downloadhanlderAssetBundleOp.Error;
+                    Error = _downloadAssetBundleOp.Error;
                 }
             }
         }
@@ -84,10 +93,10 @@ namespace YooAsset
         }
         public override void AbortDownloadOperation()
         {
-            if (_steps == ESteps.DownloadFile)
+            if (_steps == ESteps.DownloadAssetBundle)
             {
-                if (_downloadhanlderAssetBundleOp != null)
-                    _downloadhanlderAssetBundleOp.SetAbort();
+                if (_downloadAssetBundleOp != null)
+                    _downloadAssetBundleOp.SetAbort();
             }
         }
     }

Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs

@@ -109,11 +109,13 @@ namespace YooAsset
         /// <summary>
         /// 创建默认的WebServer文件系统参数
         /// </summary>
+        /// <param name="decryptionServices">加密文件解密服务类</param>
         /// <param name="disableUnityWebCache">禁用Unity的网络缓存</param>
-        public static FileSystemParameters CreateDefaultWebServerFileSystemParameters(bool disableUnityWebCache = false)
+        public static FileSystemParameters CreateDefaultWebServerFileSystemParameters(IWebDecryptionServices decryptionServices = null, bool disableUnityWebCache = false)
         {
             string fileSystemClass = typeof(DefaultWebServerFileSystem).FullName;
             var fileSystemParams = new FileSystemParameters(fileSystemClass, null);
+            fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
             fileSystemParams.AddParameter(FileSystemParametersDefine.DISABLE_UNITY_WEB_CACHE, disableUnityWebCache);
             return fileSystemParams;
         }
@@ -122,12 +124,14 @@ namespace YooAsset
         /// 创建默认的WebRemote文件系统参数
         /// </summary>
         /// <param name="remoteServices">远端资源地址查询服务类</param>
+        /// <param name="decryptionServices">加密文件解密服务类</param>
         /// <param name="disableUnityWebCache">禁用Unity的网络缓存</param>
-        public static FileSystemParameters CreateDefaultWebRemoteFileSystemParameters(IRemoteServices remoteServices, bool disableUnityWebCache = false)
+        public static FileSystemParameters CreateDefaultWebRemoteFileSystemParameters(IRemoteServices remoteServices, IWebDecryptionServices decryptionServices = null, bool disableUnityWebCache = false)
         {
             string fileSystemClass = typeof(DefaultWebRemoteFileSystem).FullName;
             var fileSystemParams = new FileSystemParameters(fileSystemClass, null);
             fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
+            fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
             fileSystemParams.AddParameter(FileSystemParametersDefine.DISABLE_UNITY_WEB_CACHE, disableUnityWebCache);
             return fileSystemParams;
         }

Assets/YooAsset/Runtime/FileSystem/Interface/IFileSystem.cs

@@ -20,7 +20,7 @@ namespace YooAsset
 
 
         /// <summary>
-        /// 初始化缓存系统
+        /// 初始化文件系统
         /// </summary>
         FSInitializeFileSystemOperation InitializeFileSystemAsync();
 
@@ -30,7 +30,7 @@ namespace YooAsset
         FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout);
 
         /// <summary>
-        /// 查询最新的版本
+        /// 查询包裹版本
         /// </summary>
         FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout);
 
@@ -40,7 +40,7 @@ namespace YooAsset
         FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam);
 
         /// <summary>
-        /// 下载远端文件
+        /// 下载Bundle文件
         /// </summary>
         FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param);
 

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadAssetBundleOperation.cs

@@ -0,0 +1,14 @@
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+    internal abstract class DownloadAssetBundleOperation : DefaultDownloadFileOperation
+    {
+        internal DownloadAssetBundleOperation(PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        {
+        }
+
+        public AssetBundle Result;
+    }
+}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadAssetBundleOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e4420bd73f37dec468a9b23425be68f2
+guid: 0f65d2f6038b95246b7a09cec4055b3a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs

@@ -0,0 +1,157 @@
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+    internal class DownloadWebEncryptAssetBundleOperation : DownloadAssetBundleOperation
+    {
+        private readonly bool _checkTimeout;
+        private readonly IWebDecryptionServices _decryptionServices;
+        private DownloadHandlerBuffer _downloadhandler;
+        private ESteps _steps = ESteps.None;
+
+        internal DownloadWebEncryptAssetBundleOperation(bool checkTimeout, IWebDecryptionServices decryptionServices, PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        {
+            _checkTimeout = checkTimeout;
+            _decryptionServices = decryptionServices;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                // 获取请求地址
+                _requestURL = GetRequestURL();
+
+                // 重置变量
+                ResetRequestFiled();
+
+                // 创建下载器
+                CreateWebRequest();
+
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = DownloadProgress;
+                if (_webRequest.isDone == false)
+                {
+                    if (_checkTimeout)
+                        CheckRequestTimeout();
+                    return;
+                }
+
+                // 检查网络错误
+                if (CheckRequestResult())
+                {
+                    if (_decryptionServices == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"The {nameof(IWebDecryptionServices)} is null !";
+                        YooLogger.Error(Error);
+                        return;
+                    }
+
+                    var fileData = _downloadhandler.data;
+                    if (fileData == null || fileData.Length == 0)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"The download handler data is null or empty !";
+                        YooLogger.Error(Error);
+                        return;
+                    }
+
+                    AssetBundle assetBundle = LoadEncryptedAssetBundle(fileData);
+                    if (assetBundle == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = "Download handler asset bundle object is null !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Result = assetBundle;
+                        Status = EOperationStatus.Succeed;
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.TryAgain;
+                }
+
+                // 注意：最终释放请求器
+                DisposeWebRequest();
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                if (FailedTryAgain <= 0)
+                {
+                    Status = EOperationStatus.Failed;
+                    _steps = ESteps.Done;
+                    YooLogger.Error(Error);
+                    return;
+                }
+
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    FailedTryAgain--;
+                    _steps = ESteps.CreateRequest;
+                    YooLogger.Warning(Error);
+                }
+            }
+        }
+        internal override void InternalOnAbort()
+        {
+            _steps = ESteps.Done;
+            DisposeWebRequest();
+        }
+
+        private void CreateWebRequest()
+        {
+            _downloadhandler = new DownloadHandlerBuffer();
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.downloadHandler = _downloadhandler;
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            _webRequest.SendWebRequest();
+        }
+        private void DisposeWebRequest()
+        {
+            if (_webRequest != null)
+            {
+                //注意：引擎底层会自动调用Abort方法
+                _webRequest.Dispose();
+                _webRequest = null;
+            }
+        }
+
+        /// <summary>
+        /// 加载加密资源文件
+        /// </summary>
+        private AssetBundle LoadEncryptedAssetBundle(byte[] fileData)
+        {
+            var fileInfo = new WebDecryptFileInfo();
+            fileInfo.BundleName = Bundle.BundleName;
+            fileInfo.FileLoadCRC = Bundle.UnityCRC;
+            fileInfo.FileData = fileData;
+            var decryptResult = _decryptionServices.LoadAssetBundle(fileInfo);
+            return decryptResult.Result;
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs.meta

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

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebNormalAssetBundleOperation.cs

@@ -3,16 +3,13 @@ using UnityEngine.Networking;
 
 namespace YooAsset
 {
-    internal class DownloadHandlerAssetBundleOperation : DefaultDownloadFileOperation
+    internal class DownloadWebNormalAssetBundleOperation : DownloadAssetBundleOperation
     {
         private readonly bool _disableUnityWebCache;
         private DownloadHandlerAssetBundle _downloadhandler;
         private ESteps _steps = ESteps.None;
 
-        public AssetBundle Result { private set; get; }
-
-
-        internal DownloadHandlerAssetBundleOperation(bool disableUnityWebCache, PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        internal DownloadWebNormalAssetBundleOperation(bool disableUnityWebCache, PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
             _disableUnityWebCache = disableUnityWebCache;
         }
@@ -55,12 +52,12 @@ namespace YooAsset
                 // 检查网络错误
                 if (CheckRequestResult())
                 {
-                    var assetBundle = _downloadhandler.assetBundle;
+                    AssetBundle assetBundle = _downloadhandler.assetBundle;
                     if (assetBundle == null)
                     {
                         _steps = ESteps.Done;
-                        Error = "Download handler asset bundle object is null !";
                         Status = EOperationStatus.Failed;
+                        Error = "Download handler asset bundle object is null !";
                     }
                     else
                     {
@@ -106,7 +103,7 @@ namespace YooAsset
 
         private void CreateWebRequest()
         {
-            _downloadhandler = CreateDownloadHandler();
+            _downloadhandler = CreateWebDownloadHandler();
             _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
             _webRequest.downloadHandler = _downloadhandler;
             _webRequest.disposeDownloadHandlerOnDispose = true;
@@ -121,7 +118,7 @@ namespace YooAsset
                 _webRequest = null;
             }
         }
-        private DownloadHandlerAssetBundle CreateDownloadHandler()
+        private DownloadHandlerAssetBundle CreateWebDownloadHandler()
         {
             if (_disableUnityWebCache)
             {

Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs

@@ -13,6 +13,11 @@ namespace YooAsset
         private static Stopwatch _watch;
         private static long _frameTime;
 
+        /// <summary>
+        /// 快速启动模式
+        /// </summary>
+        public static bool QuickStartMode = true;
+
         /// <summary>
         /// 异步操作的最小时间片段
         /// </summary>
@@ -136,6 +141,11 @@ namespace YooAsset
             _newList.Add(operation);
             operation.SetPackageName(packageName);
             operation.SetStart();
+
+            if (QuickStartMode)
+            {
+                operation.InternalOnUpdate();
+            }
         }
     }
 }

Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs

@@ -153,7 +153,22 @@ namespace YooAsset
             if (IsDone == false)
                 return false;
 
-            return RefCount <= 0;
+            if (RefCount > 0)
+                return false;
+
+            // YOOASSET_LEGACY_DEPENDENCY
+            // 检查引用链上的资源包是否已经全部销毁
+            // 注意：互相引用的资源包无法卸载！
+            if (LoadBundleInfo.Bundle.ReferenceBundleIDs.Count > 0)
+            {
+                foreach (var bundleID in LoadBundleInfo.Bundle.ReferenceBundleIDs)
+                {
+                    if (_resourceManager.CheckBundleDestroyed(bundleID) == false)
+                        return false;
+                }
+            }
+
+            return true;
         }
 
         /// <summary>

Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadAllAssetsOperation.cs

@@ -3,38 +3,88 @@ using UnityEngine;
 
 namespace YooAsset
 {
+    public sealed class UnloadAllAssetsOptions
+    {
+        /// <summary>
+        /// 释放所有资源句柄，防止卸载过程中触发完成回调！
+        /// </summary>
+        public bool ReleaseAllHandles = false;
+
+        /// <summary>
+        /// 卸载过程中锁定加载操作，防止新的任务请求！
+        /// </summary>
+        public bool LockLoadOperation = false;
+    }
+
     public sealed class UnloadAllAssetsOperation : AsyncOperationBase
     {
         private enum ESteps
         {
             None,
+            CheckOptions,
+            ReleaseAll,
             AbortDownload,
             CheckLoading,
-            UnloadAll,
+            DestroyAll,
             Done,
         }
 
         private readonly ResourceManager _resManager;
+        private readonly UnloadAllAssetsOptions _options;
         private ESteps _steps = ESteps.None;
 
-        internal UnloadAllAssetsOperation(ResourceManager resourceManager)
+        internal UnloadAllAssetsOperation(ResourceManager resourceManager, UnloadAllAssetsOptions options)
         {
             _resManager = resourceManager;
+            _options = options;
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.AbortDownload;
+            _steps = ESteps.CheckOptions;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckOptions)
+            {
+                if (_options == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"{nameof(UnloadAllAssetsOptions)} is null.";
+                    return;
+                }
+
+                // 设置锁定状态
+                if (_options.LockLoadOperation)
+                    _resManager.LockLoadOperation = true;
+
+                _steps = ESteps.ReleaseAll;
+            }
+
+            if (_steps == ESteps.ReleaseAll)
+            {
+                // 清空所有场景句柄
+                _resManager.SceneHandles.Clear();
+
+                // 释放所有资源句柄
+                if (_options.ReleaseAllHandles)
+                {
+                    foreach (var provider in _resManager.ProviderDic.Values)
+                    {
+                        provider.ReleaseAllHandles();
+                    }
+                }
+
+                _steps = ESteps.AbortDownload;
+            }
+
             if (_steps == ESteps.AbortDownload)
             {
                 // 注意：终止所有下载任务
-                var loaderDic = _resManager._loaderDic;
-                foreach (var loader in loaderDic.Values)
+                foreach (var loader in _resManager.LoaderDic.Values)
                 {
                     loader.AbortDownloadOperation();
                 }
@@ -44,44 +94,32 @@ namespace YooAsset
             if (_steps == ESteps.CheckLoading)
             {
                 // 注意：等待所有任务完成
-                var providerDic = _resManager._providerDic;
-                foreach (var provider in providerDic.Values)
+                foreach (var provider in _resManager.ProviderDic.Values)
                 {
                     if (provider.IsDone == false)
                         return;
                 }
-                _steps = ESteps.UnloadAll;
+                _steps = ESteps.DestroyAll;
             }
 
-            if (_steps == ESteps.UnloadAll)
+            if (_steps == ESteps.DestroyAll)
             {
-                var loaderDic = _resManager._loaderDic;
-                var providerDic = _resManager._providerDic;
-
-                // 清空所有场景句柄
-                _resManager._sceneHandles.Clear();
-
-                // 释放所有资源句柄
-                foreach (var provider in providerDic.Values)
-                {
-                    provider.ReleaseAllHandles();
-                }
-
                 // 强制销毁资源提供者
-                foreach (var provider in providerDic.Values)
+                foreach (var provider in _resManager.ProviderDic.Values)
                 {
                     provider.DestroyProvider();
                 }
 
                 // 强制销毁文件加载器
-                foreach (var loader in loaderDic.Values)
+                foreach (var loader in _resManager.LoaderDic.Values)
                 {
                     loader.DestroyLoader();
                 }
 
                 // 清空数据
-                providerDic.Clear();
-                loaderDic.Clear();
+                _resManager.ProviderDic.Clear();
+                _resManager.LoaderDic.Clear();
+                _resManager.LockLoadOperation = false;
 
                 // 注意：调用底层接口释放所有资源
                 Resources.UnloadUnusedAssets();

Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs

@@ -14,11 +14,13 @@ namespace YooAsset
         }
 
         private readonly ResourceManager _resManager;
+        private readonly int _loopCount;
         private ESteps _steps = ESteps.None;
 
-        internal UnloadUnusedAssetsOperation(ResourceManager resourceManager)
+        internal UnloadUnusedAssetsOperation(ResourceManager resourceManager, int loopCount)
         {
             _resManager = resourceManager;
+            _loopCount = loopCount;
         }
         internal override void InternalOnStart()
         {
@@ -31,36 +33,11 @@ namespace YooAsset
 
             if (_steps == ESteps.UnloadUnused)
             {
-                var loaderDic = _resManager._loaderDic;
-                var removeList = new List<LoadBundleFileOperation>(loaderDic.Count);
-
-                // 注意：优先销毁资源提供者
-                foreach (var loader in loaderDic.Values)
+                for (int i = 0; i < _loopCount; i++)
                 {
-                    loader.TryDestroyProviders();
+                    LoopUnloadUnused();
                 }
 
-                // 获取销毁列表
-                foreach (var loader in loaderDic.Values)
-                {
-                    if (loader.CanDestroyLoader())
-                    {
-                        removeList.Add(loader);
-                    }
-                }
-
-                // 销毁文件加载器
-                foreach (var loader in removeList)
-                {
-                    string bundleName = loader.LoadBundleInfo.Bundle.BundleName;
-                    loader.DestroyLoader();
-                    _resManager._loaderDic.Remove(bundleName);
-                }
-
-                // 注意：调用底层接口释放所有资源
-                if (removeList.Count > 0)
-                    Resources.UnloadUnusedAssets();
-
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Succeed;
             }
@@ -76,5 +53,36 @@ namespace YooAsset
                 }
             }
         }
+
+        /// <summary>
+        /// 说明：资源包之间会有深层的依赖链表，需要多次迭代才可以在单帧内卸载！
+        /// </summary>
+        private void LoopUnloadUnused()
+        {
+            var removeList = new List<LoadBundleFileOperation>(_resManager.LoaderDic.Count);
+
+            // 注意：优先销毁资源提供者
+            foreach (var loader in _resManager.LoaderDic.Values)
+            {
+                loader.TryDestroyProviders();
+            }
+
+            // 获取销毁列表
+            foreach (var loader in _resManager.LoaderDic.Values)
+            {
+                if (loader.CanDestroyLoader())
+                {
+                    removeList.Add(loader);
+                }
+            }
+
+            // 销毁文件加载器
+            foreach (var loader in removeList)
+            {
+                string bundleName = loader.LoadBundleInfo.Bundle.BundleName;
+                loader.DestroyLoader();
+                _resManager.LoaderDic.Remove(bundleName);
+            }
+        }
     }
 }

Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs

@@ -86,7 +86,7 @@ namespace YooAsset
 
                 // 依赖资源包加载器集合
                 var dependLoaders = manager.CreateDependBundleFileLoaders(assetInfo);
-                if(dependLoaders.Count > 0)
+                if (dependLoaders.Count > 0)
                     _bundleLoaders.AddRange(dependLoaders);
 
                 // 增加引用计数
@@ -286,7 +286,7 @@ namespace YooAsset
             return status;
         }
 
-        #region 调试信息相关
+        #region 调试信息
         /// <summary>
         /// 出生的场景
         /// </summary>
@@ -341,16 +341,15 @@ namespace YooAsset
         /// <summary>
         /// 获取资源包的调试信息列表
         /// </summary>
-        internal void GetBundleDebugInfos(List<DebugBundleInfo> output)
+        internal List<string> GetDebugDependBundles()
         {
+            List<string> result = new List<string>(_bundleLoaders.Count);
             foreach (var bundleLoader in _bundleLoaders)
             {
-                var bundleInfo = new DebugBundleInfo();
-                bundleInfo.BundleName = bundleLoader.LoadBundleInfo.Bundle.BundleName;
-                bundleInfo.RefCount = bundleLoader.RefCount;
-                bundleInfo.Status = bundleLoader.Status;
-                output.Add(bundleInfo);
+                var packageBundle = bundleLoader.LoadBundleInfo.Bundle;
+                result.Add(packageBundle.BundleName);
             }
+            return result;
         }
         #endregion
     }

Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs

@@ -9,9 +9,9 @@ namespace YooAsset
 {
     internal class ResourceManager
     {
-        internal readonly Dictionary<string, ProviderOperation> _providerDic = new Dictionary<string, ProviderOperation>(5000);
-        internal readonly Dictionary<string, LoadBundleFileOperation> _loaderDic = new Dictionary<string, LoadBundleFileOperation>(5000);
-        internal readonly List<SceneHandle> _sceneHandles = new List<SceneHandle>(100);
+        internal readonly Dictionary<string, ProviderOperation> ProviderDic = new Dictionary<string, ProviderOperation>(5000);
+        internal readonly Dictionary<string, LoadBundleFileOperation> LoaderDic = new Dictionary<string, LoadBundleFileOperation>(5000);
+        internal readonly List<SceneHandle> SceneHandles = new List<SceneHandle>(100);
         private long _sceneCreateIndex = 0;
         private IBundleQuery _bundleQuery;
 
@@ -20,6 +20,11 @@ namespace YooAsset
         /// </summary>
         public readonly string PackageName;
 
+        /// <summary>
+        /// 锁定加载操作
+        /// </summary>
+        public bool LockLoadOperation = false;
+
 
         public ResourceManager(string packageName)
         {
@@ -64,7 +69,7 @@ namespace YooAsset
                 {
                     string bundleName = mainLoader.LoadBundleInfo.Bundle.BundleName;
                     mainLoader.DestroyLoader();
-                    _loaderDic.Remove(bundleName);
+                    LoaderDic.Remove(bundleName);
                 }
             }
 
@@ -79,7 +84,7 @@ namespace YooAsset
                     {
                         string bundleName = dependLoader.LoadBundleInfo.Bundle.BundleName;
                         dependLoader.DestroyLoader();
-                        _loaderDic.Remove(bundleName);
+                        LoaderDic.Remove(bundleName);
                     }
                 }
             }
@@ -92,6 +97,15 @@ namespace YooAsset
         /// </summary>
         public SceneHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneParameters loadSceneParams, bool suspendLoad, uint priority)
         {
+            if (LockLoadOperation)
+            {
+                string error = $"The load operation locked !";
+                YooLogger.Error(error);
+                CompletedProvider completedProvider = new CompletedProvider(this, assetInfo);
+                completedProvider.SetCompletedWithError(error);
+                return completedProvider.CreateHandle<SceneHandle>();
+            }
+
             if (assetInfo.IsInvalid)
             {
                 YooLogger.Error($"Failed to load scene ! {assetInfo.Error}");
@@ -106,14 +120,14 @@ namespace YooAsset
             {
                 provider = new SceneProvider(this, providerGUID, assetInfo, loadSceneParams, suspendLoad);
                 provider.InitSpawnDebugInfo();
-                _providerDic.Add(providerGUID, provider);
+                ProviderDic.Add(providerGUID, provider);
                 OperationSystem.StartOperation(PackageName, provider);
             }
 
             provider.Priority = priority;
             var handle = provider.CreateHandle<SceneHandle>();
             handle.PackageName = PackageName;
-            _sceneHandles.Add(handle);
+            SceneHandles.Add(handle);
             return handle;
         }
 
@@ -122,6 +136,15 @@ namespace YooAsset
         /// </summary>
         public AssetHandle LoadAssetAsync(AssetInfo assetInfo, uint priority)
         {
+            if (LockLoadOperation)
+            {
+                string error = $"The load operation locked !";
+                YooLogger.Error(error);
+                CompletedProvider completedProvider = new CompletedProvider(this, assetInfo);
+                completedProvider.SetCompletedWithError(error);
+                return completedProvider.CreateHandle<AssetHandle>();
+            }
+
             if (assetInfo.IsInvalid)
             {
                 YooLogger.Error($"Failed to load asset ! {assetInfo.Error}");
@@ -136,7 +159,7 @@ namespace YooAsset
             {
                 provider = new AssetProvider(this, providerGUID, assetInfo);
                 provider.InitSpawnDebugInfo();
-                _providerDic.Add(providerGUID, provider);
+                ProviderDic.Add(providerGUID, provider);
                 OperationSystem.StartOperation(PackageName, provider);
             }
 
@@ -149,6 +172,15 @@ namespace YooAsset
         /// </summary>
         public SubAssetsHandle LoadSubAssetsAsync(AssetInfo assetInfo, uint priority)
         {
+            if (LockLoadOperation)
+            {
+                string error = $"The load operation locked !";
+                YooLogger.Error(error);
+                CompletedProvider completedProvider = new CompletedProvider(this, assetInfo);
+                completedProvider.SetCompletedWithError(error);
+                return completedProvider.CreateHandle<SubAssetsHandle>();
+            }
+
             if (assetInfo.IsInvalid)
             {
                 YooLogger.Error($"Failed to load sub assets ! {assetInfo.Error}");
@@ -163,7 +195,7 @@ namespace YooAsset
             {
                 provider = new SubAssetsProvider(this, providerGUID, assetInfo);
                 provider.InitSpawnDebugInfo();
-                _providerDic.Add(providerGUID, provider);
+                ProviderDic.Add(providerGUID, provider);
                 OperationSystem.StartOperation(PackageName, provider);
             }
 
@@ -176,6 +208,15 @@ namespace YooAsset
         /// </summary>
         public AllAssetsHandle LoadAllAssetsAsync(AssetInfo assetInfo, uint priority)
         {
+            if (LockLoadOperation)
+            {
+                string error = $"The load operation locked !";
+                YooLogger.Error(error);
+                CompletedProvider completedProvider = new CompletedProvider(this, assetInfo);
+                completedProvider.SetCompletedWithError(error);
+                return completedProvider.CreateHandle<AllAssetsHandle>();
+            }
+
             if (assetInfo.IsInvalid)
             {
                 YooLogger.Error($"Failed to load all assets ! {assetInfo.Error}");
@@ -190,7 +231,7 @@ namespace YooAsset
             {
                 provider = new AllAssetsProvider(this, providerGUID, assetInfo);
                 provider.InitSpawnDebugInfo();
-                _providerDic.Add(providerGUID, provider);
+                ProviderDic.Add(providerGUID, provider);
                 OperationSystem.StartOperation(PackageName, provider);
             }
 
@@ -203,6 +244,15 @@ namespace YooAsset
         /// </summary>
         public RawFileHandle LoadRawFileAsync(AssetInfo assetInfo, uint priority)
         {
+            if (LockLoadOperation)
+            {
+                string error = $"The load operation locked !";
+                YooLogger.Error(error);
+                CompletedProvider completedProvider = new CompletedProvider(this, assetInfo);
+                completedProvider.SetCompletedWithError(error);
+                return completedProvider.CreateHandle<RawFileHandle>();
+            }
+
             if (assetInfo.IsInvalid)
             {
                 YooLogger.Error($"Failed to load raw file ! {assetInfo.Error}");
@@ -217,7 +267,7 @@ namespace YooAsset
             {
                 provider = new RawFileProvider(this, providerGUID, assetInfo);
                 provider.InitSpawnDebugInfo();
-                _providerDic.Add(providerGUID, provider);
+                ProviderDic.Add(providerGUID, provider);
                 OperationSystem.StartOperation(PackageName, provider);
             }
 
@@ -245,12 +295,20 @@ namespace YooAsset
         {
             foreach (var provider in removeList)
             {
-                _providerDic.Remove(provider.ProviderGUID);
+                ProviderDic.Remove(provider.ProviderGUID);
             }
         }
+        internal bool CheckBundleDestroyed(int bundleID)
+        {
+            string bundleName = _bundleQuery.GetMainBundleName(bundleID);
+            var bundleFileLoader = TryGetBundleFileLoader(bundleName);
+            if (bundleFileLoader == null)
+                return true;
+            return bundleFileLoader.IsDestroyed;
+        }
         internal bool HasAnyLoader()
         {
-            return _loaderDic.Count > 0;
+            return LoaderDic.Count > 0;
         }
 
         private LoadBundleFileOperation CreateBundleFileLoaderInternal(BundleInfo bundleInfo)
@@ -264,19 +322,19 @@ namespace YooAsset
             // 新增下载需求
             loaderOperation = new LoadBundleFileOperation(this, bundleInfo);
             OperationSystem.StartOperation(PackageName, loaderOperation);
-            _loaderDic.Add(bundleName, loaderOperation);
+            LoaderDic.Add(bundleName, loaderOperation);
             return loaderOperation;
         }
         private LoadBundleFileOperation TryGetBundleFileLoader(string bundleName)
         {
-            if (_loaderDic.TryGetValue(bundleName, out LoadBundleFileOperation value))
+            if (LoaderDic.TryGetValue(bundleName, out LoadBundleFileOperation value))
                 return value;
             else
                 return null;
         }
         private ProviderOperation TryGetAssetProvider(string providerGUID)
         {
-            if (_providerDic.TryGetValue(providerGUID, out ProviderOperation value))
+            if (ProviderDic.TryGetValue(providerGUID, out ProviderOperation value))
                 return value;
             else
                 return null;
@@ -284,7 +342,7 @@ namespace YooAsset
         private void OnSceneUnloaded(Scene scene)
         {
             List<SceneHandle> removeList = new List<SceneHandle>();
-            foreach (var sceneHandle in _sceneHandles)
+            foreach (var sceneHandle in SceneHandles)
             {
                 if (sceneHandle.IsValid)
                 {
@@ -297,15 +355,23 @@ namespace YooAsset
             }
             foreach (var sceneHandle in removeList)
             {
-                _sceneHandles.Remove(sceneHandle);
+                SceneHandles.Remove(sceneHandle);
             }
         }
 
         #region 调试信息
-        internal List<DebugProviderInfo> GetDebugReportInfos()
+        internal DebugPackageData GetDebugPackageData()
         {
-            List<DebugProviderInfo> result = new List<DebugProviderInfo>(_providerDic.Count);
-            foreach (var provider in _providerDic.Values)
+            DebugPackageData data = new DebugPackageData();
+            data.PackageName = PackageName;
+            data.ProviderInfos = GetDebugProviderInfos();
+            data.BundleInfos = GetDebugBundleInfos();
+            return data;
+        }
+        internal List<DebugProviderInfo> GetDebugProviderInfos()
+        {
+            List<DebugProviderInfo> result = new List<DebugProviderInfo>(ProviderDic.Count);
+            foreach (var provider in ProviderDic.Values)
             {
                 DebugProviderInfo providerInfo = new DebugProviderInfo();
                 providerInfo.AssetPath = provider.MainAssetInfo.AssetPath;
@@ -314,12 +380,38 @@ namespace YooAsset
                 providerInfo.LoadingTime = provider.LoadingTime;
                 providerInfo.RefCount = provider.RefCount;
                 providerInfo.Status = provider.Status.ToString();
-                providerInfo.DependBundleInfos = new List<DebugBundleInfo>();
-                provider.GetBundleDebugInfos(providerInfo.DependBundleInfos);
+                providerInfo.DependBundles = provider.GetDebugDependBundles();
                 result.Add(providerInfo);
             }
             return result;
         }
+        internal List<DebugBundleInfo> GetDebugBundleInfos()
+        {
+            List<DebugBundleInfo> result = new List<DebugBundleInfo>(LoaderDic.Values.Count);
+            foreach (var bundleLoader in LoaderDic.Values)
+            {
+                var packageBundle = bundleLoader.LoadBundleInfo.Bundle;
+                var bundleInfo = new DebugBundleInfo();
+                bundleInfo.BundleName = packageBundle.BundleName;
+                bundleInfo.RefCount = bundleLoader.RefCount;
+                bundleInfo.Status = bundleLoader.Status;
+                bundleInfo.ReferenceBundles = FilterReferenceBundles(packageBundle);
+                result.Add(bundleInfo);
+            }
+            return result;
+        }
+        internal List<string> FilterReferenceBundles(PackageBundle packageBundle)
+        {
+            // 注意：引用的资源包不一定在内存中，所以需要过滤
+            var referenceBundles = packageBundle.GetDebugReferenceBundles();
+            List<string> result = new List<string>(referenceBundles.Count);
+            foreach (var bundleName in referenceBundles)
+            {
+                if (LoaderDic.ContainsKey(bundleName))
+                    result.Add(bundleName);
+            }
+            return result;
+        }
         #endregion
     }
 }

Assets/YooAsset/Runtime/ResourcePackage/EBuildBundleType.cs

@@ -1,7 +1,7 @@
 
 namespace YooAsset
 {
-    internal enum EBuildBundleType
+    public enum EBuildBundleType
     {
         /// <summary>
         /// 未知类型

Assets/YooAsset/Runtime/ResourcePackage/Interface/IBundleQuery.cs

@@ -13,6 +13,11 @@ namespace YooAsset
         /// </summary>
         BundleInfo[] GetDependBundleInfos(AssetInfo assetPath);
 
+        /// <summary>
+        /// 获取主资源包名称
+        /// </summary>
+        string GetMainBundleName(int bundleID);
+
         /// <summary>
         /// 获取主资源包名称
         /// </summary>

Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs

@@ -55,6 +55,7 @@ namespace YooAsset
                     buffer.WriteUTF8(packageAsset.AssetGUID);
                     buffer.WriteUTF8Array(packageAsset.AssetTags);
                     buffer.WriteInt32(packageAsset.BundleID);
+                    buffer.WriteInt32Array(packageAsset.DependBundleIDs);
                 }
 
                 // 写入资源包列表
@@ -69,7 +70,7 @@ namespace YooAsset
                     buffer.WriteInt64(packageBundle.FileSize);
                     buffer.WriteBool(packageBundle.Encrypted);
                     buffer.WriteUTF8Array(packageBundle.Tags);
-                    buffer.WriteInt32Array(packageBundle.DependIDs);
+                    buffer.WriteInt32Array(packageBundle.DependBundleIDs);
                 }
 
                 // 写入文件流
@@ -133,6 +134,7 @@ namespace YooAsset
                     packageAsset.AssetGUID = buffer.ReadUTF8();
                     packageAsset.AssetTags = buffer.ReadUTF8Array();
                     packageAsset.BundleID = buffer.ReadInt32();
+                    packageAsset.DependBundleIDs = buffer.ReadInt32Array();
                     FillAssetCollection(manifest, packageAsset);
                 }
 
@@ -149,7 +151,7 @@ namespace YooAsset
                     packageBundle.FileSize = buffer.ReadInt64();
                     packageBundle.Encrypted = buffer.ReadBool();
                     packageBundle.Tags = buffer.ReadUTF8Array();
-                    packageBundle.DependIDs = buffer.ReadInt32Array();
+                    packageBundle.DependBundleIDs = buffer.ReadInt32Array();
                     FillBundleCollection(manifest, packageBundle);
                 }
             }
@@ -177,6 +179,17 @@ namespace YooAsset
                     throw new Exception($"Invalid bundle id : {bundleID} Asset path : {packageAsset.AssetPath}");
                 }
             }
+
+            // 填充资源包引用关系
+            for (int index = 0; index < manifest.BundleList.Count; index++)
+            {
+                var sourceBundle = manifest.BundleList[index];
+                foreach (int dependIndex in sourceBundle.DependBundleIDs)
+                {
+                    var dependBundle = manifest.BundleList[dependIndex];
+                    dependBundle.AddReferenceBundleID(index);
+                }
+            }
         }
 
         public static void CreateAssetCollection(PackageManifest manifest, int assetCount)

Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs

@@ -112,6 +112,7 @@ namespace YooAsset
                         packageAsset.AssetGUID = _buffer.ReadUTF8();
                         packageAsset.AssetTags = _buffer.ReadUTF8Array();
                         packageAsset.BundleID = _buffer.ReadInt32();
+                        packageAsset.DependBundleIDs = _buffer.ReadInt32Array();
                         ManifestTools.FillAssetCollection(Manifest, packageAsset);
 
                         _packageAssetCount--;
@@ -145,7 +146,7 @@ namespace YooAsset
                         packageBundle.FileSize = _buffer.ReadInt64();
                         packageBundle.Encrypted = _buffer.ReadBool();
                         packageBundle.Tags = _buffer.ReadUTF8Array();
-                        packageBundle.DependIDs = _buffer.ReadInt32Array();
+                        packageBundle.DependBundleIDs = _buffer.ReadInt32Array();
                         ManifestTools.FillBundleCollection(Manifest, packageBundle);
 
                         _packageBundleCount--;

Assets/YooAsset/Runtime/ResourcePackage/PackageAsset.cs

@@ -32,10 +32,16 @@ namespace YooAsset
         public int BundleID;
 
         /// <summary>
-        /// 所属资源包名称（仅编辑器有效）
+        /// 依赖的资源包ID集合
+        /// 说明：框架层收集查询结果
+        /// </summary>
+        public int[] DependBundleIDs;
+
+        /// <summary>
+        /// 临时数据对象（仅编辑器有效）
         /// </summary>
         [NonSerialized]
-        public string BundleNameInEditor;
+        public object TempDataInEditor;
 
         /// <summary>
         /// 是否包含Tag

Assets/YooAsset/Runtime/ResourcePackage/PackageBundle.cs

@@ -44,8 +44,9 @@ namespace YooAsset
 
         /// <summary>
         /// 依赖的资源包ID集合
+        /// 注意：引擎层构建查询结果
         /// </summary>
-        public int[] DependIDs;
+        public int[] DependBundleIDs;
 
         /// <summary>
         /// 资源包GUID
@@ -58,7 +59,6 @@ namespace YooAsset
         /// <summary>
         /// 资源包类型
         /// </summary>
-        private int _bundleType;
         public int BundleType
         {
             get
@@ -66,11 +66,11 @@ namespace YooAsset
                 return _bundleType;
             }
         }
+        private int _bundleType;
 
         /// <summary>
         /// 文件名称
-        /// </summary>
-        private string _fileName;
+        /// </summary>  
         public string FileName
         {
             get
@@ -80,11 +80,11 @@ namespace YooAsset
                 return _fileName;
             }
         }
+        private string _fileName;
 
         /// <summary>
         /// 文件后缀名
         /// </summary>
-        private string _fileExtension;
         public string FileExtension
         {
             get
@@ -94,6 +94,7 @@ namespace YooAsset
                 return _fileExtension;
             }
         }
+        private string _fileExtension;
 
         /// <summary>
         /// 包含的主资源集合
@@ -101,6 +102,14 @@ namespace YooAsset
         [NonSerialized]
         public readonly List<PackageAsset> IncludeMainAssets = new List<PackageAsset>(10);
 
+        /// <summary>
+        /// 引用该资源包的资源包列表
+        /// 说明：谁引用了该资源包
+        /// </summary>
+        [NonSerialized]
+        public readonly List<int> ReferenceBundleIDs = new List<int>(10);
+        private readonly HashSet<int> _referenceBundleIDs = new HashSet<int>();
+
 
         public PackageBundle()
         {
@@ -111,11 +120,25 @@ namespace YooAsset
         /// </summary>
         public void InitBundle(PackageManifest manifest)
         {
+            _mainfest = manifest;
             _bundleType = manifest.BuildBundleType;
             _fileExtension = ManifestTools.GetRemoteBundleFileExtension(BundleName);
             _fileName = ManifestTools.GetRemoteBundleFileName(manifest.OutputNameStyle, BundleName, _fileExtension, FileHash);
         }
 
+        /// <summary>
+        /// 添加引用该资源包的资源包ID
+        /// 说明：谁引用了该资源包
+        /// </summary>
+        public void AddReferenceBundleID(int bundleID)
+        {
+            if (_referenceBundleIDs.Contains(bundleID) == false)
+            {
+                _referenceBundleIDs.Add(bundleID);
+                ReferenceBundleIDs.Add(bundleID);
+            }
+        }
+
         /// <summary>
         /// 是否包含Tag
         /// </summary>
@@ -155,5 +178,23 @@ namespace YooAsset
 
             return false;
         }
+
+        #region 调试信息
+        private PackageManifest _mainfest;
+        private List<string> _debugReferenceBundles;
+        public List<string> GetDebugReferenceBundles()
+        {
+            if (_debugReferenceBundles == null)
+            {
+                _debugReferenceBundles = new List<string>(ReferenceBundleIDs.Count);
+                foreach (int bundleID in ReferenceBundleIDs)
+                {
+                    var packageBundle = _mainfest.BundleList[bundleID];
+                    _debugReferenceBundles.Add(packageBundle.BundleName);
+                }
+            }
+            return _debugReferenceBundles;
+        }
+        #endregion
     }
 }

Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs

@@ -155,16 +155,7 @@ namespace YooAsset
         {
             if (AssetDic.TryGetValue(assetPath, out PackageAsset packageAsset))
             {
-                int bundleID = packageAsset.BundleID;
-                if (bundleID >= 0 && bundleID < BundleList.Count)
-                {
-                    var packageBundle = BundleList[bundleID];
-                    return packageBundle;
-                }
-                else
-                {
-                    throw new Exception($"Invalid bundle id : {bundleID} Asset path : {assetPath}");
-                }
+                return GetMainPackageBundle(packageAsset.BundleID);
             }
             else
             {
@@ -172,27 +163,43 @@ namespace YooAsset
             }
         }
 
+        /// <summary>
+        /// 获取主资源包
+        /// 注意：传入的资源包ID一定合法有效！
+        /// </summary>
+        public PackageBundle GetMainPackageBundle(int bundleID)
+        {
+            if (bundleID >= 0 && bundleID < BundleList.Count)
+            {
+                var packageBundle = BundleList[bundleID];
+                return packageBundle;
+            }
+            else
+            {
+                throw new Exception($"Invalid bundle id : {bundleID}");
+            }
+        }
+
         /// <summary>
         /// 获取资源依赖列表
         /// 注意：传入的资源路径一定合法有效！
         /// </summary>
         public PackageBundle[] GetAllDependencies(string assetPath)
         {
-            var packageBundle = GetMainPackageBundle(assetPath);
-            List<PackageBundle> result = new List<PackageBundle>(packageBundle.DependIDs.Length);
-            foreach (var dependID in packageBundle.DependIDs)
+            if (TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
             {
-                if (dependID >= 0 && dependID < BundleList.Count)
+                List<PackageBundle> result = new List<PackageBundle>(packageAsset.DependBundleIDs.Length);
+                foreach (var dependID in packageAsset.DependBundleIDs)
                 {
-                    var dependBundle = BundleList[dependID];
+                    var dependBundle = GetMainPackageBundle(dependID);
                     result.Add(dependBundle);
                 }
-                else
-                {
-                    throw new Exception($"Invalid bundle id : {dependID} Asset path : {assetPath}");
-                }
+                return result.ToArray();
+            }
+            else
+            {
+                throw new Exception("Should never get here !");
             }
-            return result.ToArray();
         }
 
         /// <summary>

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeImpl.cs

@@ -135,6 +135,12 @@ namespace YooAsset
             }
             return result.ToArray();
         }
+        string IBundleQuery.GetMainBundleName(int bundleID)
+        {
+            // 注意：如果清单里未找到资源包会抛出异常！
+            var packageBundle = ActiveManifest.GetMainPackageBundle(bundleID);
+            return packageBundle.BundleName;
+        }
         string IBundleQuery.GetMainBundleName(AssetInfo assetInfo)
         {
             if (assetInfo.IsInvalid)

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs

@@ -144,6 +144,12 @@ namespace YooAsset
             }
             return result.ToArray();
         }
+        string IBundleQuery.GetMainBundleName(int bundleID)
+        {
+            // 注意：如果清单里未找到资源包会抛出异常！
+            var packageBundle = ActiveManifest.GetMainPackageBundle(bundleID);
+            return packageBundle.BundleName;
+        }
         string IBundleQuery.GetMainBundleName(AssetInfo assetInfo)
         {
             if (assetInfo.IsInvalid)

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/OfflinePlayModeImpl.cs

@@ -135,6 +135,12 @@ namespace YooAsset
             }
             return result.ToArray();
         }
+        string IBundleQuery.GetMainBundleName(int bundleID)
+        {
+            // 注意：如果清单里未找到资源包会抛出异常！
+            var packageBundle = ActiveManifest.GetMainPackageBundle(bundleID);
+            return packageBundle.BundleName;
+        }
         string IBundleQuery.GetMainBundleName(AssetInfo assetInfo)
         {
             if (assetInfo.IsInvalid)

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs

@@ -163,6 +163,12 @@ namespace YooAsset
             }
             return result.ToArray();
         }
+        string IBundleQuery.GetMainBundleName(int bundleID)
+        {
+            // 注意：如果清单里未找到资源包会抛出异常！
+            var packageBundle = ActiveManifest.GetMainPackageBundle(bundleID);
+            return packageBundle.BundleName;
+        }
         string IBundleQuery.GetMainBundleName(AssetInfo assetInfo)
         {
             if (assetInfo.IsInvalid)

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -318,9 +318,19 @@ namespace YooAsset
         /// 强制回收所有资源
         /// </summary>
         public UnloadAllAssetsOperation UnloadAllAssetsAsync()
+        {
+            var options = new UnloadAllAssetsOptions();
+            return UnloadAllAssetsAsync(options);
+        }
+
+        /// <summary>
+        /// 强制回收所有资源
+        /// </summary>
+        /// <param name="options">卸载选项</param>
+        public UnloadAllAssetsOperation UnloadAllAssetsAsync(UnloadAllAssetsOptions options)
         {
             DebugCheckInitialize();
-            var operation = new UnloadAllAssetsOperation(_resourceManager);
+            var operation = new UnloadAllAssetsOperation(_resourceManager, options);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -329,10 +339,11 @@ namespace YooAsset
         /// 回收不再使用的资源
         /// 说明：卸载引用计数为零的资源
         /// </summary>
-        public UnloadUnusedAssetsOperation UnloadUnusedAssetsAsync()
+        /// <param name="loopCount">循环迭代次数</param>
+        public UnloadUnusedAssetsOperation UnloadUnusedAssetsAsync(int loopCount = 10)
         {
             DebugCheckInitialize();
-            var operation = new UnloadUnusedAssetsOperation(_resourceManager);
+            var operation = new UnloadUnusedAssetsOperation(_resourceManager, loopCount);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -1136,10 +1147,7 @@ namespace YooAsset
         #region 调试信息
         internal DebugPackageData GetDebugPackageData()
         {
-            DebugPackageData data = new DebugPackageData();
-            data.PackageName = PackageName;
-            data.ProviderInfos = _resourceManager.GetDebugReportInfos();
-            return data;
+            return _resourceManager.GetDebugPackageData();
         }
         #endregion
     }

Assets/YooAsset/Runtime/Services/IWebDecryptionServices.cs.meta

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

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -29,7 +29,7 @@ namespace YooAsset
         /// <summary>
         /// 清单文件格式版本
         /// </summary>
-        public const string ManifestFileVersion = "2.2.5";
+        public const string ManifestFileVersion = "2.3.1";
 
 
         /// <summary>

Assets/YooAsset/Runtime/YooAssets.cs

@@ -222,6 +222,15 @@ namespace YooAsset
             }
             OperationSystem.MaxTimeSlice = milliseconds;
         }
+
+        /// <summary>
+        /// 设置异步系统参数，快速启动模式的开关
+        /// 注意：该模式默认开启
+        /// </summary>
+        public static void SetOperationSystemQuickStartMode(bool state)
+        {
+            OperationSystem.QuickStartMode = state;
+        }
         #endregion
 
         #region 调试信息

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 879f2b393f883554899ab3345f0dc998
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs

@@ -0,0 +1,68 @@
+#if UNITY_WEBGL && DOUYINMINIGAME
+using System.IO;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using TTSDK;
+
+namespace YooAsset
+{
+    internal class TTAssetBundleResult : BundleResult
+    {
+        private readonly IFileSystem _fileSystem;
+        private readonly PackageBundle _packageBundle;
+        private readonly AssetBundle _assetBundle;
+        
+        public TTAssetBundleResult(IFileSystem fileSystem, PackageBundle packageBundle, AssetBundle assetBundle)
+        {
+            _fileSystem = fileSystem;
+            _packageBundle = packageBundle;
+            _assetBundle = assetBundle;
+        }
+
+        public override void UnloadBundleFile()
+        {
+            if (_assetBundle != null)
+            {
+                _assetBundle.TTUnload(true);
+            }
+        }
+        public override string GetBundleFilePath()
+        {
+            return _fileSystem.GetBundleFilePath(_packageBundle);
+        }
+        public override byte[] ReadBundleFileData()
+        {
+            return _fileSystem.ReadBundleFileData(_packageBundle);
+        }
+        public override string ReadBundleFileText()
+        {
+            return _fileSystem.ReadBundleFileText(_packageBundle);
+        }
+
+        public override FSLoadAssetOperation LoadAssetAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAssetOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadAllAssetsOperation LoadAllAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAllAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadSubAssetsOperation LoadSubAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadSubAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadSceneOperation LoadSceneOperation(AssetInfo assetInfo, LoadSceneParameters loadParams, bool suspendLoad)
+        {
+            var operation = new AssetBundleLoadSceneOperation(assetInfo, loadParams, suspendLoad);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs.meta

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

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs

@@ -7,7 +7,7 @@ internal class TTFSDownloadFileOperation : DefaultDownloadFileOperation
 {
     private TiktokFileSystem _fileSystem;
     private ESteps _steps = ESteps.None;
-    
+
     internal TTFSDownloadFileOperation(TiktokFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
     {
         _fileSystem = fileSystem;
@@ -84,7 +84,7 @@ internal class TTFSDownloadFileOperation : DefaultDownloadFileOperation
     private void CreateWebRequest()
     {
         //TODO : 抖音小游戏没有找到预下载方法
-        _webRequest = UnityWebRequestAssetBundle.GetAssetBundle(_requestURL);
+        _webRequest = UnityWebRequest.Get(_requestURL);
         _webRequest.disposeDownloadHandlerOnDispose = true;
         _webRequest.SendWebRequest();
     }

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs

@@ -3,16 +3,7 @@ using YooAsset;
 
 internal partial class TTFSInitializeOperation : FSInitializeFileSystemOperation
 {
-    private enum ESteps
-    {
-        None,
-        RecordCacheFiles,
-        Done,
-    }
-
     private readonly TiktokFileSystem _fileSystem;
-    private RecordTiktokCacheFilesOperation _recordTiktokCacheFilesOp;
-    private ESteps _steps = ESteps.None;
 
     public TTFSInitializeOperation(TiktokFileSystem fileSystem)
     {
@@ -20,36 +11,10 @@ internal partial class TTFSInitializeOperation : FSInitializeFileSystemOperation
     }
     internal override void InternalOnStart()
     {
-        _steps = ESteps.RecordCacheFiles;
+        Status = EOperationStatus.Succeed;
     }
     internal override void InternalOnUpdate()
     {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RecordCacheFiles)
-        {
-            if (_recordTiktokCacheFilesOp == null)
-            {
-                _recordTiktokCacheFilesOp = new RecordTiktokCacheFilesOperation(_fileSystem);
-                OperationSystem.StartOperation(_fileSystem.PackageName, _recordTiktokCacheFilesOp);
-            }
-
-            if (_recordTiktokCacheFilesOp.IsDone == false)
-                return;
-
-            if (_recordTiktokCacheFilesOp.Status == EOperationStatus.Succeed)
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _recordTiktokCacheFilesOp.Error;
-            }
-        }
     }
 }
 #endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs

@@ -2,20 +2,19 @@
 using UnityEngine;
 using UnityEngine.Networking;
 using YooAsset;
-using TTSDK;
 
 internal class TTFSLoadBundleOperation : FSLoadBundleOperation
 {
     private enum ESteps
     {
         None,
-        LoadBundleFile,
+        DownloadAssetBundle,
         Done,
     }
 
     private readonly TiktokFileSystem _fileSystem;
     private readonly PackageBundle _bundle;
-    private UnityWebRequest _webRequest;
+    private DownloadAssetBundleOperation _downloadAssetBundleOp;
     private ESteps _steps = ESteps.None;
 
     internal TTFSLoadBundleOperation(TiktokFileSystem fileSystem, PackageBundle bundle)
@@ -25,41 +24,52 @@ internal class TTFSLoadBundleOperation : FSLoadBundleOperation
     }
     internal override void InternalOnStart()
     {
-        _steps = ESteps.LoadBundleFile;
+        _steps = ESteps.DownloadAssetBundle;
     }
     internal override void InternalOnUpdate()
     {
         if (_steps == ESteps.None || _steps == ESteps.Done)
             return;
 
-        if (_steps == ESteps.LoadBundleFile)
+        if (_steps == ESteps.DownloadAssetBundle)
         {
-            if (_webRequest == null)
+            if (_downloadAssetBundleOp == null)
             {
-                string mainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
-                _webRequest = TTAssetBundle.GetAssetBundle(mainURL);
-                _webRequest.SendWebRequest();
+                DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
+                downloadParam.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName); ;
+                downloadParam.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
+
+                if (_bundle.Encrypted)
+                {
+                    _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(false, _fileSystem.DecryptionServices, _bundle, downloadParam);
+                    OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                }
+                else
+                {
+                    _downloadAssetBundleOp = new DownloadTiktokAssetBundleOperation(_bundle, downloadParam);
+                    OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                }
             }
 
-            DownloadProgress = _webRequest.downloadProgress;
-            DownloadedBytes = (long)_webRequest.downloadedBytes;
+            DownloadProgress = _downloadAssetBundleOp.DownloadProgress;
+            DownloadedBytes = (long)_downloadAssetBundleOp.DownloadedBytes;
             Progress = DownloadProgress;
-            if (_webRequest.isDone == false)
+            if (_downloadAssetBundleOp.IsDone == false)
                 return;
 
-            if (CheckRequestResult())
+            if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed)
             {
-                var assetBundle = (_webRequest.downloadHandler as DownloadHandlerTTAssetBundle).assetBundle;
+                var assetBundle = _downloadAssetBundleOp.Result;
                 if (assetBundle == null)
                 {
                     _steps = ESteps.Done;
-                    Error = $"{nameof(DownloadHandlerTTAssetBundle)} loaded asset bundle is null !";
                     Status = EOperationStatus.Failed;
+                    Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !";
                 }
                 else
                 {
                     _steps = ESteps.Done;
-                    Result = new AssetBundleResult(_fileSystem, _bundle, assetBundle, null);
+                    Result = new TTAssetBundleResult(_fileSystem, _bundle, assetBundle);
                     Status = EOperationStatus.Succeed;
                 }
             }
@@ -67,6 +77,7 @@ internal class TTFSLoadBundleOperation : FSLoadBundleOperation
             {
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
+                Error = _downloadAssetBundleOp.Error;
             }
         }
     }
@@ -82,31 +93,11 @@ internal class TTFSLoadBundleOperation : FSLoadBundleOperation
     }
     public override void AbortDownloadOperation()
     {
-    }
-
-    private bool CheckRequestResult()
-    {
-#if UNITY_2020_3_OR_NEWER
-        if (_webRequest.result != UnityWebRequest.Result.Success)
+        if (_steps == ESteps.DownloadAssetBundle)
         {
-            Error = _webRequest.error;
-            return false;
+            if (_downloadAssetBundleOp != null)
+                _downloadAssetBundleOp.SetAbort();
         }
-        else
-        {
-            return true;
-        }
-#else
-        if (_webRequest.isNetworkError || _webRequest.isHttpError)
-        {
-            Error = _webRequest.error;
-            return false;
-        }
-        else
-        {
-            return true;
-        }
-#endif
     }
 }
 #endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs

@@ -0,0 +1,127 @@
+#if UNITY_WEBGL && DOUYINMINIGAME
+using UnityEngine;
+using UnityEngine.Networking;
+using TTSDK;
+
+namespace YooAsset
+{
+    internal class DownloadTiktokAssetBundleOperation : DownloadAssetBundleOperation
+    {
+        private ESteps _steps = ESteps.None;
+        
+        internal DownloadTiktokAssetBundleOperation(PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        {
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                // 获取请求地址
+                _requestURL = GetRequestURL();
+
+                // 重置变量
+                ResetRequestFiled();
+
+                // 创建下载器
+                CreateWebRequest();
+
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = DownloadProgress;
+                if (_webRequest.isDone == false)
+                {
+                    //TODO 需要验证抖音插件请求器的下载进度
+                    //CheckRequestTimeout();
+                    return;
+                }
+
+                // 检查网络错误
+                if (CheckRequestResult())
+                {
+                    var downloadHanlder = (DownloadHandlerTTAssetBundle)_webRequest.downloadHandler;
+                    AssetBundle assetBundle = downloadHanlder.assetBundle;
+                    if (assetBundle == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = "Download handler asset bundle object is null !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Result = assetBundle;
+                        Status = EOperationStatus.Succeed;
+
+                        //TODO 需要验证抖音插件请求器的下载进度
+                        DownloadProgress = 1f;
+                        DownloadedBytes = Bundle.FileSize;
+                        Progress = 1f;
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.TryAgain;
+                }
+
+                // 注意：最终释放请求器
+                DisposeWebRequest();
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                if (FailedTryAgain <= 0)
+                {
+                    Status = EOperationStatus.Failed;
+                    _steps = ESteps.Done;
+                    YooLogger.Error(Error);
+                    return;
+                }
+
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    FailedTryAgain--;
+                    _steps = ESteps.CreateRequest;
+                    YooLogger.Warning(Error);
+                }
+            }
+        }
+        internal override void InternalOnAbort()
+        {
+            _steps = ESteps.Done;
+            DisposeWebRequest();
+        }
+
+        private void CreateWebRequest()
+        {
+            _webRequest = TTAssetBundle.GetAssetBundle(_requestURL);
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            _webRequest.SendWebRequest();
+        }
+        private void DisposeWebRequest()
+        {
+            if (_webRequest != null)
+            {
+                //注意：引擎底层会自动调用Abort方法
+                _webRequest.Dispose();
+                _webRequest = null;
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/DownloadTiktokAssetBundleOperation.cs.meta

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

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RecordTiktokCacheFilesOperation.cs

@@ -1,57 +0,0 @@
-#if UNITY_WEBGL && DOUYINMINIGAME
-using YooAsset;
-using TTSDK;
-
-internal class RecordTiktokCacheFilesOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RecordCacheFiles,
-        WaitResponse,
-        Done,
-    }
-
-    private readonly TiktokFileSystem _fileSystem;
-    private ESteps _steps = ESteps.None;
-
-    public RecordTiktokCacheFilesOperation(TiktokFileSystem fileSystem)
-    {
-        _fileSystem = fileSystem;
-    }
-    internal override void InternalOnStart()
-    {
-        _steps = ESteps.RecordCacheFiles;
-    }
-    internal override void InternalOnUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RecordCacheFiles)
-        {
-            _steps = ESteps.WaitResponse;
-
-            var fileSystemMgr = _fileSystem.GetFileSystemMgr();
-            var getSavedFileListParam = new GetSavedFileListParam();
-            getSavedFileListParam.success = (TTGetSavedFileListResponse response) =>
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
-                foreach (var fileInfo in response.fileList)
-                {
-                    //TODO 需要确认存储文件为Bundle文件
-                    _fileSystem.RecordBundleFile(fileInfo.filePath);
-                }
-            };
-            getSavedFileListParam.fail = (TTGetSavedFileListResponse response) =>
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = response.errMsg;
-            };
-            fileSystemMgr.GetSavedFileList(getSavedFileListParam);
-        }
-    }
-}
-#endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs

@@ -8,11 +8,20 @@ using System;
 
 public static class TiktokFileSystemCreater
 {
-    public static FileSystemParameters CreateByteGameFileSystemParameters(IRemoteServices remoteServices, string packageRoot)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
     {
         string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
-        fileSystemParams.AddParameter("REMOTE_SERVICES", remoteServices);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
+        return fileSystemParams;
+    }
+
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
+    {
+        string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension";
+        var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
         return fileSystemParams;
     }
 }
@@ -53,8 +62,7 @@ internal class TiktokFileSystem : IFileSystem
         }
     }
 
-    private readonly HashSet<string> _recorders = new HashSet<string>();
-    private readonly Dictionary<string, string> _cacheFilePaths = new Dictionary<string, string>(10000);
+    private readonly Dictionary<string, string> _cacheFilePathMapping = new Dictionary<string, string>(10000);
     private TTFileSystemManager _fileSystemMgr;
     private string _ttCacheRoot = string.Empty;
 
@@ -81,7 +89,7 @@ internal class TiktokFileSystem : IFileSystem
     {
         get
         {
-            return _recorders.Count;
+            return 0;
         }
     }
 
@@ -90,6 +98,11 @@ internal class TiktokFileSystem : IFileSystem
     /// 自定义参数：远程服务接口
     /// </summary>
     public IRemoteServices RemoteServices { private set; get; } = null;
+
+    /// <summary>
+    ///  自定义参数：解密方法类
+    /// </summary>
+    public IWebDecryptionServices DecryptionServices { private set; get; }
     #endregion
 
 
@@ -147,10 +160,14 @@ internal class TiktokFileSystem : IFileSystem
 
     public virtual void SetParameter(string name, object value)
     {
-        if (name == "REMOTE_SERVICES")
+        if (name == FileSystemParametersDefine.REMOTE_SERVICES)
         {
             RemoteServices = (IRemoteServices)value;
         }
+        else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
+        {
+            DecryptionServices = (IWebDecryptionServices)value;
+        }
         else
         {
             YooLogger.Warning($"Invalid parameter : {name}");
@@ -185,8 +202,7 @@ internal class TiktokFileSystem : IFileSystem
     }
     public virtual bool Exists(PackageBundle bundle)
     {
-        string filePath = GetCacheFileLoadPath(bundle);
-        return _recorders.Contains(filePath);
+        return CheckCacheFileExist(bundle);
     }
     public virtual bool NeedDownload(PackageBundle bundle)
     {
@@ -210,19 +226,27 @@ internal class TiktokFileSystem : IFileSystem
     }
     public virtual byte[] ReadBundleFileData(PackageBundle bundle)
     {
-        string filePath = GetCacheFileLoadPath(bundle);
-        if (CheckCacheFileExist(filePath))
+        if (CheckCacheFileExist(bundle))
+        {
+            string filePath = GetCacheFileLoadPath(bundle);
             return _fileSystemMgr.ReadFileSync(filePath);
+        }
         else
+        {
             return Array.Empty<byte>();
+        }
     }
     public virtual string ReadBundleFileText(PackageBundle bundle)
     {
-        string filePath = GetCacheFileLoadPath(bundle);
-        if (CheckCacheFileExist(filePath))
+        if (CheckCacheFileExist(bundle))
+        {
+            string filePath = GetCacheFileLoadPath(bundle);
             return _fileSystemMgr.ReadFileSync(filePath, "utf8");
+        }
         else
+        {
             return string.Empty;
+        }
     }
 
     #region 内部方法
@@ -230,56 +254,20 @@ internal class TiktokFileSystem : IFileSystem
     {
         return _fileSystemMgr;
     }
-    public bool CheckCacheFileExist(string filePath)
+    public bool CheckCacheFileExist(PackageBundle bundle)
     {
-        return _fileSystemMgr.AccessSync(filePath);
+        string url = RemoteServices.GetRemoteMainURL(bundle.FileName);
+        return _fileSystemMgr.IsUrlCached(url);
     }
     private string GetCacheFileLoadPath(PackageBundle bundle)
     {
-        if (_cacheFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+        if (_cacheFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
         {
             filePath = _fileSystemMgr.GetLocalCachedPathForUrl(bundle.FileName);
-            _cacheFilePaths.Add(bundle.BundleGUID, filePath);
+            _cacheFilePathMapping.Add(bundle.BundleGUID, filePath);
         }
         return filePath;
     }
     #endregion
-
-    #region 本地记录
-    public List<string> GetAllRecords()
-    {
-        return _recorders.ToList();
-    }
-    public bool RecordBundleFile(string filePath)
-    {
-        if (_recorders.Contains(filePath))
-        {
-            YooLogger.Error($"{nameof(TiktokFileSystem)} has element : {filePath}");
-            return false;
-        }
-
-        _recorders.Add(filePath);
-        return true;
-    }
-    public void TryRecordBundle(PackageBundle bundle)
-    {
-        string filePath = GetCacheFileLoadPath(bundle);
-        if (_recorders.Contains(filePath) == false)
-        {
-            _recorders.Add(filePath);
-        }
-    }
-    public void ClearAllRecords()
-    {
-        _recorders.Clear();
-    }
-    public void ClearRecord(string filePath)
-    {
-        if (_recorders.Contains(filePath))
-        {
-            _recorders.Remove(filePath);
-        }
-    }
-    #endregion
 }
 #endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearAllBundleFilesOperation.cs

@@ -42,7 +42,6 @@ internal class WXFSClearAllBundleFilesOperation : FSClearCacheFilesOperation
                     YooLogger.Log("微信缓存清理成功！");
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
-                    _fileSystem.ClearAllRecords();
                 }
                 else
                 {

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs

@@ -4,6 +4,7 @@ using System.IO;
 using UnityEngine;
 using YooAsset;
 using WeChatWASM;
+using static UnityEngine.Networking.UnityWebRequest;
 
 internal class WXFSClearUnusedBundleFilesAsync : FSClearCacheFilesOperation
 {
@@ -11,6 +12,7 @@ internal class WXFSClearUnusedBundleFilesAsync : FSClearCacheFilesOperation
     {
         None,
         GetUnusedCacheFiles,
+        WaitingSearch,
         ClearUnusedCacheFiles,
         Done,
     }
@@ -37,20 +39,46 @@ internal class WXFSClearUnusedBundleFilesAsync : FSClearCacheFilesOperation
 
         if (_steps == ESteps.GetUnusedCacheFiles)
         {
-            _unusedCacheFiles = GetUnusedCacheFiles();
-            _unusedFileTotalCount = _unusedCacheFiles.Count;
-            _steps = ESteps.ClearUnusedCacheFiles;
-            YooLogger.Log($"Found unused cache files count : {_unusedFileTotalCount}");
+            _steps = ESteps.WaitingSearch;
+
+            var fileSystemMgr = _fileSystem.GetFileSystemMgr();
+            var statOption = new WXStatOption();
+            statOption.path = _fileSystem.FileRoot;
+            statOption.recursive = true;
+            statOption.success = (WXStatResponse response) =>
+            {
+                foreach (var fileStat in response.stats)
+                {
+                    // 注意：存储文件必须按照Bundle文件哈希值存储！
+                    string bundleGUID = Path.GetFileNameWithoutExtension(fileStat.path);
+                    if (_manifest.TryGetPackageBundleByBundleGUID(bundleGUID, out PackageBundle value) == false)
+                    {
+                        string fullPath = WX.GetCachePath(fileStat.path);
+                        if (_unusedCacheFiles.Contains(fullPath) == false)
+                            _unusedCacheFiles.Add(fullPath);
+                    }
+                }
+
+                _steps = ESteps.ClearUnusedCacheFiles;
+                _unusedFileTotalCount = _unusedCacheFiles.Count;
+                YooLogger.Log($"Found unused cache files count : {_unusedFileTotalCount}");
+            };
+            statOption.fail = (WXStatResponse response) =>
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = response.errMsg;
+            };
+            fileSystemMgr.Stat(statOption);
         }
 
         if (_steps == ESteps.ClearUnusedCacheFiles)
         {
             for (int i = _unusedCacheFiles.Count - 1; i >= 0; i--)
             {
-                string clearFilePath = _unusedCacheFiles[i];
+                string filePath = _unusedCacheFiles[i];
                 _unusedCacheFiles.RemoveAt(i);
-                _fileSystem.ClearRecord(clearFilePath);
-                WX.RemoveFile(clearFilePath, null);
+                WX.RemoveFile(filePath, null);
 
                 if (OperationSystem.IsBusy)
                     break;
@@ -68,30 +96,5 @@ internal class WXFSClearUnusedBundleFilesAsync : FSClearCacheFilesOperation
             }
         }
     }
-
-    private List<string> GetUnusedCacheFiles()
-    {
-        var allRecords = _fileSystem.GetAllRecords();
-        List<string> result = new List<string>(allRecords.Count);
-        foreach (var filePath in allRecords)
-        {
-            // 如果存储文件名是按照Bundle文件哈希值存储
-            string bundleGUID = Path.GetFileNameWithoutExtension(filePath);
-            if (_manifest.TryGetPackageBundleByBundleGUID(bundleGUID, out PackageBundle value) == false)
-            {
-                result.Add(filePath);
-            }
-
-            // 如果存储文件名是按照Bundle文件名称存储
-            /*
-            string bundleName = Path.GetFileNameWithoutExtension(filePath);
-            if (_manifest.TryGetPackageBundleByBundleName(bundleName, out PackageBundle value) == false)
-            {
-                result.Add(filePath);
-            }
-            */
-        }
-        return result;
-    }
 }
 #endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs

@@ -42,7 +42,9 @@ internal class WXFSDownloadFileOperation : DefaultDownloadFileOperation
             Progress = DownloadProgress;
             if (_webRequest.isDone == false)
             {
-                CheckRequestTimeout();
+                //TODO 由于微信小游戏插件的问题，暂时不能判定超时！
+                // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108#
+                //CheckRequestTimeout();
                 return;
             }
 
@@ -51,7 +53,12 @@ internal class WXFSDownloadFileOperation : DefaultDownloadFileOperation
             {
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Succeed;
-                _fileSystem.TryRecordBundle(Bundle); //记录下载文件
+
+                //TODO 解决微信小游戏插件问题
+                // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108#
+                DownloadProgress = 1f;
+                DownloadedBytes = Bundle.FileSize;
+                Progress = 1f;
             }
             else
             {
@@ -85,7 +92,7 @@ internal class WXFSDownloadFileOperation : DefaultDownloadFileOperation
 
     private void CreateWebRequest()
     {
-        _webRequest = WXAssetBundle.GetAssetBundle(_requestURL);
+        _webRequest = UnityWebRequest.Get(_requestURL);
         _webRequest.SetRequestHeader("wechatminigame-preload", "1");
         _webRequest.disposeDownloadHandlerOnDispose = true;
         _webRequest.SendWebRequest();

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSInitializeOperation.cs

@@ -3,16 +3,7 @@ using YooAsset;
 
 internal partial class WXFSInitializeOperation : FSInitializeFileSystemOperation
 {
-    private enum ESteps
-    {
-        None,
-        RecordCacheFiles,
-        Done,
-    }
-
     private readonly WechatFileSystem _fileSystem;
-    private RecordWechatCacheFilesOperation _recordWechatCacheFilesOp;
-    private ESteps _steps = ESteps.None;
 
     public WXFSInitializeOperation(WechatFileSystem fileSystem)
     {
@@ -20,36 +11,10 @@ internal partial class WXFSInitializeOperation : FSInitializeFileSystemOperation
     }
     internal override void InternalOnStart()
     {
-        _steps = ESteps.RecordCacheFiles;
+        Status = EOperationStatus.Succeed;
     }
     internal override void InternalOnUpdate()
     {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RecordCacheFiles)
-        {
-            if (_recordWechatCacheFilesOp == null)
-            {
-                _recordWechatCacheFilesOp = new RecordWechatCacheFilesOperation(_fileSystem);
-                OperationSystem.StartOperation(_fileSystem.PackageName, _recordWechatCacheFilesOp);
-            }
-
-            if (_recordWechatCacheFilesOp.IsDone == false)
-                return;
-
-            if (_recordWechatCacheFilesOp.Status == EOperationStatus.Succeed)
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _recordWechatCacheFilesOp.Error;
-            }
-        }
     }
 }
 #endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs

@@ -1,21 +1,18 @@
 #if UNITY_WEBGL && WEIXINMINIGAME
-using UnityEngine;
-using UnityEngine.Networking;
 using YooAsset;
-using WeChatWASM;
 
 internal class WXFSLoadBundleOperation : FSLoadBundleOperation
 {
     private enum ESteps
     {
         None,
-        LoadBundleFile,
+        DownloadAssetBundle,
         Done,
     }
 
     private readonly WechatFileSystem _fileSystem;
     private readonly PackageBundle _bundle;
-    private UnityWebRequest _webRequest;
+    private DownloadAssetBundleOperation _downloadAssetBundleOp;
     private ESteps _steps = ESteps.None;
 
     internal WXFSLoadBundleOperation(WechatFileSystem fileSystem, PackageBundle bundle)
@@ -25,49 +22,60 @@ internal class WXFSLoadBundleOperation : FSLoadBundleOperation
     }
     internal override void InternalOnStart()
     {
-        _steps = ESteps.LoadBundleFile;
+        _steps = ESteps.DownloadAssetBundle;
     }
     internal override void InternalOnUpdate()
     {
         if (_steps == ESteps.None || _steps == ESteps.Done)
             return;
 
-        if (_steps == ESteps.LoadBundleFile)
+        if (_steps == ESteps.DownloadAssetBundle)
         {
-            if (_webRequest == null)
+            if (_downloadAssetBundleOp == null)
             {
-                string mainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
-                _webRequest = WXAssetBundle.GetAssetBundle(mainURL);
-                _webRequest.SendWebRequest();
+                DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
+                downloadParam.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName); ;
+                downloadParam.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
+
+                if (_bundle.Encrypted)
+                {
+                    _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(false, _fileSystem.DecryptionServices, _bundle, downloadParam);
+                    OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                }
+                else
+                {
+                    _downloadAssetBundleOp = new DownloadWechatAssetBundleOperation(_bundle, downloadParam);
+                    OperationSystem.StartOperation(_fileSystem.PackageName, _downloadAssetBundleOp);
+                }
             }
 
-            DownloadProgress = _webRequest.downloadProgress;
-            DownloadedBytes = (long)_webRequest.downloadedBytes;
+            DownloadProgress = _downloadAssetBundleOp.DownloadProgress;
+            DownloadedBytes = (long)_downloadAssetBundleOp.DownloadedBytes;
             Progress = DownloadProgress;
-            if (_webRequest.isDone == false)
+            if (_downloadAssetBundleOp.IsDone == false)
                 return;
 
-            if (CheckRequestResult())
+            if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed)
             {
-                var assetBundle = (_webRequest.downloadHandler as DownloadHandlerWXAssetBundle).assetBundle;
+                var assetBundle = _downloadAssetBundleOp.Result;
                 if (assetBundle == null)
                 {
                     _steps = ESteps.Done;
-                    Error = $"{nameof(DownloadHandlerWXAssetBundle)} loaded asset bundle is null !";
                     Status = EOperationStatus.Failed;
+                    Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !";
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Result = new WXAssetBundleResult(_fileSystem, _bundle, assetBundle);
                     Status = EOperationStatus.Succeed;
-                    _fileSystem.TryRecordBundle(_bundle); //记录下载文件
                 }
             }
             else
             {
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
+                Error = _downloadAssetBundleOp.Error;
             }
         }
     }
@@ -83,31 +91,11 @@ internal class WXFSLoadBundleOperation : FSLoadBundleOperation
     }
     public override void AbortDownloadOperation()
     {
-    }
-
-    private bool CheckRequestResult()
-    {
-#if UNITY_2020_3_OR_NEWER
-        if (_webRequest.result != UnityWebRequest.Result.Success)
+        if (_steps == ESteps.DownloadAssetBundle)
         {
-            Error = _webRequest.error;
-            return false;
+            if (_downloadAssetBundleOp != null)
+                _downloadAssetBundleOp.SetAbort();
         }
-        else
-        {
-            return true;
-        }
-#else
-        if (_webRequest.isNetworkError || _webRequest.isHttpError)
-        {
-            Error = _webRequest.error;
-            return false;
-        }
-        else
-        {
-            return true;
-        }
-#endif
     }
 }
 #endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs

@@ -0,0 +1,129 @@
+#if UNITY_WEBGL && WEIXINMINIGAME
+using UnityEngine;
+using UnityEngine.Networking;
+using WeChatWASM;
+
+namespace YooAsset
+{
+    internal class DownloadWechatAssetBundleOperation : DownloadAssetBundleOperation
+    {
+        private ESteps _steps = ESteps.None;
+
+        internal DownloadWechatAssetBundleOperation(PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        {
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                // 获取请求地址
+                _requestURL = GetRequestURL();
+
+                // 重置变量
+                ResetRequestFiled();
+
+                // 创建下载器
+                CreateWebRequest();
+
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = DownloadProgress;
+                if (_webRequest.isDone == false)
+                {
+                    //TODO 由于微信小游戏插件的问题，暂时不能判定超时！
+                    // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108#
+                    //CheckRequestTimeout();
+                    return;
+                }
+
+                // 检查网络错误
+                if (CheckRequestResult())
+                {
+                    var downloadHanlder = (DownloadHandlerWXAssetBundle)_webRequest.downloadHandler;
+                    AssetBundle assetBundle = downloadHanlder.assetBundle;
+                    if (assetBundle == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = "Download handler asset bundle object is null !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Result = assetBundle;
+                        Status = EOperationStatus.Succeed;
+
+                        //TODO 解决微信小游戏插件问题
+                        // Issue : https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/issues/108#
+                        DownloadProgress = 1f;
+                        DownloadedBytes = Bundle.FileSize;
+                        Progress = 1f;
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.TryAgain;
+                }
+
+                // 注意：最终释放请求器
+                DisposeWebRequest();
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                if (FailedTryAgain <= 0)
+                {
+                    Status = EOperationStatus.Failed;
+                    _steps = ESteps.Done;
+                    YooLogger.Error(Error);
+                    return;
+                }
+
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    FailedTryAgain--;
+                    _steps = ESteps.CreateRequest;
+                    YooLogger.Warning(Error);
+                }
+            }
+        }
+        internal override void InternalOnAbort()
+        {
+            _steps = ESteps.Done;
+            DisposeWebRequest();
+        }
+
+        private void CreateWebRequest()
+        {
+            _webRequest = WXAssetBundle.GetAssetBundle(_requestURL);
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            _webRequest.SendWebRequest();
+        }
+        private void DisposeWebRequest()
+        {
+            if (_webRequest != null)
+            {
+                //注意：引擎底层会自动调用Abort方法
+                _webRequest.Dispose();
+                _webRequest = null;
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/DownloadWechatAssetBundleOperation.cs.meta

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

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/internal/RecordWechatCacheFilesOperation.cs

@@ -1,58 +0,0 @@
-#if UNITY_WEBGL && WEIXINMINIGAME
-using YooAsset;
-using WeChatWASM;
-using System.IO;
-
-internal class RecordWechatCacheFilesOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RecordCacheFiles,
-        WaitResponse,
-        Done,
-    }
-
-    private readonly WechatFileSystem _fileSystem;
-    private ESteps _steps = ESteps.None;
-
-    public RecordWechatCacheFilesOperation(WechatFileSystem fileSystem)
-    {
-        _fileSystem = fileSystem;
-    }
-    internal override void InternalOnStart()
-    {
-        _steps = ESteps.RecordCacheFiles;
-    }
-    internal override void InternalOnUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RecordCacheFiles)
-        {
-            _steps = ESteps.WaitResponse;
-
-            var fileSystemMgr = _fileSystem.GetFileSystemMgr();
-            var getSavedFileListOption = new GetSavedFileListOption();
-            getSavedFileListOption.success = (GetSavedFileListSuccessCallbackResult response) =>
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
-                foreach (var fileInfo in response.fileList)
-                {
-                    //TODO 需要确认存储文件为Bundle文件
-                    _fileSystem.RecordBundleFile(fileInfo.filePath);
-                }
-            };
-            getSavedFileListOption.fail = (FileError fileError) =>
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = fileError.errMsg;
-            };
-            fileSystemMgr.GetSavedFileList(getSavedFileListOption);
-        }
-    }
-}
-#endif

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/WechatFileSystem.cs

@@ -8,11 +8,19 @@ using WeChatWASM;
 
 public static class WechatFileSystemCreater
 {
-    public static FileSystemParameters CreateWechatFileSystemParameters(IRemoteServices remoteServices, string packageRoot)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
     {
         string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
-        fileSystemParams.AddParameter("REMOTE_SERVICES", remoteServices);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
+        return fileSystemParams;
+    }
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
+    {
+        string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension";
+        var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
         return fileSystemParams;
     }
 }
@@ -53,8 +61,7 @@ internal class WechatFileSystem : IFileSystem
         }
     }
 
-    private readonly HashSet<string> _recorders = new HashSet<string>();
-    private readonly Dictionary<string, string> _cacheFilePaths = new Dictionary<string, string>(10000);
+    private readonly Dictionary<string, string> _cacheFilePathMapping = new Dictionary<string, string>(10000);
     private WXFileSystemManager _fileSystemMgr;
     private string _wxCacheRoot = string.Empty;
 
@@ -63,6 +70,8 @@ internal class WechatFileSystem : IFileSystem
     /// </summary>
     public string PackageName { private set; get; }
 
+    private readonly string _packageRoot = YooAssetSettingsData.Setting.DefaultYooFolderName;
+
     /// <summary>
     /// 文件根目录
     /// </summary>
@@ -81,7 +90,7 @@ internal class WechatFileSystem : IFileSystem
     {
         get
         {
-            return _recorders.Count;
+            return 0;
         }
     }
 
@@ -90,6 +99,11 @@ internal class WechatFileSystem : IFileSystem
     /// 自定义参数：远程服务接口
     /// </summary>
     public IRemoteServices RemoteServices { private set; get; } = null;
+
+    /// <summary>
+    ///  自定义参数：解密方法类
+    /// </summary>
+    public IWebDecryptionServices DecryptionServices { private set; get; }
     #endregion
 
 
@@ -163,25 +177,34 @@ internal class WechatFileSystem : IFileSystem
 
     public virtual void SetParameter(string name, object value)
     {
-        if (name == "REMOTE_SERVICES")
+        if (name == FileSystemParametersDefine.REMOTE_SERVICES)
         {
             RemoteServices = (IRemoteServices)value;
         }
+        else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
+        {
+            DecryptionServices = (IWebDecryptionServices)value;
+        }
         else
         {
             YooLogger.Warning($"Invalid parameter : {name}");
         }
     }
-    public virtual void OnCreate(string packageName, string rootDirectory)
+    public virtual void OnCreate(string packageName, string packageRoot)
     {
         PackageName = packageName;
-        _wxCacheRoot = rootDirectory;
+        _wxCacheRoot = packageRoot;
 
         if (string.IsNullOrEmpty(_wxCacheRoot))
         {
             throw new System.Exception("请配置微信小游戏缓存根目录！");
         }
 
+        if (_wxCacheRoot.StartsWith(WX.PluginCachePath) == false)
+        {
+            _wxCacheRoot = PathUtility.Combine(WX.PluginCachePath, _wxCacheRoot);
+        }
+
         // 注意：CDN服务未启用的情况下，使用微信WEB服务器
         if (RemoteServices == null)
         {
@@ -202,7 +225,7 @@ internal class WechatFileSystem : IFileSystem
     public virtual bool Exists(PackageBundle bundle)
     {
         string filePath = GetCacheFileLoadPath(bundle);
-        return _recorders.Contains(filePath);
+        return CheckCacheFileExist(filePath);
     }
     public virtual bool NeedDownload(PackageBundle bundle)
     {
@@ -248,55 +271,21 @@ internal class WechatFileSystem : IFileSystem
     }
     public bool CheckCacheFileExist(string filePath)
     {
-        string result = _fileSystemMgr.AccessSync(filePath);
-        return result.Equals("access:ok");
+        string result = WX.GetCachePath(filePath);
+        if (string.IsNullOrEmpty(result))
+            return false;
+        else
+            return true;
     }
     public string GetCacheFileLoadPath(PackageBundle bundle)
     {
-        if (_cacheFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+        if (_cacheFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
         {
             filePath = PathUtility.Combine(_wxCacheRoot, bundle.FileName);
-            _cacheFilePaths.Add(bundle.BundleGUID, filePath);
+            _cacheFilePathMapping.Add(bundle.BundleGUID, filePath);
         }
         return filePath;
     }
     #endregion
-
-    #region 本地记录
-    public List<string> GetAllRecords()
-    {
-        return _recorders.ToList();
-    }
-    public bool RecordBundleFile(string filePath)
-    {
-        if (_recorders.Contains(filePath))
-        {
-            YooLogger.Error($"{nameof(WechatFileSystem)} has element : {filePath}");
-            return false;
-        }
-
-        _recorders.Add(filePath);
-        return true;
-    }
-    public void TryRecordBundle(PackageBundle bundle)
-    {
-        string filePath = GetCacheFileLoadPath(bundle);
-        if (_recorders.Contains(filePath) == false)
-        {
-            _recorders.Add(filePath);
-        }
-    }
-    public void ClearAllRecords()
-    {
-        _recorders.Clear();
-    }
-    public void ClearRecord(string filePath)
-    {
-        if (_recorders.Contains(filePath))
-        {
-            _recorders.Remove(filePath);
-        }
-    }
-    #endregion
 }
 #endif

Assets/YooAsset/Samples~/Space Shooter/GameScript/Editor/TextureSchema.cs

@@ -1,14 +1,12 @@
-using System.Collections;
+#if UNITY_2019_4_OR_NEWER
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEditor;
 using YooAsset.Editor;
-
-#if UNITY_2019_4_OR_NEWER
 using UnityEditor.UIElements;
 using UnityEngine.UIElements;
-#endif
 
 [CreateAssetMenu(fileName = "TextureSchema", menuName = "YooAssetArt/Create TextureSchema")]
 public class TextureSchema : ScannerSchema
@@ -23,6 +21,12 @@ public class TextureSchema : ScannerSchema
     /// </summary>
     public int MaxHeight = 1024;
 
+    /// <summary>
+    /// 测试列表
+    /// </summary>
+    public List<string> TestStringValues = new List<string>();
+    
+
     /// <summary>
     /// 获取用户指南信息
     /// </summary>
@@ -37,9 +41,9 @@ public class TextureSchema : ScannerSchema
     public override ScanReport RunScanner(AssetArtScanner scanner)
     {
         // 创建扫描报告
-        string title = "扫描所有纹理资产";
+        string name = "扫描所有纹理资产";
         string desc = GetUserGuide();
-        var report = new ScanReport(title, desc);
+        var report = new ScanReport(name, desc);
         report.AddHeader("资源路径", 600, 500, 1000).SetStretchable().SetSearchable().SetSortable().SetHeaderType(EHeaderType.AssetPath);
         report.AddHeader("图片宽度", 100).SetSortable().SetHeaderType(EHeaderType.LongValue);
         report.AddHeader("图片高度", 100).SetSortable().SetHeaderType(EHeaderType.LongValue);
@@ -105,9 +109,9 @@ public class TextureSchema : ScannerSchema
         // 添加扫描信息
         ReportElement result = new ReportElement(assetGUID);
         result.AddScanInfo("资源路径", assetPath);
-        result.AddScanInfo("图片宽度", texture.width.ToString());
-        result.AddScanInfo("图片高度", texture.height.ToString());
-        result.AddScanInfo("内存大小", memorySize.ToString());
+        result.AddScanInfo("图片宽度", texture.width);
+        result.AddScanInfo("图片高度", texture.height);
+        result.AddScanInfo("内存大小", memorySize);
         result.AddScanInfo("苹果格式", iosFormat.ToString());
         result.AddScanInfo("安卓格式", androidFormat.ToString());
         result.AddScanInfo("错误信息", errorInfo);
@@ -157,7 +161,6 @@ public class TextureSchema : ScannerSchema
     /// </summary>
     public override SchemaInspector CreateInspector()
     {
-#if UNITY_2019_4_OR_NEWER
         var container = new VisualElement();
 
         // 图片最大宽度
@@ -180,11 +183,16 @@ public class TextureSchema : ScannerSchema
         });
         container.Add(maxHeightField);
 
-        SchemaInspector inspector = new SchemaInspector();
-        inspector.Containner = container;
-        return inspector;
-#else
-        return null;
+        // 创建测试列表
+#if UNITY_2021_3_OR_NEWER
+        ReorderableListView reorderableListView = new ReorderableListView();
+        reorderableListView.SourceData = TestStringValues;
+        reorderableListView.HeaderName = "测试列表";
+        container.Add(reorderableListView);
 #endif
+
+        SchemaInspector inspector = new SchemaInspector(container);
+        return inspector;
     }
-}
+}
+#endif

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/GameLogic/SceneBattle.cs

@@ -19,8 +19,7 @@ internal class SceneBattle : MonoBehaviour
         _windowHandle.InstantiateSync(CanvasDesktop.transform);
 
         // 加载背景音乐
-        var package = YooAssets.GetPackage("DefaultPackage");
-        _musicHandle = package.LoadAssetAsync<AudioClip>("music_background");
+        _musicHandle = YooAssets.LoadAssetAsync<AudioClip>("music_background");
         yield return _musicHandle;
 
         // 播放背景音乐
@@ -29,6 +28,11 @@ internal class SceneBattle : MonoBehaviour
         audioSource.clip = _musicHandle.AssetObject as AudioClip;
         audioSource.Play();
 
+        // 切换场景的时候释放资源
+        var package = YooAssets.GetPackage("DefaultPackage");
+        var operation = package.UnloadUnusedAssetsAsync();
+        yield return operation;
+
         _battleRoom = new BattleRoom();
         _battleRoom.IntRoom();
     }

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/GameLogic/SceneHome.cs

@@ -9,11 +9,16 @@ public class SceneHome : MonoBehaviour
     private AssetHandle _windowHandle;
 
     private IEnumerator Start()
-    {        
+    {
         // 加载主页面
         _windowHandle = YooAssets.LoadAssetAsync<GameObject>("UIHome");
         yield return _windowHandle;
         _windowHandle.InstantiateSync(CanvasDesktop.transform);
+
+        // 切换场景的时候释放资源
+        var package = YooAssets.GetPackage("DefaultPackage");
+        var operation = package.UnloadUnusedAssetsAsync();
+        yield return operation;
     }
 
     private void OnDestroy()
@@ -24,13 +29,5 @@ public class SceneHome : MonoBehaviour
             _windowHandle.Release();
             _windowHandle = null;
         }
-
-        // 切换场景的时候释放资源
-        if (YooAssets.Initialized)
-        {
-            var package = YooAssets.GetPackage("DefaultPackage");
-            var operation = package.UnloadUnusedAssetsAsync();
-            operation.WaitForAsyncComplete();
-        }
     }
 }

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitializePackage.cs

@@ -74,10 +74,11 @@ internal class FsmInitializePackage : IStateNode
 #if UNITY_WEBGL && WEIXINMINIGAME && !UNITY_EDITOR
 			string defaultHostServer = GetHostServerURL();
             string fallbackHostServer = GetHostServerURL();
+            string packageRoot = $"{WeChatWASM.WX.env.USER_DATA_PATH}/__GAME_FILE_CACHE"; //注意：如果有子目录，请修改此处！
             IRemoteServices remoteServices = new RemoteServices(defaultHostServer, fallbackHostServer);
-            createParameters.WebServerFileSystemParameters = WechatFileSystemCreater.CreateWechatFileSystemParameters(remoteServices);
+            createParameters.WebServerFileSystemParameters = WechatFileSystemCreater.CreateFileSystemParameters(packageRoot, remoteServices);
 #else
-            createParameters.WebServerFileSystemParameters = FileSystemParameters.CreateDefaultWebServerFileSystemParameters();
+            createParameters.WebServerFileSystemParameters = FileSystemParameters.CreateDefaultWebServerFileSystemParameters(new WebDecryption());
 #endif
             initializationOperation = package.InitializeAsync(createParameters);
         }
@@ -148,4 +149,24 @@ internal class FsmInitializePackage : IStateNode
             return $"{_fallbackHostServer}/{fileName}";
         }
     }
+
+    private class WebDecryption : IWebDecryptionServices
+    {
+        public const byte KEY = 64;
+
+        public WebDecryptResult LoadAssetBundle(WebDecryptFileInfo fileInfo)
+        {
+            byte[] copyData = new byte[fileInfo.FileData.Length];
+            Buffer.BlockCopy(fileInfo.FileData, 0, copyData, 0, fileInfo.FileData.Length);
+
+            for (int i = 0; i < copyData.Length; i++)
+            {
+                copyData[i] ^= KEY;
+            }
+
+            WebDecryptResult decryptResult = new WebDecryptResult();
+            decryptResult.Result = AssetBundle.LoadFromMemory(copyData);
+            return decryptResult;
+        }
+    }
 }

Assets/YooAsset/Samples~/Space Shooter/GameSetting/AssetBundleCollectorSetting.asset

@@ -26,7 +26,7 @@ MonoBehaviour:
     Groups:
     - GroupName: battle
       GroupDesc: "\u6218\u6597"
-      AssetTags: 
+      AssetTags: battle
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Samples/Space Shooter/GameRes/Effect
@@ -92,7 +92,7 @@ MonoBehaviour:
         UserData: 
     - GroupName: scene
       GroupDesc: "\u573A\u666F"
-      AssetTags: 
+      AssetTags: scene
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Samples/Space Shooter/GameRes/Scene
@@ -113,7 +113,7 @@ MonoBehaviour:
         UserData: 
     - GroupName: ugui
       GroupDesc: "\u9762\u677F"
-      AssetTags: 
+      AssetTags: ui
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Samples/Space Shooter/GameRes/UIPanel

Assets/YooAsset/Samples~/Space Shooter/GameSetting/ScannerSchema/EffectTextureSchema.asset

@@ -14,3 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   MaxWidth: 1024
   MaxHeight: 1024
+  TestStringValues:
+  - test1
+  - test2
+  - test3