From d535500b9e8b9f5d2f4d75281f3816edc51574e3 Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Mon, 20 Jun 2022 19:56:19 +0800
Subject: [PATCH] Update AssetBundleDebugger

---
 .../AssetBundleDebuggerWindow.cs              | 69 ++++++++-----------
 .../AssetBundleDebuggerWindow.uxml            |  1 +
 .../Debugger/RemoteDebuggerInRuntime.cs       | 13 +---
 3 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs
index b1e9d05..4ba9591 100644
--- a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs
@@ -43,6 +43,7 @@ namespace YooAsset.Editor
 
 		private readonly Dictionary<int, RemotePlayerSession> _playerSessions = new Dictionary<int, RemotePlayerSession>();
 
+		private Label _playerName;
 		private ToolbarMenu _viewModeMenu;
 		private DebuggerAssetListViewer _assetListViewer;
 		private DebuggerBundleListViewer _bundleListViewer;
@@ -69,11 +70,15 @@ namespace YooAsset.Editor
 				var sampleBtn = root.Q<Button>("SampleButton");
 				sampleBtn.clicked += SampleBtn_onClick;
 
+				// 用户列表菜单
+				_playerName = root.Q<Label>("PlayerName");
+				_playerName.text = "Editor player";
+
 				// 视口模式菜单
 				_viewModeMenu = root.Q<ToolbarMenu>("ViewModeMenu");
-				//_viewModeMenu.menu.AppendAction(EViewMode.MemoryView.ToString(), ViewModeMenuAction0, ViewModeMenuFun0);
-				_viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), ViewModeMenuAction1, ViewModeMenuFun1);
-				_viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), ViewModeMenuAction2, ViewModeMenuFun2);
+				_viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), ViewModeMenuAction, ViewModeMenuFun, EViewMode.AssetView);
+				_viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), ViewModeMenuAction, ViewModeMenuFun, EViewMode.BundleView);
+				_viewModeMenu.text = EViewMode.AssetView.ToString();
 
 				// 搜索栏
 				var searchField = root.Q<ToolbarSearchField>("SearchField");
@@ -89,8 +94,14 @@ namespace YooAsset.Editor
 
 				// 显示视图
 				_viewMode = EViewMode.AssetView;
-				_viewModeMenu.text = EViewMode.AssetView.ToString();
 				_assetListViewer.AttachParent(root);
+
+				// 远程调试
+				EditorConnection.instance.Initialize();
+				EditorConnection.instance.RegisterConnection(OnHandleConnectionEvent);
+				EditorConnection.instance.RegisterDisconnection(OnHandleDisconnectionEvent);
+				EditorConnection.instance.Register(RemoteDebuggerDefine.kMsgSendPlayerToEditor, OnHandlePlayerMessage);
+				RemoteDebuggerInRuntime.EditorHandleDebugReportCallback = OnHandleDebugReport;
 			}
 			catch (Exception e)
 			{
@@ -99,28 +110,22 @@ namespace YooAsset.Editor
 		}
 		public void OnDestroy()
 		{
-		}
-
-		private void OnEnable()
-		{
-			EditorConnection.instance.Initialize();
-			EditorConnection.instance.RegisterConnection(OnHandleConnectionEvent);
-			EditorConnection.instance.RegisterDisconnection(OnHandleDisconnectionEvent);
-			EditorConnection.instance.Register(RemoteDebuggerDefine.kMsgSendPlayerToEditor, OnHandlePlayerMessage);
-			RemoteDebuggerInRuntime.EditorHandleDebugReportCallback = OnHandleDebugReport;
-		}
-		private void OnDisable()
-		{
+			// 远程调试
+			EditorConnection.instance.UnregisterConnection(OnHandleConnectionEvent);
+			EditorConnection.instance.UnregisterDisconnection(OnHandleDisconnectionEvent);
 			EditorConnection.instance.Unregister(RemoteDebuggerDefine.kMsgSendPlayerToEditor, OnHandlePlayerMessage);
 			_playerSessions.Clear();
 		}
+
 		private void OnHandleConnectionEvent(int playerId)
 		{
 			Debug.Log($"Game player connection : {playerId}");
+			_playerName.text = $"Connected player : {playerId}";
 		}
 		private void OnHandleDisconnectionEvent(int playerId)
 		{
 			Debug.Log($"Game player disconnection : {playerId}");
+			_playerName.text = $"Disconneced player : {playerId}";
 			RemovePlayerSession(playerId);
 		}
 		private void OnHandlePlayerMessage(MessageEventArgs args)
@@ -175,38 +180,22 @@ namespace YooAsset.Editor
 				_bundleListViewer.FillViewData(_debugReport, _searchKeyWord);
 			}
 		}
