Update CHANGELOG.md

快速启动模式

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,49 @@
 
 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

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)
+            RefreshInspector(scanSchema);
-            {
-                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);
-                    }
-                }
-            }
 
             // 设置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/AssetBundleBuilder/BuildParameters.cs

@@ -51,6 +51,12 @@ namespace YooAsset.Editor
         /// </summary>
         public string PackageNote;
 
+        /// <summary>
+        /// 旧版依赖模式
+        /// 说明：兼容YooAssets1.5.x版本
+        /// </summary>
+        public bool LegacyDependency = false;
+
         /// <summary>
         /// 清空构建缓存文件
         /// </summary>

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

@@ -31,6 +31,7 @@ namespace YooAsset.Editor
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
             manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
+            manifest.LegacyDependency = buildParameters.LegacyDependency;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
@@ -43,8 +44,8 @@ namespace YooAsset.Editor
             manifest.AssetList = CreatePackageAssetList(buildMapContext);
             manifest.BundleList = CreatePackageBundleList(buildMapContext);
 
-            // 处理资源清单的ID数据
+            // 处理资源清单的资源对象
-            ProcessPacakgeIDs(manifest);
+            ProcessPacakgeAsset(manifest);
 
             // 处理资源包的依赖列表
             if (processBundleDepends)
@@ -54,6 +55,14 @@ namespace YooAsset.Editor
             if (processBundleTags)
                 ProcessBundleTags(manifest);
 
+            #region YOOASSET_LEGACY_DEPENDENCY
+            if (buildParameters.LegacyDependency)
+            {
+                if (processBundleDepends)
+                    ProcessLegacyDependency(context, manifest);
+            }
+            #endregion
+
             // 创建补丁清单文本文件
             {
                 string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
@@ -137,7 +146,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 +174,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 +185,11 @@ namespace YooAsset.Editor
                 _cachedBundleIndexIDs.Add(bundleName, index);
             }
 
+            // 记录资源对象所属的资源包ID
             foreach (var packageAsset in manifest.AssetList)
             {
-                string bundleName = packageAsset.BundleNameInEditor;
+                var assetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
-                packageAsset.BundleID = GetCachedBundleIndexID(bundleName);
+                packageAsset.BundleID = GetCachedBundleIndexID(assetInfo.BundleName);
             }
         }
 
@@ -192,7 +202,7 @@ namespace YooAsset.Editor
             foreach (var packageBundle in manifest.BundleList)
             {
                 int mainBundleID = GetCachedBundleIndexID(packageBundle.BundleName);
-                var depends = GetBundleDepends(context, packageBundle.BundleName);
+                string[] depends = GetBundleDepends(context, packageBundle.BundleName);
                 List<int> dependIDs = new List<int>(depends.Length);
                 foreach (var dependBundleName in depends)
                 {
@@ -264,5 +274,140 @@ namespace YooAsset.Editor
             }
             return value;
         }
+
+        /// <summary>
+        /// 是否包含该资源包的索引ID
+        /// </summary>
+        private bool ContainsCachedBundleIndexID(string bundleName)
+        {
+            return _cachedBundleIndexIDs.ContainsKey(bundleName);
+        }
+
+        #region YOOASSET_LEGACY_DEPENDENCY
+        private class DependencyQuery
+        {
+            private readonly HashSet<int> _dependIDs;
+
+            public DependencyQuery(int[] dependIDs)
+            {
+                _dependIDs = new HashSet<int>(dependIDs);
+            }
+            public bool Contains(int bundleID)
+            {
+                return _dependIDs.Contains(bundleID);
+            }
+        }
+        private void ProcessLegacyDependency(BuildContext context, PackageManifest manifest)
+        {
+            foreach (var packageBundle in manifest.BundleList)
+            {
+                var dependIDs = packageBundle.DependIDs;
+                packageBundle.TempDataInEditor = new DependencyQuery(dependIDs);
+            }
+
+            // 记录资源对象依赖的资源包ID集合
+            // 注意：依赖关系非引擎构建结果里查询！
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                var mainAssetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
+                packageAsset.DependBundleIDs = GetAssetDependBundleIDs(mainAssetInfo);
+            }
+
+            // 记录引用该资源包的资源包ID集合
+            foreach (var packageBundle in manifest.BundleList)
+            {
+                packageBundle.ReferenceBundleIDs = GetBundleReferenceBundleIDs(manifest, packageBundle);
+            }
+
+            // 注意：如果是可编程构建管线，需要补充内置资源包
+            // 注意：该步骤依赖前面的操作！
+            var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
+            if (buildResultContext != null)
+            {
+                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);
+                    }
+                }
+            }
+            return result.ToArray();
+        }
+        private int[] GetBundleReferenceBundleIDs(PackageManifest manifest, PackageBundle queryBundle)
+        {
+            int queryBundleID = GetCachedBundleIndexID(queryBundle.BundleName);
+            List<int> result = new List<int>();
+            foreach (var packageBundle in manifest.BundleList)
+            {
+                if (packageBundle == queryBundle)
+                    continue;
+
+                var dependencyQuery = packageBundle.TempDataInEditor as DependencyQuery;
+                if (dependencyQuery.Contains(queryBundleID))
+                {
+                    int referenceBundleID = GetCachedBundleIndexID(packageBundle.BundleName);
+                    if (result.Contains(referenceBundleID) == false)
+                        result.Add(referenceBundleID);
+                }
+            }
+            return result.ToArray();
+        }
+        #endregion
     }
 }

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

