修改Debugger

Jiang Yin · Jiang Yin · commit a7ff7eaa9d30 · 2021-03-13T15:09:27.000+08:00
diff --git a/Scripts/Editor/ResourceBuilder/ResourceBuilder.cs b/Scripts/Editor/ResourceBuilder/ResourceBuilder.cs
@@ -6,6 +6,7 @@
 //------------------------------------------------------------
 
 using GameFramework;
+using System;
 using System.IO;
 using UnityEditor;
 using UnityEngine;
@@ -346,7 +347,7 @@ private void GetBuildMessage(out string message, out MessageType messageType)
             {
                 if (!string.IsNullOrEmpty(message))
                 {
-                    message += "\n";
+                    message += Environment.NewLine;
                 }
 
                 message += "Platform is invalid.";
@@ -356,7 +357,7 @@ private void GetBuildMessage(out string message, out MessageType messageType)
             {
                 if (!string.IsNullOrEmpty(message))
                 {
-                    message += "\n";
+                    message += Environment.NewLine;
                 }
 
                 message += "Compression helper is invalid.";
@@ -366,7 +367,7 @@ private void GetBuildMessage(out string message, out MessageType messageType)
             {
                 if (!string.IsNullOrEmpty(message))
                 {
-                    message += "\n";
+                    message += Environment.NewLine;
                 }
 
                 message += "Output directory is invalid.";
diff --git a/Scripts/Editor/ResourcePackBuilder/ResourcePackBuilder.cs b/Scripts/Editor/ResourcePackBuilder/ResourcePackBuilder.cs
@@ -6,6 +6,7 @@
 //------------------------------------------------------------
 
 using GameFramework;
+using System;
 using UnityEditor;
 using UnityEngine;
 
@@ -172,7 +173,7 @@ private void OnGUI()
                         {
                             if (!string.IsNullOrEmpty(message))
                             {
-                                message += "\n";
+                                message += Environment.NewLine;
                             }
 
                             message += "Working directory is invalid.";
@@ -182,7 +183,7 @@ private void OnGUI()
                         {
                             if (!string.IsNullOrEmpty(message))
                             {
-                                message += "\n";
+                                message += Environment.NewLine;
                             }
 
                             message += "Platform is invalid.";
@@ -192,7 +193,7 @@ private void OnGUI()
                         {
                             if (!string.IsNullOrEmpty(message))
                             {
-                                message += "\n";
+                                message += Environment.NewLine;
                             }
 
                             message += "Compression helper is invalid.";
diff --git a/Scripts/Runtime/Debugger/DebuggerComponent.ConsoleWindow.cs b/Scripts/Runtime/Debugger/DebuggerComponent.ConsoleWindow.cs
@@ -19,7 +19,6 @@ public sealed partial class DebuggerComponent : GameFrameworkComponent
         private sealed class ConsoleWindow : IDebuggerWindow
         {
             private readonly Queue<LogNode> m_LogNodes = new Queue<LogNode>();
-            private readonly TextEditor m_TextEditor = new TextEditor();
 
             private SettingComponent m_SettingComponent = null;
             private Vector2 m_LogScrollPosition = Vector2.zero;
@@ -367,21 +366,14 @@ public void OnDraw()
                     {
                         if (m_SelectedNode != null)
                         {
-                            GUILayout.BeginHorizontal();
                             Color32 color = GetLogStringColor(m_SelectedNode.LogType);
-                            GUILayout.Label(Utility.Text.Format("<color=#{0}{1}{2}{3}><b>{4}</b></color>", color.r.ToString("x2"), color.g.ToString("x2"), color.b.ToString("x2"), color.a.ToString("x2"), m_SelectedNode.LogMessage));
-                            if (GUILayout.Button("COPY", GUILayout.Width(60f), GUILayout.Height(30f)))
+                            if (GUILayout.Button(Utility.Text.Format("<color=#{0}{1}{2}{3}><b>{4}</b></color>{6}{6}{5}", color.r.ToString("x2"), color.g.ToString("x2"), color.b.ToString("x2"), color.a.ToString("x2"), m_SelectedNode.LogMessage, m_SelectedNode.StackTrack, Environment.NewLine), "label"))
                             {
-                                m_TextEditor.text = Utility.Text.Format("{0}{2}{2}{1}", m_SelectedNode.LogMessage, m_SelectedNode.StackTrack, Environment.NewLine);
-                                m_TextEditor.OnFocus();
-                                m_TextEditor.Copy();
-                                m_TextEditor.text = null;
+                                CopyToClipboard(Utility.Text.Format("{0}{2}{2}{1}", m_SelectedNode.LogMessage, m_SelectedNode.StackTrack, Environment.NewLine));
                             }
-                            GUILayout.EndHorizontal();
-                            GUILayout.Label(m_SelectedNode.StackTrack);
                         }
-                        GUILayout.EndScrollView();
                     }
+                    GUILayout.EndScrollView();
                 }
                 GUILayout.EndVertical();
             }
diff --git a/Scripts/Runtime/Debugger/DebuggerComponent.ScrollableDebuggerWindowBase.cs b/Scripts/Runtime/Debugger/DebuggerComponent.ScrollableDebuggerWindowBase.cs
@@ -54,7 +54,10 @@ protected static void DrawItem(string title, string content)
                 GUILayout.BeginHorizontal();
                 {
                     GUILayout.Label(title, GUILayout.Width(TitleWidth));
-                    GUILayout.Label(content);
+                    if (GUILayout.Button(content, "label"))
+                    {
+                        CopyToClipboard(content);
+                    }
                 }
                 GUILayout.EndHorizontal();
             }
diff --git a/Scripts/Runtime/Debugger/DebuggerComponent.cs b/Scripts/Runtime/Debugger/DebuggerComponent.cs
@@ -34,6 +34,7 @@ public sealed partial class DebuggerComponent : GameFrameworkComponent
         /// </summary>
         internal static readonly float DefaultWindowScale = 1f;
 
+        private static readonly TextEditor s_TextEditor = new TextEditor();
         private IDebuggerManager m_DebuggerManager = null;
         private Rect m_DragRect = new Rect(0f, 0f, float.MaxValue, 25f);
         private Rect m_IconRect = DefaultIconRect;
@@ -424,5 +425,13 @@ private void DrawDebuggerWindowIcon(int windowId)
                 m_ShowFullWindow = true;
             }
         }
+
+        private static void CopyToClipboard(string content)
+        {
+            s_TextEditor.text = content;
+            s_TextEditor.OnFocus();
+            s_TextEditor.Copy();
+            s_TextEditor.text = null;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`//------------------------------------------------------------`
`7`	`7`
`8`	`8`	`using GameFramework;`
	`9`	`+using System;`
`9`	`10`	`using System.IO;`
`10`	`11`	`using UnityEditor;`
`11`	`12`	`using UnityEngine;`
`@@ -346,7 +347,7 @@ private void GetBuildMessage(out string message, out MessageType messageType)`
`346`	`347`	`{`
`347`	`348`	`if (!string.IsNullOrEmpty(message))`
`348`	`349`	`{`
`349`		`- message += "\n";`
	`350`	`+ message += Environment.NewLine;`
`350`	`351`	`}`
`351`	`352`
`352`	`353`	`message += "Platform is invalid.";`
`@@ -356,7 +357,7 @@ private void GetBuildMessage(out string message, out MessageType messageType)`
`356`	`357`	`{`
`357`	`358`	`if (!string.IsNullOrEmpty(message))`
`358`	`359`	`{`
`359`		`- message += "\n";`
	`360`	`+ message += Environment.NewLine;`
`360`	`361`	`}`
`361`	`362`
`362`	`363`	`message += "Compression helper is invalid.";`
`@@ -366,7 +367,7 @@ private void GetBuildMessage(out string message, out MessageType messageType)`
`366`	`367`	`{`
`367`	`368`	`if (!string.IsNullOrEmpty(message))`
`368`	`369`	`{`
`369`		`- message += "\n";`
	`370`	`+ message += Environment.NewLine;`
`370`	`371`	`}`
`371`	`372`
`372`	`373`	`message += "Output directory is invalid.";`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public sealed partial class DebuggerComponent : GameFrameworkComponent`
`19`	`19`	`private sealed class ConsoleWindow : IDebuggerWindow`
`20`	`20`	`{`
`21`	`21`	`private readonly Queue<LogNode> m_LogNodes = new Queue<LogNode>();`
`22`		`- private readonly TextEditor m_TextEditor = new TextEditor();`
`23`	`22`
`24`	`23`	`private SettingComponent m_SettingComponent = null;`
`25`	`24`	`private Vector2 m_LogScrollPosition = Vector2.zero;`
`@@ -367,21 +366,14 @@ public void OnDraw()`
`367`	`366`	`{`
`368`	`367`	`if (m_SelectedNode != null)`
`369`	`368`	`{`
`370`		`- GUILayout.BeginHorizontal();`
`371`	`369`	`Color32 color = GetLogStringColor(m_SelectedNode.LogType);`
`372`		`- GUILayout.Label(Utility.Text.Format("<color=#{0}{1}{2}{3}><b>{4}</b></color>", color.r.ToString("x2"), color.g.ToString("x2"), color.b.ToString("x2"), color.a.ToString("x2"), m_SelectedNode.LogMessage));`
`373`		`- if (GUILayout.Button("COPY", GUILayout.Width(60f), GUILayout.Height(30f)))`
	`370`	`+ if (GUILayout.Button(Utility.Text.Format("<color=#{0}{1}{2}{3}><b>{4}</b></color>{6}{6}{5}", color.r.ToString("x2"), color.g.ToString("x2"), color.b.ToString("x2"), color.a.ToString("x2"), m_SelectedNode.LogMessage, m_SelectedNode.StackTrack, Environment.NewLine), "label"))`
`374`	`371`	`{`
`375`		`- m_TextEditor.text = Utility.Text.Format("{0}{2}{2}{1}", m_SelectedNode.LogMessage, m_SelectedNode.StackTrack, Environment.NewLine);`
`376`		`- m_TextEditor.OnFocus();`
`377`		`- m_TextEditor.Copy();`
`378`		`- m_TextEditor.text = null;`
	`372`	`+ CopyToClipboard(Utility.Text.Format("{0}{2}{2}{1}", m_SelectedNode.LogMessage, m_SelectedNode.StackTrack, Environment.NewLine));`
`379`	`373`	`}`
`380`		`- GUILayout.EndHorizontal();`
`381`		`- GUILayout.Label(m_SelectedNode.StackTrack);`
`382`	`374`	`}`
`383`		`- GUILayout.EndScrollView();`
`384`	`375`	`}`
	`376`	`+ GUILayout.EndScrollView();`
`385`	`377`	`}`
`386`	`378`	`GUILayout.EndVertical();`
`387`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,10 @@ protected static void DrawItem(string title, string content)`
`54`	`54`	`GUILayout.BeginHorizontal();`
`55`	`55`	`{`
`56`	`56`	`GUILayout.Label(title, GUILayout.Width(TitleWidth));`
`57`		`- GUILayout.Label(content);`
	`57`	`+ if (GUILayout.Button(content, "label"))`
	`58`	`+ {`
	`59`	`+ CopyToClipboard(content);`
	`60`	`+ }`
`58`	`61`	`}`
`59`	`62`	`GUILayout.EndHorizontal();`
`60`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public sealed partial class DebuggerComponent : GameFrameworkComponent`
`34`	`34`	`/// </summary>`
`35`	`35`	`internal static readonly float DefaultWindowScale = 1f;`
`36`	`36`
	`37`	`+ private static readonly TextEditor s_TextEditor = new TextEditor();`
`37`	`38`	`private IDebuggerManager m_DebuggerManager = null;`
`38`	`39`	`private Rect m_DragRect = new Rect(0f, 0f, float.MaxValue, 25f);`
`39`	`40`	`private Rect m_IconRect = DefaultIconRect;`
`@@ -424,5 +425,13 @@ private void DrawDebuggerWindowIcon(int windowId)`
`424`	`425`	`m_ShowFullWindow = true;`
`425`	`426`	`}`
`426`	`427`	`}`
	`428`	`+`
	`429`	`+ private static void CopyToClipboard(string content)`
	`430`	`+ {`
	`431`	`+ s_TextEditor.text = content;`
	`432`	`+ s_TextEditor.OnFocus();`
	`433`	`+ s_TextEditor.Copy();`
	`434`	`+ s_TextEditor.text = null;`
	`435`	`+ }`
`427`	`436`	`}`
`428`	`437`	`}`