-		private void ViewModeMenuAction1(DropdownMenuAction action)
+		private void ViewModeMenuAction(DropdownMenuAction action)
 		{
-			if (_viewMode != EViewMode.AssetView)
+			var viewMode = (EViewMode)action.userData;
+			if (_viewMode != viewMode)
 			{
-				_viewMode = EViewMode.AssetView;
+				_viewMode = viewMode;
 				VisualElement root = this.rootVisualElement;
-				_viewModeMenu.text = EViewMode.AssetView.ToString();
+				_viewModeMenu.text = viewMode.ToString();
 				_assetListViewer.AttachParent(root);
 				_bundleListViewer.DetachParent();
 			}
 		}
-		private void ViewModeMenuAction2(DropdownMenuAction action)
+		private DropdownMenuAction.Status ViewModeMenuFun(DropdownMenuAction action)
 		{
-			if (_viewMode != EViewMode.BundleView)
-			{
-				_viewMode = EViewMode.BundleView;
-				VisualElement root = this.rootVisualElement;
-				_viewModeMenu.text = EViewMode.BundleView.ToString();
-				_assetListViewer.DetachParent();
-				_bundleListViewer.AttachParent(root);
-			}
-		}
-		private DropdownMenuAction.Status ViewModeMenuFun1(DropdownMenuAction action)
-		{
-			if (_viewMode == EViewMode.AssetView)
-				return DropdownMenuAction.Status.Checked;
-			else
-				return DropdownMenuAction.Status.Normal;
-		}
-		private DropdownMenuAction.Status ViewModeMenuFun2(DropdownMenuAction action)
-		{
-			if (_viewMode == EViewMode.BundleView)
+			var viewMode = (EViewMode)action.userData;
+			if (_viewMode == viewMode)
 				return DropdownMenuAction.Status.Checked;
 			else
 				return DropdownMenuAction.Status.Normal;
diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml
index dca9db6..5714c93 100644
--- a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml
@@ -1,5 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <uie:Toolbar name="Toolbar" style="display: flex;">
+        <ui:Label text="Player" display-tooltip-when-elided="true" name="PlayerName" style="width: 200px; -unity-text-align: middle-left; padding-left: 5px;" />
         <uie:ToolbarMenu display-tooltip-when-elided="true" name="ViewModeMenu" text="ViewMode" style="width: 100px; flex-grow: 0;" />
         <uie:ToolbarSearchField focusable="true" name="SearchField" style="flex-grow: 1;" />
         <uie:ToolbarButton text="刷新" display-tooltip-when-elided="true" name="SampleButton" style="width: 70px; background-color: rgb(15, 118, 31); -unity-text-align: middle-center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; border-left-width: 1px; border-right-width: 1px;" />
diff --git a/Assets/YooAsset/Runtime/Debugger/RemoteDebuggerInRuntime.cs b/Assets/YooAsset/Runtime/Debugger/RemoteDebuggerInRuntime.cs
index b45a250..243015d 100644
--- a/Assets/YooAsset/Runtime/Debugger/RemoteDebuggerInRuntime.cs
+++ b/Assets/YooAsset/Runtime/Debugger/RemoteDebuggerInRuntime.cs
@@ -27,27 +27,16 @@ namespace YooAsset
 #else
 		private void OnEnable()
 		{
-			PlayerConnection.instance.RegisterConnection(OnHandleConnectionEvent);
-			PlayerConnection.instance.RegisterDisconnection(OnHandleDisconnectionEvent);
 			PlayerConnection.instance.Register(RemoteDebuggerDefine.kMsgSendEditorToPlayer, OnHandleEditorMessage);
 		}
 		private void OnDisable()
 		{
 			PlayerConnection.instance.Unregister(RemoteDebuggerDefine.kMsgSendEditorToPlayer, OnHandleEditorMessage);
 		}
-
-		private void OnHandleConnectionEvent(int id)
-		{
-			YooLogger.Log($"Editor player connection : {id}");
-		}
-		private void OnHandleDisconnectionEvent(int id)
-		{
-			YooLogger.Log($"Editor player disconnection : {id}");
-		}
 		private void OnHandleEditorMessage(MessageEventArgs args)
 		{
 			var command = RemoteCommand.Deserialize(args.data);
-			YooLogger.Log($"On handle remote command : {command.CommandType} : {command.CommandParam}");
+			YooLogger.Log($"On handle remote command : {command.CommandType} Param : {command.CommandParam}");
 			if (command.CommandType == (int)ERemoteCommand.SampleOnce)
 			{
 				var debugReport = AssetSystem.GetDebugReport();