@@ -42,6 +42,7 @@ namespace YooAsset.Editor
                 buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders;
 
                 // 构建参数
+                buildReport.Summary.LegacyDependency = buildParameters.LegacyDependency;
                 buildReport.Summary.ClearBuildCacheFiles = buildParameters.ClearBuildCacheFiles;
                 buildReport.Summary.UseAssetDependencyDB = buildParameters.UseAssetDependencyDB;
                 buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;

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/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs

@@ -37,6 +37,7 @@ namespace YooAsset.Editor
             buildParameters.BuildTarget = BuildTarget;
             buildParameters.PackageName = PackageName;
             buildParameters.PackageVersion = GetPackageVersion();
+            buildParameters.LegacyDependency = false;
             buildParameters.EnableSharePackRule = true;
             buildParameters.VerifyBuildingResult = true;
             buildParameters.FileNameStyle = fileNameStyle;

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs

@@ -38,6 +38,7 @@ namespace YooAsset.Editor
             buildParameters.BuildTarget = BuildTarget;
             buildParameters.PackageName = PackageName;
             buildParameters.PackageVersion = GetPackageVersion();
+            buildParameters.LegacyDependency = false;
             buildParameters.EnableSharePackRule = true;
             buildParameters.VerifyBuildingResult = true;
             buildParameters.FileNameStyle = fileNameStyle;

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/AssetBundleReporter/ReportSummary.cs

@@ -67,6 +67,7 @@ namespace YooAsset.Editor
         public string IgnoreRuleName;
 
         // 构建参数
+        public bool LegacyDependency;
         public bool ClearBuildCacheFiles;
         public bool UseAssetDependencyDB;
         public bool EnableSharePackRule;

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

@@ -75,9 +75,10 @@ namespace YooAsset.Editor
             _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}"));
-
+            
             _items.Add(new ItemWrapper(string.Empty, string.Empty));
             _items.Add(new ItemWrapper("Build Params", string.Empty));
+            _items.Add(new ItemWrapper("Legacy Dependency Mode", $"{buildReport.Summary.LegacyDependency}"));
             _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}"));

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

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

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/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;

Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs

@@ -109,6 +109,7 @@ namespace YooAsset
         /// <summary>
         /// 创建默认的WebServer文件系统参数
         /// </summary>
