diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs index 0c549e21..e191d251 100644 --- a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs +++ b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs @@ -194,9 +194,9 @@ namespace YooAsset.Editor int playerId = args.playerId; var debugReport = DiagnosticReport.Deserialize(args.data); - if (debugReport.DebuggerVersion != DiagnosticSystemDefine.DebuggerVersion) + if (debugReport.ProtocolVersion != DiagnosticSystemDefine.ProtocolVersion) { - Debug.LogWarning($"Debugger versions are inconsistent : {debugReport.DebuggerVersion} != {DiagnosticSystemDefine.DebuggerVersion}"); + Debug.LogWarning($"Debugger versions are inconsistent : {debugReport.ProtocolVersion} != {DiagnosticSystemDefine.ProtocolVersion}"); return; } @@ -254,10 +254,10 @@ namespace YooAsset.Editor private void OnRecordToggleValueChange(ChangeEvent evt) { // 发送采集数据的命令 - RemoteDebugCommand command = new RemoteDebugCommand(); - command.CommandType = (int)EDebugCommandType.AutoSampling; + DiagnosticCommand command = new DiagnosticCommand(); + command.CommandType = (int)EDiagnosticCommandType.AutoSampling; command.Parameter = evt.newValue ? "open" : "close"; - byte[] data = RemoteDebugCommand.Serialize(command); + byte[] data = DiagnosticCommand.Serialize(command); EditorConnection.instance.Send(DiagnosticSystemDefine.EditorToPlayerMessageId, data); MockEditorConnection.Instance.Send(DiagnosticSystemDefine.EditorToPlayerMessageId, data); } @@ -265,10 +265,10 @@ namespace YooAsset.Editor private void SampleBtn_onClick() { // 发送采集数据的命令 - RemoteDebugCommand command = new RemoteDebugCommand(); - command.CommandType = (int)EDebugCommandType.SampleOnce; + DiagnosticCommand command = new DiagnosticCommand(); + command.CommandType = (int)EDiagnosticCommandType.SampleOnce; command.Parameter = string.Empty; - byte[] data = RemoteDebugCommand.Serialize(command); + byte[] data = DiagnosticCommand.Serialize(command); EditorConnection.instance.Send(DiagnosticSystemDefine.EditorToPlayerMessageId, data); MockEditorConnection.Instance.Send(DiagnosticSystemDefine.EditorToPlayerMessageId, data); } @@ -289,7 +289,7 @@ namespace YooAsset.Editor packageData.ProviderInfos.Sort(); foreach (var providerInfo in packageData.ProviderInfos) { - providerInfo.DependentBundles.Sort(); + providerInfo.Dependencies.Sort(); } } diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.cs b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.cs index 51ba7146..473c59dc 100644 --- a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.cs @@ -315,9 +315,9 @@ namespace YooAsset.Editor rowData.ProviderInfo = providerInfo; rowData.AddAssetPathCell("PackageName", packageData.PackageName); rowData.AddStringValueCell("AssetPath", providerInfo.AssetPath); - rowData.AddStringValueCell("SpawnScene", providerInfo.OriginScene); + rowData.AddStringValueCell("SpawnScene", providerInfo.SpawnScene); rowData.AddStringValueCell("StartTime", providerInfo.StartTime); - rowData.AddLongValueCell("LoadingTime", providerInfo.ElapsedMS); + rowData.AddLongValueCell("LoadingTime", providerInfo.ElapsedMilliseconds); rowData.AddLongValueCell("RefCount", providerInfo.ReferenceCount); rowData.AddStringValueCell("Status", providerInfo.Status.ToString()); _sourceDatas.Add(rowData); @@ -378,8 +378,8 @@ namespace YooAsset.Editor DiagnosticProviderInfo providerInfo = providerTableData.ProviderInfo; // 填充依赖数据 - var sourceDatas = new List(providerInfo.DependentBundles.Count); - foreach (var bundleName in providerInfo.DependentBundles) + var sourceDatas = new List(providerInfo.Dependencies.Count); + foreach (var bundleName in providerInfo.Dependencies) { var dependBundleInfo = packageData.GetBundleInfo(bundleName); var rowData = new DependTableData(); diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.cs b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.cs index 0a96a0b9..7cc16fa6 100644 --- a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.cs @@ -446,14 +446,14 @@ namespace YooAsset.Editor var sourceDatas = new List(1000); foreach (var providerInfo in packageData.ProviderInfos) { - foreach (var dependBundleName in providerInfo.DependentBundles) + foreach (var dependBundleName in providerInfo.Dependencies) { if (dependBundleName == selectBundleInfo.BundleName) { var rowData = new UsingTableData(); rowData.ProviderInfo = providerInfo; rowData.AddStringValueCell("UsingAssets", providerInfo.AssetPath); - rowData.AddStringValueCell("SpawnScene", providerInfo.OriginScene); + rowData.AddStringValueCell("SpawnScene", providerInfo.SpawnScene); rowData.AddStringValueCell("StartTime", providerInfo.StartTime); rowData.AddLongValueCell("RefCount", providerInfo.ReferenceCount); rowData.AddStringValueCell("Status", providerInfo.Status); @@ -469,7 +469,7 @@ namespace YooAsset.Editor // 填充ReferenceTableView { var sourceDatas = new List(1000); - foreach (string referenceBundleName in selectBundleInfo.ReferencedByBundles) + foreach (string referenceBundleName in selectBundleInfo.Referencers) { var bundleInfo = packageData.GetBundleInfo(referenceBundleName); var rowData = new ReferenceTableData(); diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerOperationListViewer.cs b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerOperationListViewer.cs index 9af278ce..d63a4038 100644 --- a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerOperationListViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerOperationListViewer.cs @@ -321,7 +321,7 @@ namespace YooAsset.Editor rowData.AddLongValueCell("Priority", operationInfo.Priority); rowData.AddDoubleValueCell("Progress", operationInfo.Progress); rowData.AddStringValueCell("StartTime", operationInfo.StartTime); - rowData.AddLongValueCell("ElapsedMS", operationInfo.ElapsedMS); + rowData.AddLongValueCell("ElapsedMS", operationInfo.ElapsedMilliseconds); rowData.AddStringValueCell("Status", operationInfo.Status.ToString()); rowData.AddStringValueCell("Desc", operationInfo.OperationDesc); _sourceDatas.Add(rowData); @@ -474,7 +474,7 @@ namespace YooAsset.Editor // ElapsedMS { var label = container.Q