Update CHANGELOG.md

增加TaskCreateCatalog任务节点

.gitignore

@@ -20,6 +20,8 @@
 /Assets/StreamingAssets.meta
 /Assets/Samples
 /Assets/Samples.meta
+/Assets/csc.rsp
+/Assets/csc.rsp.meta
 /UserSettings
 
 

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,67 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.6] - 2025-03-25
+
+### Improvements
+
+- 构建管线新增了TaskCreateCatalog任务节点。
+- 内置文件系统的catalog文件现在存储在streammingAssets目录下。
+
+### Fixed
+
+- (#486) 修复了微信小游戏文件系统调用ClearUnusedBundleFiles时候的异常。
+
+## [2.3.5-preview] - 2025-03-14
+
+### Fixed
+
+- (#502) 修复了原生缓存文件由于文件格式变动导致的加载本地缓存文件失败的问题。
+- (#504) 修复了MacOS平台Offline Play Mode模式请求本地资源清单失败的问题。
+- (#506) 修复了v2.3x版本LoadAllAssets方法计算依赖Bundle不完整的问题。
+- (#506) 修复了微信小游戏文件系统，在启用加密算法后卸载bundle报错的问题。
+
+## [2.3.4-preview] - 2025-03-08
+
+### Improvements
+
+- YooAsset支持了版本宏定义。
+
+  ```csharp
+  YOO_ASSET_2
+  YOO_ASSET_2_3
+  YOO_ASSET_2_3_OR_NEWER
+  ```
+
+### Fixed
+
+- (#389) 修复了禁用域重载(Reload Domain)的情况下，再次启动游戏报错的问题。
+- (#496) 修复了文件系统参数RESUME_DOWNLOAD_MINMUM_SIZE传入int值会导致异常的错误。
+- (#498) 修复了v2.3版本尝试加载安卓包内的原生资源包失败的问题。
+
+### Added
+
+- 新增了YooAssets.GetAllPackages()方法
+
+  ```csharp
+  /// <summary>
+  /// 获取所有资源包裹
+  /// </summary>
+  public static List<ResourcePackage> GetAllPackages()
+  ```
+
+## [2.3.3-preview] - 2025-03-06
+
+### Improvements
+
+- 新增了异步操作任务调试器，AssetBundleDebugger窗口-->OperationView视图模式
+- 编辑器下模拟构建默认启用依赖关系数据库，可以大幅降低编辑器下启动游戏的时间。
+- 单元测试用例增加加密解密测试用例。
+
+### Fixed
+
+- (#492) 修复了发布的MAC平台应用，在启动的时候提示权限无法获取的问题。
+
 ## [2.3.2-preview] - 2025-02-27
 
 ### Fixed

Assets/YooAsset/Editor/Assembly.meta

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

Assets/YooAsset/Editor/Assembly/MacroDefine.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+    public class MacroDefine
+    {
+        /// <summary>
+        /// YooAsset版本宏定义
+        /// </summary>
+        public static readonly List<string> Macros = new List<string>()
+        {
+            "YOO_ASSET_2",
+            "YOO_ASSET_2_3",
+            "YOO_ASSET_2_3_OR_NEWER",
+        };
+    }
+}

Assets/YooAsset/Editor/Assembly/MacroDefine.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 07f7c95e8e42fd04f81b9925b2dcf0d0
+guid: a61e5c2ca04aab647b1ed0492086aa8f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs

@@ -0,0 +1,96 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    [InitializeOnLoad]
+    public class MacroProcessor : AssetPostprocessor
+    {
+        static string OnGeneratedCSProject(string path, string content)
+        {
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(content);
+
+            if (IsCSProjectReferenced(xmlDoc.DocumentElement) == false)
+                return content;
+
+            if (ProcessDefineConstants(xmlDoc.DocumentElement) == false)
+                return content;
+
+            // 将修改后的XML结构重新输出为文本
+            var stringWriter = new StringWriter();
+            var writerSettings = new XmlWriterSettings();
+            writerSettings.Indent = true;
+            var xmlWriter = XmlWriter.Create(stringWriter, writerSettings);
+            xmlDoc.WriteTo(xmlWriter);
+            xmlWriter.Flush();
+            return stringWriter.ToString();
+        }
+
+        /// <summary>
+        /// 处理宏定义
+        /// </summary>
+        private static bool ProcessDefineConstants(XmlElement element)
+        {
+            if (element == null)
+                return false;
+
+            bool processed = false;
+            foreach (XmlNode node in element.ChildNodes)
+            {
+                if (node.Name != "PropertyGroup")
+                    continue;
+
+                foreach (XmlNode childNode in node.ChildNodes)
+                {
+                    if (childNode.Name != "DefineConstants")
+                        continue;
+
+                    string[] defines = childNode.InnerText.Split(';');
+                    HashSet<string> hashSets = new HashSet<string>(defines);
+                    foreach (string yooMacro in MacroDefine.Macros)
+                    {
+                        string tmpMacro = yooMacro.Trim();
+                        if (hashSets.Contains(tmpMacro) == false)
+                            hashSets.Add(tmpMacro);
+                    }
+                    childNode.InnerText = string.Join(";", hashSets.ToArray());
+                    processed = true;
+                }
+            }
+
+            return processed;
+        }
+
+        /// <summary>
+        /// 检测工程是否引用了YooAsset
+        /// </summary>
+        private static bool IsCSProjectReferenced(XmlElement element)
+        {
+            if (element == null)
+                return false;
+
+            foreach (XmlNode node in element.ChildNodes)
+            {
+                if (node.Name != "ItemGroup")
+                    continue;
+
+                foreach (XmlNode childNode in node.ChildNodes)
+                {
+                    if (childNode.Name != "Reference" && childNode.Name != "ProjectReference")
+                        continue;
+
+                    string include = childNode.Attributes["Include"].Value;
+                    if (include.Contains("YooAsset"))
+                        return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 88e4ec854876f3f40bce38bc880c0f6a
+guid: 88d5a41d078a82e40b82265ed4c3631a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/Assembly/RspGenerator.cs

@@ -0,0 +1,115 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using UnityEditor;
+using UnityEngine;
+
+#if YOO_ASSET_EXPERIMENT
+namespace YooAsset.Editor.Experiment
+{
+    [InitializeOnLoad]
+    public class RspGenerator
+    {
+        // csc.rsp文件路径
+        private static string RspFilePath => Path.Combine(Application.dataPath, "csc.rsp");
+
+        static RspGenerator()
+        {
+            UpdateRspFile(MacroDefine.Macros, null);
+        }
+
+        /// <summary>
+        /// 更新csc.rsp文件
+        /// </summary>
+        private static void UpdateRspFile(List<string> addMacros, List<string> removeMacros)
+        {
+            var existingDefines = new HashSet<string>();
+            var otherLines = new List<string>();
+
+            // 1. 读取现有内容
+            ReadRspFile(existingDefines, otherLines);
+
+            // 2. 添加新宏
+            if (addMacros != null && addMacros.Count > 0)
+            {
+                addMacros.ForEach(x =>
+                {
+                    if (existingDefines.Contains(x) == false)
+                        existingDefines.Add(x);
+                });
+            }
+
+            // 3. 移除指定宏
+            if (removeMacros != null && removeMacros.Count > 0)
+            {
+                removeMacros.ForEach(x =>
+                {
+                    existingDefines.Remove(x);
+                });
+            }
+
+            // 4. 重新生成内容
+            WriteRspFile(existingDefines, otherLines);
+
+            // 5. 刷新AssetDatabase
+            AssetDatabase.Refresh();
+            EditorUtility.RequestScriptReload();
+        }
+
+        /// <summary>
+        /// 读取csc.rsp文件,返回宏定义和其他行
+        /// </summary>
+        private static void ReadRspFile(HashSet<string> defines, List<string> others)
+        {
+            if (defines == null)
+                defines = new HashSet<string>();
+
+            if (others == null)
+                others = new List<string>();
+
+            if (File.Exists(RspFilePath) == false)
+                return;
+
+            foreach (string line in File.ReadAllLines(RspFilePath))
+            {
+                if (line.StartsWith("-define:"))
+                {
+                    string[] parts = line.Split(new[] { ':' }, 2);
+                    if (parts.Length == 2)
+                    {
+                        defines.Add(parts[1].Trim());
+                    }
+                }
+                else
+                {
+                    others.Add(line);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 重新写入csc.rsp文件
+        /// </summary>
+        private static void WriteRspFile(HashSet<string> defines, List<string> others)
+        {
+            StringBuilder sb = new StringBuilder();
+            if (others != null && others.Count > 0)
+            {
+                others.ForEach(o => sb.AppendLine(o));
+            }
+
+            if (defines != null && defines.Count > 0)
+            {
+                foreach (string define in defines)
+                {
+                    sb.AppendLine($"-define:{define}");
+                }
+            }
+
+            File.WriteAllText(RspFilePath, sb.ToString());
+        }
+    }
+}
+#endif

Assets/YooAsset/Editor/Assembly/RspGenerator.cs.meta

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

Assets/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs

@@ -97,7 +97,7 @@ namespace YooAsset.Editor
         private Button _passesVisibleBtn;
         private Label _titleLabel;
         private Label _descLabel;
-        private TableView _elementTableView;
+        private TableViewer _elementTableView;
 
         private ScanReportCombiner _reportCombiner;
         private string _lastestOpenFolder;
@@ -152,7 +152,7 @@ namespace YooAsset.Editor
                 _descLabel = root.Q<Label>("ReportDesc");
 
                 // 列表相关
-                _elementTableView = root.Q<TableView>("TopTableView");
+                _elementTableView = root.Q<TableViewer>("TopTableView");
                 _elementTableView.ClickTableDataEvent = OnClickTableViewItem;
 
                 _lastestOpenFolder = EditorTools.GetProjectPath();
@@ -441,6 +441,8 @@ namespace YooAsset.Editor
                 columnStyle.Stretchable = header.Stretchable;
                 columnStyle.Searchable = header.Searchable;
                 columnStyle.Sortable = header.Sortable;
+                columnStyle.Counter = header.Counter;
+                columnStyle.Units = header.Units;
                 var column = new TableColumn(header.HeaderTitle, header.HeaderTitle, columnStyle);
                 column.MakeCell = () =>
                 {

Assets/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.uxml

@@ -17,6 +17,6 @@
         <ui:Button text="显示白名单元素" display-tooltip-when-elided="true" name="WhiteListVisibleButton" style="width: 100px;" />
     </uie:Toolbar>
     <ui:VisualElement name="AssetGroup" 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.TableViewer name="TopTableView" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetArtReporter/ReportHeader.cs

@@ -43,6 +43,16 @@ namespace YooAsset.Editor
         /// </summary>
         public bool Sortable = false;
 
+        /// <summary>
+        /// 统计数量
+        /// </summary>
+        public bool Counter = false;
+
+        /// <summary>
+        /// 展示单位
+        /// </summary>
+        public string Units = string.Empty;
+
         /// <summary>
         /// 数值类型
         /// </summary>
@@ -89,6 +99,16 @@ namespace YooAsset.Editor
             Sortable = true;
             return this;
         }
+        public ReportHeader SetCounter()
+        {
+            Counter = true;
+            return this;
+        }
+        public ReportHeader SetUnits(string units)
+        {
+            Units = units;
+            return this;
+        }
         public ReportHeader SetHeaderType(EHeaderType value)
         {
             HeaderType = value;

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -26,6 +26,7 @@ namespace YooAsset.Editor
                 buildParameters.FileNameStyle = EFileNameStyle.HashName;
                 buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
                 buildParameters.BuildinFileCopyParams = string.Empty;
+                buildParameters.UseAssetDependencyDB = true;
 
                 var pipeline = new EditorSimulateBuildPipeline();
                 BuildResult buildResult = pipeline.Run(buildParameters, false);

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

@@ -0,0 +1,23 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog
+    {
+        /// <summary>
+        /// 生成内置资源记录文件
+        /// </summary>
+        internal void CreateCatalogFile(BuildParametersContext buildParametersContext)
+        {
+            string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
+            string buildPackageName = buildParametersContext.Parameters.PackageName;
+            DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(buildPackageName, buildinRootDirectory);
+
+            // 刷新目录
+            AssetDatabase.Refresh();
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs.meta

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

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

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
-            manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
+            manifest.FileVersion = ManifestDefine.FileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_BBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs

@@ -36,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_BBP(),
                     new TaskCreatePackage_BBP(),
                     new TaskCopyBuildinFiles_BBP(),
+                    new TaskCreateCatalog_BBP()
                 };
             return pipeline;
         }

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

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_RFBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs.meta

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

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

@@ -38,6 +38,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_RFBP(),
                     new TaskCreatePackage_RFBP(),
                     new TaskCopyBuildinFiles_RFBP(),
+                    new TaskCreateCatalog_RFBP()
                 };
             return pipeline;
         }

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

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_SBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs.meta

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

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

@@ -36,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_SBP(),
                     new TaskCreatePackage_SBP(),
                     new TaskCopyBuildinFiles_SBP(),
+                    new TaskCreateCatalog_SBP()
                 };
             return pipeline;
         }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultIgnoreRule.cs

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 忽略的文件类型
         /// </summary>
-        public readonly static HashSet<string> IgnoreFileExtensions = new HashSet<string>() { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
+        public readonly static HashSet<string> IgnoreFileExtensions = new HashSet<string>() { "", ".so", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
     }
 
     /// <summary>

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -59,6 +59,10 @@ namespace YooAsset.Editor
         private string _searchKeyWord;
         private DebugReport _currentReport;
         private RemotePlayerSession _currentPlayerSession;
+
+        private double _lastRepaintTime = 0;
+        private int _nextRepaintIndex = -1;
+        private int _lastRepaintIndex = 0;
         private int _rangeIndex = 0;
 
 
@@ -161,6 +165,19 @@ namespace YooAsset.Editor
             RemoteEditorConnection.Instance.Unregister(RemoteDebuggerDefine.kMsgPlayerSendToEditor);
             _playerSessions.Clear();
         }
+        public void Update()
+        {
+            // 每间隔1秒绘制一次页面
+            if (EditorApplication.timeSinceStartup - _lastRepaintTime > 1f)
+            {
+                _lastRepaintTime = EditorApplication.timeSinceStartup;
+                if (_nextRepaintIndex >= 0)
+                {
+                    RepaintFrame(_nextRepaintIndex);
+                    _nextRepaintIndex = -1;
+                }
+            }
+        }
 
         private void OnHandleConnectionEvent(int playerId)
         {
@@ -174,21 +191,27 @@ namespace YooAsset.Editor
         }
         private void OnHandlePlayerMessage(MessageEventArgs args)
         {
-            var debugReport = DebugReport.Deserialize(args.data);
             int playerId = args.playerId;
-            Debug.Log($"Handle player {playerId} debug report !");
+            var debugReport = DebugReport.Deserialize(args.data);
+
+            if (debugReport.DebuggerVersion != RemoteDebuggerDefine.DebuggerVersion)
+            {
+                Debug.LogWarning($"Debugger versions are inconsistent : {debugReport.DebuggerVersion} != {RemoteDebuggerDefine.DebuggerVersion}");
+                return;
+            }
+
+            //Debug.Log($"Handle player {playerId} debug report !");
             _currentPlayerSession = GetOrCreatePlayerSession(playerId);
             _currentPlayerSession.AddDebugReport(debugReport);
-            _frameSlider.highValue = _currentPlayerSession.MaxRangeValue;
+            _nextRepaintIndex = _currentPlayerSession.MaxRangeValue;
-            _frameSlider.value = _currentPlayerSession.MaxRangeValue;
-            UpdateFrameView(_currentPlayerSession);
         }
+
         private void OnFrameSliderChange(int sliderValue)
         {
             if (_currentPlayerSession != null)
             {
                 _rangeIndex = _currentPlayerSession.ClampRangeIndex(sliderValue); ;
-                UpdateFrameView(_currentPlayerSession, _rangeIndex);
+                RepaintFrame(_rangeIndex);
             }
         }
         private void OnFrameLast_clicked()
@@ -197,7 +220,7 @@ namespace YooAsset.Editor
             {
                 _rangeIndex = _currentPlayerSession.ClampRangeIndex(_rangeIndex - 1);
                 _frameSlider.value = _rangeIndex;
-                UpdateFrameView(_currentPlayerSession, _rangeIndex);
+                RepaintFrame(_rangeIndex);
             }
         }
         private void OnFrameNext_clicked()
@@ -206,21 +229,26 @@ namespace YooAsset.Editor
             {
                 _rangeIndex = _currentPlayerSession.ClampRangeIndex(_rangeIndex + 1);
                 _frameSlider.value = _rangeIndex;
-                UpdateFrameView(_currentPlayerSession, _rangeIndex);
+                RepaintFrame(_rangeIndex);
             }
         }
         private void OnFrameClear_clicked()
         {
-            if (_currentPlayerSession != null)
+            _nextRepaintIndex = -1;
-            {
+            _lastRepaintIndex = 0;
+            _rangeIndex = 0;
+
             _frameSlider.label = $"Frame:";
             _frameSlider.value = 0;
             _frameSlider.lowValue = 0;
             _frameSlider.highValue = 0;
-                _currentPlayerSession.ClearDebugReport();
             _assetListViewer.ClearView();
             _bundleListViewer.ClearView();
             _operationListViewer.ClearView();
+
+            if (_currentPlayerSession != null)
+            {
+                _currentPlayerSession.ClearDebugReport();
             }
         }
         private void OnRecordToggleValueChange(ChangeEvent<bool> evt)
@@ -234,42 +262,6 @@ namespace YooAsset.Editor
             RemoteEditorConnection.Instance.Send(RemoteDebuggerDefine.kMsgEditorSendToPlayer, data);
         }
 
-        private RemotePlayerSession GetOrCreatePlayerSession(int playerId)
-        {
-            if (_playerSessions.TryGetValue(playerId, out RemotePlayerSession session))
-            {
-                return session;
-            }
-            else
-            {
-                RemotePlayerSession newSession = new RemotePlayerSession(playerId);
-                _playerSessions.Add(playerId, newSession);
-                return newSession;
-            }
-        }
-        private void UpdateFrameView(RemotePlayerSession playerSession)
-        {
-            if (playerSession != null)
-            {
-                UpdateFrameView(playerSession, playerSession.MaxRangeValue);
-            }
-        }
-        private void UpdateFrameView(RemotePlayerSession playerSession, int rangeIndex)
-        {
-            if (playerSession == null)
-                return;
-
-            var debugReport = playerSession.GetDebugReport(rangeIndex);
-            if (debugReport != null)
-            {
-                _currentReport = debugReport;
-                _frameSlider.label = $"Frame: {debugReport.FrameCount}";
-                _assetListViewer.FillViewData(debugReport);
-                _bundleListViewer.FillViewData(debugReport);
-                _operationListViewer.FillViewData(debugReport);
-            }
-        }
-
         private void SampleBtn_onClick()
         {
             // 发送采集数据的命令
@@ -347,6 +339,9 @@ namespace YooAsset.Editor
                 {
                     throw new NotImplementedException(viewMode.ToString());
                 }
+
+                // 重新绘制该帧数据
+                RepaintFrame(_lastRepaintIndex);
             }
         }
         private DropdownMenuAction.Status OnViewModeMenuStatusUpdate(DropdownMenuAction action)
@@ -357,6 +352,63 @@ namespace YooAsset.Editor
             else
                 return DropdownMenuAction.Status.Normal;
         }
+
+        private RemotePlayerSession GetOrCreatePlayerSession(int playerId)
+        {
+            if (_playerSessions.TryGetValue(playerId, out RemotePlayerSession session))
+            {
+                return session;
+            }
+            else
+            {
+                RemotePlayerSession newSession = new RemotePlayerSession(playerId);
+                _playerSessions.Add(playerId, newSession);
+                return newSession;
+            }
+        }
+        private void RepaintFrame(int repaintIndex)
+        {
+            if (_currentPlayerSession == null)
+            {
+                _assetListViewer.ClearView();
+                _bundleListViewer.ClearView();
+                _operationListViewer.ClearView();
+                return;
+            }
+
+            var debugReport = _currentPlayerSession.GetDebugReport(repaintIndex);
+            if (debugReport != null)
+            {
+                _lastRepaintIndex = repaintIndex;
+                _currentReport = debugReport;
+                _frameSlider.label = $"Frame: {debugReport.FrameCount}";
+                _frameSlider.highValue = _currentPlayerSession.MaxRangeValue;
+                _frameSlider.value = repaintIndex;
+
+                if (_viewMode == EViewMode.AssetView)
+                {
+                    _assetListViewer.FillViewData(debugReport);
+                    _bundleListViewer.ClearView();
+                    _operationListViewer.ClearView();
+                }
+                else if (_viewMode == EViewMode.BundleView)
+                {
+                    _assetListViewer.ClearView();
+                    _bundleListViewer.FillViewData(debugReport);
+                    _operationListViewer.ClearView();
+                }
+                else if (_viewMode == EViewMode.OperationView)
+                {
+                    _assetListViewer.ClearView();
+                    _bundleListViewer.ClearView();
+                    _operationListViewer.FillViewData(debugReport);
+                }
+                else
+                {
+                    throw new System.NotImplementedException(_viewMode.ToString());
+                }
+            }
+        }
     }
 }
 #endif

Assets/YooAsset/Editor/AssetBundleDebugger/RemotePlayerSession.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace YooAsset.Editor
 {
     internal class RemotePlayerSession
     {
-        private readonly List<DebugReport> _reportList = new List<DebugReport>();
+        private readonly Queue<DebugReport> _reports = new Queue<DebugReport>();
 
         /// <summary>
         /// 用户ID
@@ -29,7 +30,7 @@ namespace YooAsset.Editor
         {
             get
             {
-                int index = _reportList.Count - 1;
+                int index = _reports.Count - 1;
                 if (index < 0)
                     index = 0;
                 return index;
@@ -37,7 +38,7 @@ namespace YooAsset.Editor
         }
 
 
-        public RemotePlayerSession(int playerId, int maxReportCount = 1000)
+        public RemotePlayerSession(int playerId, int maxReportCount = 500)
         {
             PlayerId = playerId;
             MaxReportCount = maxReportCount;
@@ -48,7 +49,7 @@ namespace YooAsset.Editor
         /// </summary>
         public void ClearDebugReport()
         {
-            _reportList.Clear();
+            _reports.Clear();
         }
 
         /// <summary>
@@ -59,9 +60,9 @@ namespace YooAsset.Editor
             if (report == null)
                 Debug.LogWarning("Invalid debug report data !");
 
-            if (_reportList.Count >= MaxReportCount)
+            if (_reports.Count >= MaxReportCount)
-                _reportList.RemoveAt(0);
+                _reports.Dequeue();
-            _reportList.Add(report);
+            _reports.Enqueue(report);
         }
 
         /// <summary>
@@ -69,11 +70,11 @@ namespace YooAsset.Editor
         /// </summary>
         public DebugReport GetDebugReport(int rangeIndex)
         {
-            if (_reportList.Count == 0)
+            if (_reports.Count == 0)
                 return null;
-            if (rangeIndex < 0 || rangeIndex >= _reportList.Count)
+            if (rangeIndex < 0 || rangeIndex >= _reports.Count)
                 return null;
-            return _reportList[rangeIndex];
+            return _reports.ElementAt(rangeIndex);
         }
 
         /// <summary>

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

@@ -24,8 +24,8 @@ namespace YooAsset.Editor
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
 
-        private TableView _providerTableView;
+        private TableViewer _providerTableView;
-        private TableView _dependTableView;
+        private TableViewer _dependTableView;
 
         private List<ITableData> _sourceDatas;
 
@@ -44,12 +44,12 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 资源列表
-            _providerTableView = _root.Q<TableView>("TopTableView");
+            _providerTableView = _root.Q<TableViewer>("TopTableView");
             _providerTableView.SelectionChangedEvent = OnProviderTableViewSelectionChanged;
             CreateAssetTableViewColumns();
 
             // 依赖列表
-            _dependTableView = _root.Q<TableView>("BottomTableView");
+            _dependTableView = _root.Q<TableViewer>("BottomTableView");
             CreateDependTableViewColumns();
 
             // 面板分屏
@@ -148,10 +148,11 @@ namespace YooAsset.Editor
 
             // LoadingTime
             {
-                var columnStyle = new ColumnStyle(100);
+                var columnStyle = new ColumnStyle(130);
                 columnStyle.Stretchable = false;
                 columnStyle.Searchable = false;
                 columnStyle.Sortable = true;
+                columnStyle.Units = "ms";
                 var column = new TableColumn("LoadingTime", "Loading Time", columnStyle);
                 column.MakeCell = () =>
                 {
@@ -279,7 +280,7 @@ namespace YooAsset.Editor
                 {
                     StyleColor textColor;
                     var dependTableData = data as DependTableData;
-                    if (dependTableData.BundleInfo.Status == EOperationStatus.Failed)
+                    if (dependTableData.BundleInfo.Status == EOperationStatus.Failed.ToString())
                         textColor = new StyleColor(Color.yellow);
                     else
                         textColor = new StyleColor(Color.white);
@@ -332,8 +333,10 @@ namespace YooAsset.Editor
         public void ClearView()
         {
             _providerTableView.ClearAll(false, true);
+            _providerTableView.RebuildView();
+
             _dependTableView.ClearAll(false, true);
-            RebuildView(null);
+            _dependTableView.RebuildView();
         }
 
         /// <summary>
@@ -342,10 +345,12 @@ namespace YooAsset.Editor
         public void RebuildView(string searchKeyWord)
         {
             // 搜索匹配
+            if (_sourceDatas != null)
                 DefaultSearchSystem.Search(_sourceDatas, searchKeyWord);
 
             // 重建视图
             _providerTableView.RebuildView();
+            _dependTableView.RebuildView();
         }
 
         /// <summary>

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.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.TableViewer 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; flex-grow: 1;">
-        <YooAsset.Editor.TableView name="BottomTableView" />
+        <YooAsset.Editor.TableViewer name="BottomTableView" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -28,9 +28,9 @@ namespace YooAsset.Editor
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
 
-        private TableView _bundleTableView;
+        private TableViewer _bundleTableView;
-        private TableView _usingTableView;
+        private TableViewer _usingTableView;
-        private TableView _referenceTableView;
+        private TableViewer _referenceTableView;
 
         private List<ITableData> _sourceDatas;
 
@@ -48,16 +48,16 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 资源包列表
-            _bundleTableView = _root.Q<TableView>("BundleTableView");
+            _bundleTableView = _root.Q<TableViewer>("BundleTableView");
             _bundleTableView.SelectionChangedEvent = OnBundleTableViewSelectionChanged;
             CreateBundleTableViewColumns();
 
             // 使用列表
-            _usingTableView = _root.Q<TableView>("UsingTableView");
+            _usingTableView = _root.Q<TableViewer>("UsingTableView");
             CreateUsingTableViewColumns();
 
             // 引用列表
-            _referenceTableView = _root.Q<TableView>("ReferenceTableView");
+            _referenceTableView = _root.Q<TableViewer>("ReferenceTableView");
             CreateReferenceTableViewColumns();
 
             // 面板分屏
@@ -151,7 +151,7 @@ namespace YooAsset.Editor
                 {
                     StyleColor textColor;
                     var bundleTableData = data as BundleTableData;
-                    if (bundleTableData.BundleInfo.Status == EOperationStatus.Failed)
+                    if (bundleTableData.BundleInfo.Status == EOperationStatus.Failed.ToString())
                         textColor = new StyleColor(Color.yellow);
                     else
                         textColor = new StyleColor(Color.white);
@@ -341,7 +341,7 @@ namespace YooAsset.Editor
                 {
                     StyleColor textColor;
                     var feferenceTableData = data as ReferenceTableData;
-                    if (feferenceTableData.BundleInfo.Status == EOperationStatus.Failed)
+                    if (feferenceTableData.BundleInfo.Status == EOperationStatus.Failed.ToString())
                         textColor = new StyleColor(Color.yellow);
                     else
                         textColor = new StyleColor(Color.white);
@@ -393,8 +393,10 @@ namespace YooAsset.Editor
         {
             _bundleTableView.ClearAll(false, true);
             _bundleTableView.RebuildView();
+
             _usingTableView.ClearAll(false, true);
             _usingTableView.RebuildView();
+
             _referenceTableView.ClearAll(false, true);
             _referenceTableView.RebuildView();
         }
@@ -405,10 +407,13 @@ namespace YooAsset.Editor
         public void RebuildView(string searchKeyWord)
         {
             // 搜索匹配
+            if(_sourceDatas != null)
                 DefaultSearchSystem.Search(_sourceDatas, searchKeyWord);
 
             // 重建视图
             _bundleTableView.RebuildView();
+            _usingTableView.RebuildView();
+            _referenceTableView.RebuildView();
         }
 
         /// <summary>

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

@@ -1,9 +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="BundleTableView" />
+        <YooAsset.Editor.TableViewer name="BundleTableView" />
     </ui:VisualElement>
     <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.TableViewer name="UsingTableView" />
-        <YooAsset.Editor.TableView name="ReferenceTableView" />
+        <YooAsset.Editor.TableViewer name="ReferenceTableView" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -20,13 +20,10 @@ namespace YooAsset.Editor
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
 
-        private TableView _operationTableView;
+        private TableViewer _operationTableView;
         private Toolbar _bottomToolbar;
-#if UNITY_2022_3_OR_NEWER
+        private TreeViewer _childTreeView;
-        private TreeView _childTreeView;
-#endif
 
-        private int _treeItemID = 0;
         private List<ITableData> _sourceDatas;
 
 
@@ -44,7 +41,7 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 任务列表
-            _operationTableView = _root.Q<TableView>("TopTableView");
+            _operationTableView = _root.Q<TableViewer>("TopTableView");
             _operationTableView.SelectionChangedEvent = OnOperationTableViewSelectionChanged;
             CreateOperationTableViewColumns();
 
@@ -53,11 +50,9 @@ namespace YooAsset.Editor
             CreateBottomToolbarHeaders();
 
             // 子列表
-#if UNITY_2022_3_OR_NEWER
+            _childTreeView = _root.Q<TreeViewer>("BottomTreeView");
-            _childTreeView = _root.Q<TreeView>("BottomTreeView");
             _childTreeView.makeItem = MakeTreeViewItem;
             _childTreeView.bindItem = BindTreeViewItem;
-#endif
 
             // 面板分屏
             var topGroup = _root.Q<VisualElement>("TopGroup");
@@ -175,10 +170,11 @@ namespace YooAsset.Editor
 
             // ProcessTime
             {
-                var columnStyle = new ColumnStyle(100);
+                var columnStyle = new ColumnStyle(130);
                 columnStyle.Stretchable = false;
                 columnStyle.Searchable = false;
                 columnStyle.Sortable = true;
+                columnStyle.Units = "ms";
                 var column = new TableColumn("ProcessTime", "Process Time", columnStyle);
                 column.MakeCell = () =>
                 {
@@ -275,9 +271,9 @@ namespace YooAsset.Editor
             // ProcessTime
             {
                 ToolbarButton button = new ToolbarButton();
-                button.text = "ProcessTime";
+                button.text = "ProcessTime (ms)";
                 button.style.flexGrow = 0;
-                button.style.width = 100;
+                button.style.width = 130;
                 _bottomToolbar.Add(button);
             }
 
@@ -307,11 +303,8 @@ namespace YooAsset.Editor
         {
             // 清空旧数据
             _operationTableView.ClearAll(false, true);
-
+            _childTreeView.ClearAll();
-#if UNITY_2022_3_OR_NEWER
+            _childTreeView.RebuildView();
-            _childTreeView.SetRootItems(new List<TreeViewItemData<DebugOperationInfo>>());
-            _childTreeView.Rebuild();
-#endif
 
             // 填充数据源
             _sourceDatas = new List<ITableData>(1000);
@@ -345,11 +338,10 @@ namespace YooAsset.Editor
         public void ClearView()
         {
             _operationTableView.ClearAll(false, true);
-#if UNITY_2022_3_OR_NEWER
+            _operationTableView.RebuildView();
-            _childTreeView.SetRootItems(new List<TreeViewItemData<DebugOperationInfo>>());
+
-            _childTreeView.Rebuild();
+            _childTreeView.ClearAll();
-#endif
+            _childTreeView.RebuildView();
-            RebuildView(null);
         }
 
         /// <summary>
@@ -358,10 +350,12 @@ namespace YooAsset.Editor
         public void RebuildView(string searchKeyWord)
         {
             // 搜索匹配
+            if(_sourceDatas != null)
                 DefaultSearchSystem.Search(_sourceDatas, searchKeyWord);
 
             // 重建视图
             _operationTableView.RebuildView();
+            _childTreeView.RebuildView();
         }
 
         /// <summary>
@@ -380,23 +374,20 @@ namespace YooAsset.Editor
             _root.RemoveFromHierarchy();
         }
 
-#if UNITY_2022_3_OR_NEWER
         private void OnOperationTableViewSelectionChanged(ITableData data)
         {
             var operationTableData = data as OperationTableData;
             DebugPackageData packageData = operationTableData.PackageData;
             DebugOperationInfo operationInfo = operationTableData.OperationInfo;
 
-            _treeItemID = 0;
+            TreeNode rootNode = new TreeNode(operationInfo);
-            var rootItems = CreateTreeData(operationInfo);
+            FillTreeData(operationInfo, rootNode);
-            _childTreeView.SetRootItems(rootItems);
+            _childTreeView.ClearAll();
-            _childTreeView.Rebuild();
+            _childTreeView.SetRootItem(rootNode);
+            _childTreeView.RebuildView();
         }
-        private VisualElement MakeTreeViewItem()
+        private void MakeTreeViewItem(VisualElement container)
         {
-            VisualElement treeViewElement = new VisualElement();
-            treeViewElement.style.flexDirection = FlexDirection.Row;
-
             // OperationName
             {
                 Label label = new Label();
@@ -404,7 +395,7 @@ namespace YooAsset.Editor
                 label.style.flexGrow = 0f;
                 label.style.width = 300;
                 label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                treeViewElement.Add(label);
+                container.Add(label);
             }
 
             // Progress
@@ -414,7 +405,7 @@ namespace YooAsset.Editor
                 label.style.flexGrow = 0f;
                 label.style.width = 100;
                 label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                treeViewElement.Add(label);
+                container.Add(label);
             }
 
             // BeginTime
@@ -424,7 +415,7 @@ namespace YooAsset.Editor
                 label.style.flexGrow = 0f;
                 label.style.width = 100;
                 label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                treeViewElement.Add(label);
+                container.Add(label);
             }
 
             // ProcessTime
@@ -432,9 +423,9 @@ namespace YooAsset.Editor
                 var label = new Label();
                 label.name = "ProcessTime";
                 label.style.flexGrow = 0f;
-                label.style.width = 100;
+                label.style.width = 130;
                 label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                treeViewElement.Add(label);
+                container.Add(label);
             }
 
             // Status
@@ -444,7 +435,7 @@ namespace YooAsset.Editor
                 label.style.flexGrow = 0f;
                 label.style.width = 100;
                 label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                treeViewElement.Add(label);
+                container.Add(label);
             }
 
             // Desc
@@ -454,36 +445,34 @@ namespace YooAsset.Editor
                 label.style.flexGrow = 1f;
                 label.style.width = 500;
                 label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                treeViewElement.Add(label);
+                container.Add(label);
             }
-
-            return treeViewElement;
         }
-        private void BindTreeViewItem(VisualElement element, int index)
+        private void BindTreeViewItem(VisualElement container, object userData)
         {
-            var operationInfo = _childTreeView.GetItemDataForIndex<DebugOperationInfo>(index);
+            var operationInfo = (DebugOperationInfo)userData;
 
             // OperationName
             {
-                var label = element.Q<Label>("OperationName");
+                var label = container.Q<Label>("OperationName");
                 label.text = operationInfo.OperationName;
             }
 
             // Progress
             {
-                var label = element.Q<Label>("Progress");
+                var label = container.Q<Label>("Progress");
                 label.text = operationInfo.Progress.ToString();
             }
 
             // BeginTime
             {
-                var label = element.Q<Label>("BeginTime");
+                var label = container.Q<Label>("BeginTime");
                 label.text = operationInfo.BeginTime;
             }
 
             // ProcessTime
             {
-                var label = element.Q<Label>("ProcessTime");
+                var label = container.Q<Label>("ProcessTime");
                 label.text = operationInfo.ProcessTime.ToString();
             }
 
@@ -495,33 +484,26 @@ namespace YooAsset.Editor
                 else
                     textColor = new StyleColor(Color.white);
 
-                var label = element.Q<Label>("Status");
+                var label = container.Q<Label>("Status");
                 label.text = operationInfo.Status;
                 label.style.color = textColor;
             }
 
             // Desc
             {
-                var label = element.Q<Label>("Desc");
+                var label = container.Q<Label>("Desc");
                 label.text = operationInfo.OperationDesc;
             }
         }
-        private List<TreeViewItemData<DebugOperationInfo>> CreateTreeData(DebugOperationInfo parentOperation)
+        private void FillTreeData(DebugOperationInfo parentOperation, TreeNode rootNode)
         {
-            var rootItemList = new List<TreeViewItemData<DebugOperationInfo>>();
             foreach (var childOperation in parentOperation.Childs)
             {
-                var childItemList = CreateTreeData(childOperation);
+                var childNode = new TreeNode(childOperation);
-                var treeItem = new TreeViewItemData<DebugOperationInfo>(_treeItemID++, childOperation, childItemList);
+                rootNode.AddChild(childNode);
-                rootItemList.Add(treeItem);
+                FillTreeData(childOperation, childNode);
             }
-            return rootItemList;
         }
-#else
-        private void OnOperationTableViewSelectionChanged(ITableData data)
-        {
-        }
-#endif
     }
 }
 #endif

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

@@ -1,9 +1,9 @@
 <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;">
-        <YooAsset.Editor.TableView name="TopTableView" />
+        <YooAsset.Editor.TableViewer name="TopTableView" />
     </ui:VisualElement>
     <ui:VisualElement name="BottomGroup" style="flex-grow: 1;">
         <uie:Toolbar name="BottomToolbar" />
-        <ui:TreeView name="BottomTreeView" />
+        <YooAsset.Editor.TreeViewer name="BottomTreeView" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -24,8 +24,8 @@ namespace YooAsset.Editor
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
 
-        private TableView _assetTableView;
+        private TableViewer _assetTableView;
-        private TableView _dependTableView;
+        private TableViewer _dependTableView;
 
         private BuildReport _buildReport;
         private string _reportFilePath;
@@ -46,13 +46,13 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 资源列表
-            _assetTableView = _root.Q<TableView>("TopTableView");
+            _assetTableView = _root.Q<TableViewer>("TopTableView");
             _assetTableView.SelectionChangedEvent = OnAssetTableViewSelectionChanged;
             _assetTableView.ClickTableDataEvent = OnClickAssetTableView;
             CreateAssetTableViewColumns();
 
             // 依赖列表
-            _dependTableView = _root.Q<TableView>("BottomTableView");
+            _dependTableView = _root.Q<TableViewer>("BottomTableView");
             _dependTableView.ClickTableDataEvent = OnClickBundleTableView;
             CreateDependTableViewColumns();
 

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" style="flex-grow: 1;" />
+        <YooAsset.Editor.TableViewer 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; flex-grow: 1;">
-        <YooAsset.Editor.TableView name="BottomTableView" style="flex-grow: 1;" />
+        <YooAsset.Editor.TableViewer name="BottomTableView" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -24,8 +24,8 @@ namespace YooAsset.Editor
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
 
-        private TableView _bundleTableView;
+        private TableViewer _bundleTableView;
-        private TableView _includeTableView;
+        private TableViewer _includeTableView;
 
         private BuildReport _buildReport;
         private string _reportFilePath;
@@ -46,13 +46,13 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 资源包列表
-            _bundleTableView = _root.Q<TableView>("TopTableView");
+            _bundleTableView = _root.Q<TableViewer>("TopTableView");
             _bundleTableView.ClickTableDataEvent = OnClickBundleTableView;
             _bundleTableView.SelectionChangedEvent = OnBundleTableViewSelectionChanged;
             CreateBundleTableViewColumns();
 
             // 包含列表
-            _includeTableView = _root.Q<TableView>("BottomTableView");
+            _includeTableView = _root.Q<TableViewer>("BottomTableView");
             _includeTableView.ClickTableDataEvent = OnClickIncludeTableView;
             CreateIncludeTableViewColumns();
 

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" style="flex-grow: 1;" />
+        <YooAsset.Editor.TableViewer 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; flex-grow: 1;">
-        <YooAsset.Editor.TableView name="BottomTableView" style="flex-grow: 1;" />
+        <YooAsset.Editor.TableViewer name="BottomTableView" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -0,0 +1,55 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    /// <summary>
+    /// 折叠开关
+    /// </summary>
+    public class ToggleFoldout : Toggle
+    {
+        public new class UxmlFactory : UxmlFactory<ToggleFoldout, UxmlTraits>
+        {
+        }
+
+        private readonly VisualElement _checkbox;
+
+        public ToggleFoldout()
+        {
+            _checkbox = this.Q<VisualElement>("unity-checkmark");
+            RefreshIcon();
+        }
+        public override void SetValueWithoutNotify(bool newValue)
+        {
+            base.SetValueWithoutNotify(newValue);
+            RefreshIcon();
+        }
+
+#if UNITY_2021_3_OR_NEWER
+        protected override void ToggleValue()
+        {
+            base.ToggleValue();
+            RefreshIcon();
+        }
+#endif
+
+        public void RefreshIcon()
+        {
+            if (this.value)
+            {
+                var icon = EditorGUIUtility.IconContent(UIElementsIcon.FoldoutOn).image as Texture2D;
+                _checkbox.style.backgroundImage = icon;
+            }
+            else
+            {
+                var icon = EditorGUIUtility.IconContent(UIElementsIcon.FoldoutOff).image as Texture2D;
+                _checkbox.style.backgroundImage = icon;
+            }
+        }
+    }
+}
+#endif

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

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

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

@@ -46,6 +46,11 @@ namespace YooAsset.Editor
         /// </summary>
         public bool Counter = false;
 
+        /// <summary>
+        /// 展示单位
+        /// </summary>
+        public string Units = string.Empty;
+
         public ColumnStyle(Length width)
         {
             if (width.value > MaxValue)

Assets/YooAsset/Editor/UIElements/TableViewer/TableViewer.cs

@@ -13,9 +13,9 @@ namespace YooAsset.Editor
     /// <summary>
     /// Unity2022版本以上推荐官方类：MultiColumnListView组件
     /// </summary>
-    public class TableView : VisualElement
+    public class TableViewer : VisualElement
     {
-        public new class UxmlFactory : UxmlFactory<TableView, UxmlTraits>
+        public new class UxmlFactory : UxmlFactory<TableViewer, UxmlTraits>
         {
         }
 
@@ -82,7 +82,7 @@ namespace YooAsset.Editor
         public Action<ITableData> SelectionChangedEvent;
 
 
-        public TableView()
+        public TableViewer()
         {
             this.style.flexShrink = 1f;
             this.style.flexGrow = 1f;
@@ -214,6 +214,16 @@ namespace YooAsset.Editor
                 }
             }
 
+            // 设置展示单位
+            foreach (var column in _columns)
+            {
+                if (string.IsNullOrEmpty(column.ColumnStyle.Units) == false)
+                {
+                    var toobarButton = GetHeaderElement(column.ElementName) as ToolbarButton;
+                    toobarButton.text = $"{toobarButton.text} ({column.ColumnStyle.Units})";
+                }
+            }
+
             // 设置升降符号
             if (string.IsNullOrEmpty(_sortingHeader) == false)
             {

Assets/YooAsset/Editor/UIElements/TreeViewer.meta

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

Assets/YooAsset/Editor/UIElements/TreeViewer/TreeNode.cs

@@ -0,0 +1,77 @@
+#if UNITY_2019_4_OR_NEWER
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    public class TreeNode
+    {
+        /// <summary>
+        /// 子节点集合
+        /// </summary>
+        public List<TreeNode> Children = new List<TreeNode>(10);
+
+        /// <summary>
+        /// 父节点
+        /// </summary>
+        public TreeNode Parent { get; set; }
+
+        /// <summary>
+        /// 用户数据
+        /// </summary>
+        public object UserData { get; set; }
+
+        /// <summary>
+        /// 是否展开
+        /// </summary>
+        public bool IsExpanded { get; set; } = false;
+
+
+        public TreeNode(object userData)
+        {
+            UserData = userData;
+        }
+
+        /// <summary>
+        /// 添加子节点
+        /// </summary>
+        public void AddChild(TreeNode child)
+        {
+            child.Parent = this;
+            Children.Add(child);
+        }
+
+        /// <summary>
+        /// 清理所有子节点
+        /// </summary>
+        public void ClearChildren()
+        {
+            foreach(var child in Children)
+            {
+                child.Parent = null;
+            }
+            Children.Clear();
+        }
+
+        /// <summary>
+        /// 计算节点的深度
+        /// </summary>
+        public int GetDepth()
+        {
+            int depth = 0;
+            TreeNode current = this;
+            while (current.Parent != null)
+            {
+                depth++;
+                current = current.Parent;
+            }
+            return depth;
+        }
+    }
+}
+#endif

Assets/YooAsset/Editor/UIElements/TreeViewer/TreeNode.cs.meta

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

Assets/YooAsset/Editor/UIElements/TreeViewer/TreeViewer.cs

@@ -0,0 +1,152 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    public class TreeViewer : VisualElement
+    {
+        public new class UxmlFactory : UxmlFactory<TreeViewer, UxmlTraits>
+        {
+        }
+
+        private readonly ListView _listView;
+        private readonly List<TreeNode> _flattenList = new List<TreeNode>(1000);
+        private readonly List<TreeNode> _rootList = new List<TreeNode>(100);
+
+        /// <summary>
+        /// 制作列表元素
+        /// </summary>
+        public Action<VisualElement> makeItem { get; set; }
+
+        /// <summary>
+        /// 绑定列表数据
+        /// </summary>
+        public Action<VisualElement, object> bindItem { get; set; }
+
+
+        public TreeViewer()
+        {
+            this.style.flexShrink = 1f;
+            this.style.flexGrow = 1f;
+
+            // 创建ListView
+            _listView = new ListView();
+            _listView.style.flexShrink = 1f;
+            _listView.style.flexGrow = 1f;
+            _listView.itemsSource = _flattenList;
+            _listView.makeItem = MakeItemInternal;
+            _listView.bindItem = BindItemInternal;
+            this.Add(_listView);
+        }
+
+        /// <summary>
+        /// 设置根节点数据
+        /// </summary>
+        public void SetRootItem(TreeNode rootNode)
+        {
+            _rootList.Add(rootNode);
+        }
+
+        /// <summary>
+        /// 设置根节点数据
+        /// </summary>
+        public void SetRootItems(List<TreeNode> rootNodes)
+        {
+            _rootList.AddRange(rootNodes);
+        }
+
+        /// <summary>
+        /// 清理数据
+        /// </summary>
+        public void ClearAll()
+        {
+            _rootList.Clear();
+        }
+
+        /// <summary>
+        /// 重新绘制视图
+        /// </summary>
+        public void RebuildView()
+        {
+            _flattenList.Clear();
+            foreach (var treeRoot in _rootList)
+            {
+                FlattenTree(treeRoot, 0);
+            }
+            _listView.Rebuild();
+        }
+
+        /// <summary>
+        /// 将树形结构扁平化为列表
+        /// </summary>
+        private void FlattenTree(TreeNode node, int depth)
+        {
+            _flattenList.Add(node);
+            if (node.IsExpanded)
+            {
+                foreach (var child in node.Children)
+                {
+                    FlattenTree(child, depth + 1);
+                }
+            }
+        }
+
+        private VisualElement MakeItemInternal()
+        {
+            var container = new VisualElement();
+            container.style.flexDirection = FlexDirection.Row;
+
+            // 折叠按钮
+            var toggle = new ToggleFoldout();
+            toggle.text = string.Empty;
+            toggle.name = "foldout";
+            toggle.style.alignSelf = Align.Center;
+            toggle.style.width = 15;
+            toggle.style.height = 15;
+            toggle.RegisterValueChangedCallback((ChangeEvent<bool> callback) =>
+            {
+                var treeNode = toggle.userData as TreeNode;
+                treeNode.IsExpanded = toggle.value;
+                RebuildView();
+            });
+            container.Add(toggle);
+
+            // 用户自定义元素
+            if (makeItem != null)
+            {
+                makeItem.Invoke(container);
+            }
+
+            return container;
+        }
+        private void BindItemInternal(VisualElement item, int index)
+        {
+            var treeNode = _flattenList[index];
+
+            // 设置折叠状态
+            var toggle = item.Q<ToggleFoldout>("foldout");
+            toggle.SetValueWithoutNotify(treeNode.IsExpanded);
+            toggle.userData = treeNode;
+            toggle.style.marginLeft = treeNode.GetDepth() * 15;
+
+            // 隐藏折叠按钮
+            if (treeNode.Children.Count == 0)
+            {
+                toggle.style.visibility = Visibility.Hidden;
+            }
+
+            // 用户自定义元素
+            if (bindItem != null)
+            {
+                bindItem.Invoke(item, treeNode.UserData);
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Editor/UIElements/TreeViewer/TreeViewer.cs.meta

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

Assets/YooAsset/Editor/UIElements/UIElementsIcon.cs

@@ -10,6 +10,14 @@ namespace YooAsset.Editor
         public const string RecordOn = "d_Record On@2x";
         public const string RecordOff = "d_Record Off@2x";
 
+#if UNITY_2019
+        public const string FoldoutOn = "IN foldout on";
+        public const string FoldoutOff = "IN foldout";
+#else
+        public const string FoldoutOn = "d_IN_foldout_on@2x";
+        public const string FoldoutOff = "d_IN_foldout@2x";
+#endif
+
         public const string VisibilityToggleOff = "animationvisibilitytoggleoff@2x";
         public const string VisibilityToggleOn = "animationvisibilitytoggleon@2x";
     }

Assets/YooAsset/Runtime/Assembly.meta

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

Assets/YooAsset/Runtime/DiagnosticSystem/DebugBundleInfo.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 namespace YooAsset
 {
     [Serializable]
-    internal class DebugBundleInfo : IComparer<DebugBundleInfo>, IComparable<DebugBundleInfo>
+    internal struct DebugBundleInfo : IComparer<DebugBundleInfo>, IComparable<DebugBundleInfo>
     {
         /// <summary>
         /// 资源包名称
@@ -20,7 +20,7 @@ namespace YooAsset
         /// <summary>
         /// 加载状态
         /// </summary>
-        public EOperationStatus Status;
+        public string Status;
 
         /// <summary>
         /// 谁引用了该资源包

Assets/YooAsset/Runtime/DiagnosticSystem/DebugOperationInfo.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 namespace YooAsset
 {
     [Serializable]
-    internal class DebugOperationInfo : IComparer<DebugOperationInfo>, IComparable<DebugOperationInfo>
+    internal struct DebugOperationInfo : IComparer<DebugOperationInfo>, IComparable<DebugOperationInfo>
     {
         /// <summary>
         /// 任务名称

Assets/YooAsset/Runtime/DiagnosticSystem/DebugPackageData.cs

@@ -47,7 +47,7 @@ namespace YooAsset
             else
             {
                 UnityEngine.Debug.LogError($"Can not found {nameof(DebugBundleInfo)} : {bundleName}");
-                return null;
+                return default;
             }
         }
     }

Assets/YooAsset/Runtime/DiagnosticSystem/DebugProviderInfo.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 namespace YooAsset
 {
     [Serializable]
-    internal class DebugProviderInfo : IComparer<DebugProviderInfo>, IComparable<DebugProviderInfo>
+    internal struct DebugProviderInfo : IComparer<DebugProviderInfo>, IComparable<DebugProviderInfo>
     {
         /// <summary>
         /// 包裹名

Assets/YooAsset/Runtime/DiagnosticSystem/DebugReport.cs

@@ -12,6 +12,11 @@ namespace YooAsset
     [Serializable]
     internal class DebugReport
     {
+        /// <summary>
+        /// 调试器版本
+        /// </summary>
+        public string DebuggerVersion = RemoteDebuggerDefine.DebuggerVersion;
+
         /// <summary>
         /// 游戏帧
         /// </summary>

Assets/YooAsset/Runtime/DiagnosticSystem/RemoteDebuggerDefine.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Text;
 
 namespace YooAsset
 {
     internal class RemoteDebuggerDefine
     {
+        public const string DebuggerVersion = "2.3.3";
         public static readonly Guid kMsgPlayerSendToEditor = new Guid("e34a5702dd353724aa315fb8011f08c3");
         public static readonly Guid kMsgEditorSendToPlayer = new Guid("4d1926c9df5b052469a1c63448b7609a");
     }

Assets/YooAsset/Runtime/DiagnosticSystem/RemoteDebuggerInRuntime.cs

@@ -7,6 +7,15 @@ namespace YooAsset
 {
     internal class RemoteDebuggerInRuntime : MonoBehaviour
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _sampleOnce = false;
+            _autoSample = false;
+        }
+#endif
+
         private static bool _sampleOnce = false;
         private static bool _autoSample = false;
 

Assets/YooAsset/Runtime/DiagnosticSystem/RemoteEditorConnection.cs

@@ -8,6 +8,14 @@ namespace YooAsset
 {
     internal class RemoteEditorConnection
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _instance = null;
+        }
+#endif
+
         private static RemoteEditorConnection _instance;
         public static RemoteEditorConnection Instance
         {

Assets/YooAsset/Runtime/DiagnosticSystem/RemotePlayerConnection.cs

@@ -8,6 +8,14 @@ namespace YooAsset
 {
     internal class RemotePlayerConnection
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _instance = null;
+        }
+#endif
+
         private static RemotePlayerConnection _instance;
         public static RemotePlayerConnection Instance
         {
@@ -23,12 +31,10 @@ namespace YooAsset
 
         public void Initialize()
         {
-            Debug.LogWarning("X=Initialize");
             _messageCallbacks.Clear();
         }
         public void Register(Guid messageID, UnityAction<MessageEventArgs> callback)
         {
-            Debug.LogWarning("X=Register");
             if (messageID == Guid.Empty)
                 throw new ArgumentException("messageID is empty !");
 
@@ -37,7 +43,6 @@ namespace YooAsset
         }
         public void Unregister(Guid messageID)
         {
-            Debug.LogWarning("X=Unregister");
             if (_messageCallbacks.ContainsKey(messageID))
                 _messageCallbacks.Remove(messageID);
         }

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystemHelper.cs

@@ -1,4 +1,5 @@
 using UnityEngine.Networking;
+using UnityEngine;
 
 namespace YooAsset
 {
@@ -9,6 +10,14 @@ namespace YooAsset
 
     internal class DownloadSystemHelper
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            UnityWebRequestCreater = null;
+        }
+#endif
+
         public static UnityWebRequestDelegate UnityWebRequestCreater = null;
         public static UnityWebRequest NewUnityWebRequestGet(string requestURL)
         {
@@ -28,7 +37,9 @@ namespace YooAsset
             string url;
 
             // 获取对应平台的URL地址
-#if UNITY_EDITOR
+#if UNITY_EDITOR_OSX
+            url = StringUtility.Format("file://{0}", path);
+#elif UNITY_EDITOR
             url = StringUtility.Format("file:///{0}", path);
 #elif UNITY_WEBGL
             url = path;

Assets/YooAsset/Runtime/DownloadSystem/WebRequestCounter.cs

@@ -6,6 +6,14 @@ namespace YooAsset
 {
     internal class WebRequestCounter
     {
+#if UNITY_EDITOR
+        [UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _requestFailedRecorder.Clear();
+        }
+#endif
+
         /// <summary>
         /// 记录网络请求失败事件的次数
         /// </summary>

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

@@ -0,0 +1,21 @@
+
+namespace YooAsset
+{
+    internal class CatalogDefine
+    {
+        /// <summary>
+        /// 文件极限大小（100MB）
+        /// </summary>
+        public const int FileMaxSize = 104857600;
+
+        /// <summary>
+        /// 文件头标记
+        /// </summary>
+        public const uint FileSign = 0x133C5EE;
+
+        /// <summary>
+        /// 文件格式版本
+        /// </summary>
+        public const string FileVersion = "1.0.0";
+    }
+}

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

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

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

@@ -0,0 +1,102 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal static class CatalogTools
+    {
+        /// <summary>
+        /// 序列化（JSON文件）
+        /// </summary>
+        public static void SerializeToJson(string savePath, DefaultBuildinFileCatalog catalog)
+        {
+            string json = JsonUtility.ToJson(catalog, true);
+            FileUtility.WriteAllText(savePath, json);
+        }
+
+        /// <summary>
+        /// 反序列化（JSON文件）
+        /// </summary>
+        public static DefaultBuildinFileCatalog DeserializeFromJson(string jsonContent)
+        {
+            return JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonContent);
+        }
+
+        /// <summary>
+        /// 序列化（二进制文件）
+        /// </summary>
+        public static void SerializeToBinary(string savePath, DefaultBuildinFileCatalog catalog)
+        {
+            using (FileStream fs = new FileStream(savePath, FileMode.Create))
+            {
+                // 创建缓存器
+                BufferWriter buffer = new BufferWriter(CatalogDefine.FileMaxSize);
+
+                // 写入文件标记
+                buffer.WriteUInt32(CatalogDefine.FileSign);
+
+                // 写入文件版本
+                buffer.WriteUTF8(CatalogDefine.FileVersion);
+
+                // 写入文件头信息
+                buffer.WriteUTF8(catalog.PackageName);
+                buffer.WriteUTF8(catalog.PackageVersion);
+
+                // 写入资源包列表
+                buffer.WriteInt32(catalog.Wrappers.Count);
+                for (int i = 0; i < catalog.Wrappers.Count; i++)
+                {
+                    var fileWrapper = catalog.Wrappers[i];
+                    buffer.WriteUTF8(fileWrapper.BundleGUID);
+                    buffer.WriteUTF8(fileWrapper.FileName);
+                }
+
+                // 写入文件流
+                buffer.WriteToStream(fs);
+                fs.Flush();
+            }
+        }
+
+        /// <summary>
+        /// 反序列化（二进制文件）
+        /// </summary>
+        public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData)
+        {
+            // 创建缓存器
+            BufferReader buffer = new BufferReader(binaryData);
+
+            // 读取文件标记
+            uint fileSign = buffer.ReadUInt32();
+            if (fileSign != CatalogDefine.FileSign)
+                throw new Exception("Invalid catalog file !");
+
+            // 读取文件版本
+            string fileVersion = buffer.ReadUTF8();
+            if (fileVersion != CatalogDefine.FileVersion)
+                throw new Exception($"The catalog file version are not compatible : {fileVersion} != {CatalogDefine.FileVersion}");
+
+            DefaultBuildinFileCatalog catalog = new DefaultBuildinFileCatalog();
+            {
+                // 读取文件头信息
+                catalog.FileVersion = fileVersion;
+                catalog.PackageName = buffer.ReadUTF8();
+                catalog.PackageVersion = buffer.ReadUTF8();
+
+                // 读取资源包列表
+                int fileCount = buffer.ReadInt32();
+                catalog.Wrappers = new List<DefaultBuildinFileCatalog.FileWrapper>(fileCount);
+                for (int i = 0; i < fileCount; i++)
+                {
+                    var fileWrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    fileWrapper.BundleGUID = buffer.ReadUTF8();
+                    fileWrapper.FileName = buffer.ReadUTF8();
+                    catalog.Wrappers.Add(fileWrapper);
+                }
+            }
+
+            return catalog;
+        }
+    }
+}

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

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