+        /// <param name="decryptionServices">加密文件解密服务类</param>
         /// <param name="disableUnityWebCache">禁用Unity的网络缓存</param>
         public static FileSystemParameters CreateDefaultWebServerFileSystemParameters(IWebDecryptionServices decryptionServices = null, bool disableUnityWebCache = false)
         {
@@ -123,6 +124,7 @@ namespace YooAsset
         /// 创建默认的WebRemote文件系统参数
         /// </summary>
         /// <param name="remoteServices">远端资源地址查询服务类</param>
+        /// <param name="decryptionServices">加密文件解密服务类</param>
         /// <param name="disableUnityWebCache">禁用Unity的网络缓存</param>
         public static FileSystemParameters CreateDefaultWebRemoteFileSystemParameters(IRemoteServices remoteServices, IWebDecryptionServices decryptionServices = null, bool disableUnityWebCache = false)
         {

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

Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs

@@ -298,6 +298,14 @@ namespace YooAsset
                 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;

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

@@ -35,6 +35,7 @@ namespace YooAsset
                 buffer.WriteUTF8(manifest.FileVersion);
 
                 // 写入文件头信息
+                buffer.WriteBool(manifest.LegacyDependency);
                 buffer.WriteBool(manifest.EnableAddressable);
                 buffer.WriteBool(manifest.LocationToLower);
                 buffer.WriteBool(manifest.IncludeAssetGUID);
@@ -55,6 +56,7 @@ namespace YooAsset
                     buffer.WriteUTF8(packageAsset.AssetGUID);
                     buffer.WriteUTF8Array(packageAsset.AssetTags);
                     buffer.WriteInt32(packageAsset.BundleID);
+                    buffer.WriteInt32Array(packageAsset.DependBundleIDs);
                 }
 
                 // 写入资源包列表
@@ -70,6 +72,7 @@ namespace YooAsset
                     buffer.WriteBool(packageBundle.Encrypted);
                     buffer.WriteUTF8Array(packageBundle.Tags);
                     buffer.WriteInt32Array(packageBundle.DependIDs);
+                    buffer.WriteInt32Array(packageBundle.ReferenceBundleIDs);
                 }
 
                 // 写入文件流
@@ -108,6 +111,7 @@ namespace YooAsset
             {
                 // 读取文件头信息
                 manifest.FileVersion = fileVersion;
+                manifest.LegacyDependency = buffer.ReadBool();
                 manifest.EnableAddressable = buffer.ReadBool();
                 manifest.LocationToLower = buffer.ReadBool();
                 manifest.IncludeAssetGUID = buffer.ReadBool();
@@ -133,6 +137,7 @@ namespace YooAsset
                     packageAsset.AssetGUID = buffer.ReadUTF8();
                     packageAsset.AssetTags = buffer.ReadUTF8Array();
                     packageAsset.BundleID = buffer.ReadInt32();
+                    packageAsset.DependBundleIDs = buffer.ReadInt32Array();
                     FillAssetCollection(manifest, packageAsset);
                 }
 
@@ -150,6 +155,7 @@ namespace YooAsset
                     packageBundle.Encrypted = buffer.ReadBool();
                     packageBundle.Tags = buffer.ReadUTF8Array();
                     packageBundle.DependIDs = buffer.ReadInt32Array();
+                    packageBundle.ReferenceBundleIDs = buffer.ReadInt32Array();
                     FillBundleCollection(manifest, packageBundle);
                 }
             }

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

@@ -78,6 +78,7 @@ namespace YooAsset
                     // 读取文件头信息
                     Manifest = new PackageManifest();
                     Manifest.FileVersion = fileVersion;
+                    Manifest.LegacyDependency = _buffer.ReadBool();
                     Manifest.EnableAddressable = _buffer.ReadBool();
                     Manifest.LocationToLower = _buffer.ReadBool();
                     Manifest.IncludeAssetGUID = _buffer.ReadBool();
@@ -112,6 +113,7 @@ namespace YooAsset
                         packageAsset.AssetGUID = _buffer.ReadUTF8();
                         packageAsset.AssetTags = _buffer.ReadUTF8Array();
                         packageAsset.BundleID = _buffer.ReadInt32();
+                        packageAsset.DependBundleIDs = _buffer.ReadInt32Array();
                         ManifestTools.FillAssetCollection(Manifest, packageAsset);
 
                         _packageAssetCount--;
@@ -146,6 +148,7 @@ namespace YooAsset
                         packageBundle.Encrypted = _buffer.ReadBool();
                         packageBundle.Tags = _buffer.ReadUTF8Array();
                         packageBundle.DependIDs = _buffer.ReadInt32Array();
+                        packageBundle.ReferenceBundleIDs = _buffer.ReadInt32Array();
                         ManifestTools.FillBundleCollection(Manifest, packageBundle);
 
                         _packageBundleCount--;

Assets/YooAsset/Runtime/ResourcePackage/PackageAsset.cs

@@ -31,11 +31,18 @@ namespace YooAsset
         /// </summary>
         public int BundleID;
 
+        #region YOOASSET_LEGACY_DEPENDENCY
         /// <summary>
-        /// 所属资源包名称（仅编辑器有效）
+        /// 依赖的资源包列表
+        /// </summary>
+        public int[] DependBundleIDs;
+        #endregion
+
+        /// <summary>
+        /// 临时数据对象（仅编辑器有效）
         /// </summary>
         [NonSerialized]
-        public string BundleNameInEditor;
+        public object TempDataInEditor;
 
         /// <summary>
         /// 是否包含Tag

Assets/YooAsset/Runtime/ResourcePackage/PackageBundle.cs

@@ -47,6 +47,14 @@ namespace YooAsset
         /// </summary>
         public int[] DependIDs;
 
+        #region YOOASSET_LEGACY_DEPENDENCY
+        /// <summary>
+        /// 引用该资源包的资源包列表
+        /// 说明：谁引用了该资源包
+        /// </summary>
+        public int[] ReferenceBundleIDs;
+        #endregion
+
         /// <summary>
         /// 资源包GUID
         /// </summary>
@@ -101,6 +109,12 @@ namespace YooAsset
         [NonSerialized]
         public readonly List<PackageAsset> IncludeMainAssets = new List<PackageAsset>(10);
 
+        /// <summary>
+        /// 临时数据对象（仅编辑器有效）
+        /// </summary>
+        [NonSerialized]
+        public object TempDataInEditor;
+
 
         public PackageBundle()
         {

Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs

@@ -17,6 +17,11 @@ namespace YooAsset
         /// </summary>
         public string FileVersion;
 
+        /// <summary>
+        /// 旧版依赖模式
+        /// </summary>
+        public bool LegacyDependency;
+
         /// <summary>
         /// 启用可寻址资源定位
         /// </summary>
@@ -155,16 +160,7 @@ namespace YooAsset
         {
             if (AssetDic.TryGetValue(assetPath, out PackageAsset packageAsset))
             {
-                int bundleID = packageAsset.BundleID;
+                return GetMainPackageBundle(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}");
-                }
             }
             else
             {
@@ -172,27 +168,58 @@ 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);
+            // YOOASSET_LEGACY_DEPENDENCY
-            List<PackageBundle> result = new List<PackageBundle>(packageBundle.DependIDs.Length);
+            if (LegacyDependency)
-            foreach (var dependID in packageBundle.DependIDs)
             {
-                if (dependID >= 0 && dependID < BundleList.Count)
+                if (TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
                 {
-                    var dependBundle = BundleList[dependID];
+                    List<PackageBundle> result = new List<PackageBundle>(packageAsset.DependBundleIDs.Length);
-                    result.Add(dependBundle);
+                    foreach (var dependID in packageAsset.DependBundleIDs)
+                    {
+                        var dependBundle = GetMainPackageBundle(dependID);
+                        result.Add(dependBundle);
+                    }
+                    return result.ToArray();
                 }
                 else
                 {
-                    throw new Exception($"Invalid bundle id : {dependID} Asset path : {assetPath}");
+                    throw new Exception("Should never get here !");
                 }
             }
-            return result.ToArray();
+            else
+            {
+                var packageBundle = GetMainPackageBundle(assetPath);
+                List<PackageBundle> result = new List<PackageBundle>(packageBundle.DependIDs.Length);
+                foreach (var dependID in packageBundle.DependIDs)
+                {
+                    var dependBundle = GetMainPackageBundle(dependID);
+                    result.Add(dependBundle);
+                }
+                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/Settings/YooAssetSettings.cs

@@ -29,7 +29,7 @@ namespace YooAsset
         /// <summary>
         /// 清单文件格式版本
         /// </summary>
-        public const string ManifestFileVersion = "2.2.5";
+        public const string ManifestFileVersion = "2.3.0";
 
 
         /// <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/TTFSLoadBundleOperation.cs

@@ -69,7 +69,7 @@ internal class TTFSLoadBundleOperation : FSLoadBundleOperation
                 else
                 {
                     _steps = ESteps.Done;
-                    Result = new AssetBundleResult(_fileSystem, _bundle, assetBundle, null);
+                    Result = new TTAssetBundleResult(_fileSystem, _bundle, assetBundle);
                     Status = EOperationStatus.Succeed;
                 }
             }

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

@@ -8,7 +8,7 @@ using System;
 
 public static class TiktokFileSystemCreater
 {
-    public static FileSystemParameters CreateByteGameFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
     {
         string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
@@ -16,7 +16,7 @@ public static class TiktokFileSystemCreater
         return fileSystemParams;
     }
 
-    public static FileSystemParameters CreateByteGameFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
     {
         string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
@@ -268,19 +268,6 @@ internal class TiktokFileSystem : IFileSystem
         }
         return filePath;
     }
-
-    /// <summary>
-    /// 加载加密资源文件
-    /// </summary>
-    public AssetBundle LoadEncryptedAssetBundle(PackageBundle bundle, byte[] fileData)
-    {
-        WebDecryptFileInfo fileInfo = new WebDecryptFileInfo();
-        fileInfo.BundleName = bundle.BundleName;
-        fileInfo.FileLoadCRC = bundle.UnityCRC;
-        fileInfo.FileData = fileData;
-        var decryptResult = DecryptionServices.LoadAssetBundle(fileInfo);
-        return decryptResult.Result;
-    }
     #endregion
 }
 #endif

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

@@ -67,7 +67,7 @@ internal class WXFSLoadBundleOperation : FSLoadBundleOperation
                 else
                 {
                     _steps = ESteps.Done;
-                    Result = new AssetBundleResult(_fileSystem, _bundle, assetBundle, null);
+                    Result = new WXAssetBundleResult(_fileSystem, _bundle, assetBundle);
                     Status = EOperationStatus.Succeed;
                 }
             }

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

@@ -8,14 +8,14 @@ using WeChatWASM;
 
 public static class WechatFileSystemCreater
 {
-    public static FileSystemParameters CreateWechatFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
     {
         string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
         fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
         return fileSystemParams;
     }
-    public static FileSystemParameters CreateWechatFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
     {
         string fileSystemClass = $"{nameof(WechatFileSystem)},YooAsset.RuntimeExtension";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
@@ -286,19 +286,6 @@ internal class WechatFileSystem : IFileSystem
         }
         return filePath;
     }
-
-    /// <summary>
-    /// 加载加密资源文件
-    /// </summary>
-    public AssetBundle LoadEncryptedAssetBundle(PackageBundle bundle, byte[] fileData)
-    {
-        WebDecryptFileInfo fileInfo = new WebDecryptFileInfo();
-        fileInfo.BundleName = bundle.BundleName;
-        fileInfo.FileLoadCRC = bundle.UnityCRC;
-        fileInfo.FileData = fileData;
-        var decryptResult = DecryptionServices.LoadAssetBundle(fileInfo);
-        return decryptResult.Result;
-    }
     #endregion
 }
 #endif

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

@@ -21,6 +21,12 @@ public class TextureSchema : ScannerSchema
     /// </summary>
     public int MaxHeight = 1024;
 
+    /// <summary>
+    /// 测试列表
+    /// </summary>
+    public List<string> TestStringValues = new List<string>();
+    
+
     /// <summary>
     /// 获取用户指南信息
     /// </summary>
@@ -177,6 +183,14 @@ public class TextureSchema : ScannerSchema
         });
         container.Add(maxHeightField);
 
+        // 创建测试列表
+#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;
     }

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

@@ -76,7 +76,7 @@ internal class FsmInitializePackage : IStateNode
             string fallbackHostServer = GetHostServerURL();
             string packageRoot = $"{WeChatWASM.WX.env.USER_DATA_PATH}/__GAME_FILE_CACHE"; //注意：如果有子目录，请修改此处！
             IRemoteServices remoteServices = new RemoteServices(defaultHostServer, fallbackHostServer);
-            createParameters.WebServerFileSystemParameters = WechatFileSystemCreater.CreateWechatFileSystemParameters(packageRoot, remoteServices);
+            createParameters.WebServerFileSystemParameters = WechatFileSystemCreater.CreateFileSystemParameters(packageRoot, remoteServices);
 #else
             createParameters.WebServerFileSystemParameters = FileSystemParameters.CreateDefaultWebServerFileSystemParameters(new WebDecryption());
 #endif

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

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

Assets/YooAsset/package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.tuyoogame.yooasset",
     "displayName": "YooAsset",
-    "version": "2.2.12",
+    "version": "2.3.0-preview",
     "unity": "2019.4",
     "description": "unity3d resources management system.",
     "author": {