From 54fad068f41ba7b0d2f16699a3f774be2a0d84e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 14 二月 2019 12:02:50 +0800
Subject: [PATCH] 3335 配置表读取重构。
---
Assets/Editor/Tool/NetPkgTool.cs | 625 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 348 insertions(+), 277 deletions(-)
diff --git a/Assets/Editor/Tool/NetPkgTool.cs b/Assets/Editor/Tool/NetPkgTool.cs
index d50614a..c8c6a43 100644
--- a/Assets/Editor/Tool/NetPkgTool.cs
+++ b/Assets/Editor/Tool/NetPkgTool.cs
@@ -1,277 +1,348 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-using System.Windows.Forms;
-using System;
-using System.Reflection;
-
-public class NetPkgTool : EditorWindow
-{
- public static NetPkgTool window = null;
-
- [UnityEditor.MenuItem("绋嬪簭/灏佸寘鏌ョ湅宸ュ叿 &1")]
- static void Init()
- {
- window = GetWindow(typeof(NetPkgTool), false, "灏佸寘鏌ョ湅宸ュ叿") as NetPkgTool;
- window.Show();
- window.autoRepaintOnSceneChange = true;
- }
-
- static int MAX_PACKAGE_COUNT = 200;
-
- private static List<NetPkg> NetPkgLst = null;
- private bool IsStopRecPkg = false;
- private Vector2 scrollPosition;
- private string stopRecBtnDetail = "鏆傚仠鎺ユ敹鍖�";
-
- private bool professionalSkin {
- get { return LocalSave.GetBool("NetPackageSkinPattern", false); }
- set { LocalSave.SetBool("NetPackageSkinPattern", value); }
- }
-
- private string filterNetPkgStr {
- get { return LocalSave.GetString("NetPkgToolFilterNetPackageString"); }
- set { LocalSave.SetString("NetPkgToolFilterNetPackageString", value); }
- }
-
- private string simSendPkgDetail = "";
- private NetPkgType m_CurNetPkgType = NetPkgType.All;
- private bool reveralFilter {
- get { return LocalSave.GetBool("NetPkgToolFilterNetPackageReveralFilter", false); }
- set { LocalSave.SetBool("NetPkgToolFilterNetPackageReveralFilter", value); }
- }
-
- bool showHeartPackage {
- get { return LocalSave.GetBool("NetPackageHeartFillter", true); }
- set {
- LocalSave.SetBool("NetPackageHeartFillter", value);
- }
- }
-
- static int maxShowPackageCount {
- get { return LocalSave.GetInt("NetPackageShowMaxCount", 100); }
- set { LocalSave.SetInt("NetPackageShowMaxCount", value); }
- }
-
- void OnGUI()
- {
- NetPkgLst = NetPkgCtl.GetNetPkg();
-
- GUI.skin.customStyles[1].alignment = TextAnchor.UpperLeft;
- GUI.skin.customStyles[1].fontStyle = FontStyle.Normal;
- GUI.skin.customStyles[1].fixedWidth = 450;
-
- GUI.skin.button.normal.textColor = professionalSkin ? Color.white : Color.black;
-
- GUILayout.BeginVertical();
-
- GUILayout.BeginHorizontal();
-
- professionalSkin = !GUILayout.Toggle(!professionalSkin, "鏅�氱毊鑲�");
- professionalSkin = GUILayout.Toggle(professionalSkin, "楂樼骇鐨偆");
-
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal();
- maxShowPackageCount = EditorGUILayout.IntField("鏈�澶ф樉绀哄皝鍖呮暟锛�", maxShowPackageCount);
- showHeartPackage = GUILayout.Toggle(showHeartPackage, "蹇冭烦鍖�");
-
- m_CurNetPkgType = GUILayout.Toggle(m_CurNetPkgType == NetPkgType.All, "鍏ㄩ儴") ? NetPkgType.All : m_CurNetPkgType;
- m_CurNetPkgType = GUILayout.Toggle(m_CurNetPkgType == NetPkgType.Server, "鏀跺寘") ? NetPkgType.Server : m_CurNetPkgType;
- m_CurNetPkgType = GUILayout.Toggle(m_CurNetPkgType == NetPkgType.Client, "鍙戝寘") ? NetPkgType.Client : m_CurNetPkgType;
-
- GUILayout.EndHorizontal();
-
- GUILayout.BeginHorizontal();
-
- filterNetPkgStr = EditorGUILayout.TextField("鍏抽敭瀛�", filterNetPkgStr);
- reveralFilter = GUILayout.Toggle(reveralFilter, "鍙嶅悜杩囨护");
-
- GUILayout.EndHorizontal();
-
- SimSendPkg();
-
- scrollPosition = GUILayout.BeginScrollView(scrollPosition, false, false);
-
- if (NetPkgLst != null)
- {
- string[] filters = null;
- if (!string.IsNullOrEmpty(filterNetPkgStr))
- {
- filters = filterNetPkgStr.Split(' ');
- }
-
- var showCount = 0;
- for (int i = NetPkgLst.Count - 1; i >= 0; i--)
- {
- if (NetPkgLst[i] == null)
- {
- continue;
- }
-
- if (m_CurNetPkgType != NetPkgType.All && m_CurNetPkgType != NetPkgLst[i].NetPkgTp)
- {
- continue;
- }
-
- if (!showHeartPackage &&
- (NetPkgLst[i].GameNetName.Contains("OnlineReturn")
- || NetPkgLst[i].GameNetName.Contains("ServerHeart")
- || NetPkgLst[i].GameNetName.Contains("OnlineReply")))
- {
- continue;
- }
-
- showCount++;
- if (showCount >= maxShowPackageCount)
- {
- break;
- }
-
- if (filters != null)
- {
- var contain = false;
- foreach (var filter in filters)
- {
- if (NetPkgLst[i].GameNetName.Contains(filter))
- {
- contain = true;
- break;
- }
- }
-
- if (reveralFilter && contain)
- {
- continue;
- }
- else if (!reveralFilter && !contain)
- {
- continue;
- }
- }
-
- string pkgName = StringUtility.Contact(NetPkgLst[i].SendOrGetTime, " ", NetPkgLst[i].GameNetName);
- try
- {
- EditorGUILayout.BeginHorizontal();
-
- if (professionalSkin)
- {
- GUI.skin.button.normal.textColor = NetPkgLst[i].NetPkgTp == NetPkgType.Client ? Color.yellow : Color.white;
- }
- else
- {
- GUI.skin.button.normal.textColor = NetPkgLst[i].NetPkgTp == NetPkgType.Client ? Color.blue : Color.black;
- }
-
- if (GUILayout.Button(NetPkgLst[i].NetPkgTp == NetPkgType.Client ? "CS" : "SC", GUILayout.Width(30)))
- {
- var pkg = NetPkgLst[i];
- PackageDetailsWindow.packageTime = pkg.SendOrGetTime;
- PackageDetailsWindow.packageName = pkg.GameNetName;
- PackageDetailsWindow.packageBytes = pkg.GameNetPkgStr;
- PackageDetailsWindow.packageDetails = pkg.fieldDetails;
- }
-
- GUI.skin.button.normal.textColor = professionalSkin ? Color.white : Color.black;
-
- EditorGUILayout.LabelField(pkgName, GUILayout.Width(260));
- EditorGUILayout.TextField(NetPkgLst[i].fields);
-
- EditorGUILayout.EndHorizontal();
- }
- catch (Exception ex)
- {
-
- }
-
- }
- }
- GUILayout.EndScrollView();
-
- GUILayout.BeginHorizontal();
- if (GUILayout.Button(stopRecBtnDetail))
- {
- IsStopRecPkg = !IsStopRecPkg;
- NetPkgCtl.IsStopRec = IsStopRecPkg;
- if (IsStopRecPkg)
- {
- stopRecBtnDetail = "寮�濮嬫帴鏀跺寘";
- }
- else
- {
- List<NetPkg> tempNetPkgLst = NetPkgCtl.GetTempNetPkg();
- if (NetPkgLst != null)
- {
- NetPkgLst.AddRange(tempNetPkgLst);
-
- while (NetPkgLst.Count > MAX_PACKAGE_COUNT)
- {
- NetPkgLst.RemoveAt(0);
- }
- }
-
- tempNetPkgLst.Clear();
- stopRecBtnDetail = "鏆傚仠鎺ユ敹鍖�";
- }
- }
-
- if (GUILayout.Button("娓呴櫎"))
- {
- if (NetPkgCtl.GetNetPkg() != null)
- {
- NetPkgCtl.GetNetPkg().Clear();
- }
- }
-
- GUILayout.EndHorizontal();
- GUILayout.EndVertical();
- }
-
-
- private void SimSendPkg()
- {
- GUILayout.BeginHorizontal();
- simSendPkgDetail = EditorGUILayout.TextField("妯℃嫙鍙戝寘鍐呭锛�", simSendPkgDetail);
- if (GUILayout.Button("妯℃嫙鍙戝寘"))
- {
- string sendPkgDetail = simSendPkgDetail.Replace(" ", "");
- if (sendPkgDetail.Length % 2 != 0)
- {
- sendPkgDetail += " ";
- }
- byte[] sendBytes = new byte[sendPkgDetail.Length / 2];
- for (int i = 0; i < sendBytes.Length; i++)
- {
- sendBytes[i] = Convert.ToByte(sendPkgDetail.Substring(i * 2, 2), 16);
- }
- GameNetSystem.Instance.SendInfo(sendBytes);
- }
- GUILayout.EndHorizontal();
- }
-
- private string NetPkgTypeString()
- {
- switch (m_CurNetPkgType)
- {
- case NetPkgType.All:
- return "鍏ㄩ儴";
- case NetPkgType.Server:
- return "鏀跺寘";
- case NetPkgType.Client:
- return "鍙戝寘";
- default:
- return "鍏ㄩ儴";
- }
- }
-}
-
-public enum FilterType
-{
- Filter = 0,
- ReverFilter = 1,
-}
-
-
-
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using System;
+using System.Text.RegularExpressions;
+using System.Threading;
+
+public class NetPackageWindow : EditorWindow
+{
+ public static NetPackageWindow window = null;
+
+ [UnityEditor.MenuItem("绋嬪簭/灏佸寘鏌ョ湅宸ュ叿 &1")]
+ static void Init()
+ {
+ window = GetWindow(typeof(NetPackageWindow), false, "灏佸寘鏌ョ湅宸ュ叿") as NetPackageWindow;
+ window.Show();
+ window.autoRepaintOnSceneChange = true;
+ }
+
+ static int MAX_PACKAGE_COUNT = 200;
+
+ private Vector2 scrollPosition;
+ string stopRecBtnDetail = "鏆傚仠鎺ユ敹鍖�";
+ bool professionalSkin;
+ string filterNetPkgStr;
+
+ private string simSendPkgDetail = "";
+ NetPackagetType m_CurrentType = NetPackagetType.All;
+
+ bool reveralFilter;
+ bool showHeartPackage;
+
+ bool showMainServerPackage;
+ bool showCrossServerPackage;
+ int maxShowPackageCount;
+
+ bool threading = true;
+ List<NetPackage> m_DrawPackages = new List<NetPackage>();
+ List<NetPackage> drawPackages {
+ get { lock (this) { return m_DrawPackages; } }
+ set {
+ lock (this)
+ {
+ m_DrawPackages = value;
+ }
+ }
+ }
+
+ private void OnDisable()
+ {
+ threading = false;
+
+ LocalSave.SetBool("NetPackageSkinPattern", professionalSkin);
+ LocalSave.SetInt("NetPackageShowMaxCount", maxShowPackageCount);
+ LocalSave.SetBool("CrossServerPackage", showCrossServerPackage);
+ LocalSave.SetBool("MainServerPackage", showMainServerPackage);
+ LocalSave.SetString("NetPkgToolFilterNetPackageString", filterNetPkgStr);
+ LocalSave.SetBool("NetPkgToolFilterNetPackageReveralFilter", reveralFilter);
+ }
+
+ private void OnEnable()
+ {
+ professionalSkin = LocalSave.GetBool("NetPackageSkinPattern", false);
+ maxShowPackageCount = LocalSave.GetInt("NetPackageShowMaxCount", 100);
+ showCrossServerPackage = LocalSave.GetBool("CrossServerPackage", true);
+ showMainServerPackage = LocalSave.GetBool("MainServerPackage", true);
+ filterNetPkgStr = LocalSave.GetString("NetPkgToolFilterNetPackageString");
+ reveralFilter = LocalSave.GetBool("NetPkgToolFilterNetPackageReveralFilter", false);
+
+ var thread = new Thread(OnThreading);
+ thread.IsBackground = true;
+ thread.Start();
+ }
+
+ public void CheckPackageShowState(NetPackage package)
+ {
+ if (m_CurrentType != NetPackagetType.All && m_CurrentType != package.type)
+ {
+ package.show = false;
+ return;
+ }
+
+ if (!showMainServerPackage && package.socketType == ServerType.Main)
+ {
+ package.show = false;
+ return;
+ }
+
+ if (!showCrossServerPackage && package.socketType == ServerType.CrossSever)
+ {
+ package.show = false;
+ return;
+ }
+
+ if (!showHeartPackage && Regex.IsMatch(package.name, ".*(OnlineReturn|ServerHeart|OnlineReply).*"))
+ {
+ package.show = false;
+ return;
+ }
+
+ if (!string.IsNullOrEmpty(filterNetPkgStr))
+ {
+ var contain = false;
+
+ try
+ {
+ contain = Regex.IsMatch(package.name, StringUtility.Contact(".*(", filterNetPkgStr.Replace(" ", "|"), ").*"));
+ }
+ catch (System.Exception ex)
+ {
+ }
+
+ if (reveralFilter && contain)
+ {
+ package.show = false;
+ return;
+ }
+ else if (!reveralFilter && !contain)
+ {
+ package.show = false;
+ return;
+ }
+ }
+
+ package.show = true;
+ }
+
+ private void OnThreading()
+ {
+ while (threading)
+ {
+ var packages = NetPkgCtl.GetPackages();
+ if (packages != null)
+ {
+ var showCount = 0;
+ for (int i = packages.Count - 1; i >= 0; i--)
+ {
+ if (packages[i] == null)
+ {
+ packages.RemoveAt(i);
+ continue;
+ }
+
+ showCount++;
+ if (showCount >= maxShowPackageCount)
+ {
+ break;
+ }
+
+ CheckPackageShowState(packages[i]);
+ }
+ }
+
+ Thread.Sleep(50);
+ }
+ }
+
+ void OnGUI()
+ {
+ GUI.skin.customStyles[1].alignment = TextAnchor.UpperLeft;
+ GUI.skin.customStyles[1].fontStyle = FontStyle.Normal;
+ GUI.skin.customStyles[1].fixedWidth = 450;
+
+ GUI.skin.button.normal.textColor = professionalSkin ? Color.white : Color.black;
+
+ GUILayout.BeginVertical();
+
+ GUILayout.BeginHorizontal();
+
+ professionalSkin = !GUILayout.Toggle(!professionalSkin, "鏅�氱毊鑲�");
+ professionalSkin = GUILayout.Toggle(professionalSkin, "楂樼骇鐨偆");
+
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal();
+ maxShowPackageCount = EditorGUILayout.IntField("鏈�澶ф樉绀哄皝鍖呮暟锛�", maxShowPackageCount);
+ showHeartPackage = GUILayout.Toggle(showHeartPackage, "蹇冭烦鍖�");
+ showMainServerPackage = GUILayout.Toggle(showMainServerPackage, "涓绘湇");
+ showCrossServerPackage = GUILayout.Toggle(showCrossServerPackage, "璺ㄦ湇");
+
+ m_CurrentType = GUILayout.Toggle(m_CurrentType == NetPackagetType.All, "鍏ㄩ儴") ? NetPackagetType.All : m_CurrentType;
+ m_CurrentType = GUILayout.Toggle(m_CurrentType == NetPackagetType.Server, "鏀跺寘") ? NetPackagetType.Server : m_CurrentType;
+ m_CurrentType = GUILayout.Toggle(m_CurrentType == NetPackagetType.Client, "鍙戝寘") ? NetPackagetType.Client : m_CurrentType;
+
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal();
+
+ filterNetPkgStr = EditorGUILayout.TextField("鍏抽敭瀛�", filterNetPkgStr);
+ reveralFilter = GUILayout.Toggle(reveralFilter, "鍙嶅悜杩囨护");
+
+ GUILayout.EndHorizontal();
+
+ SimSendPkg();
+ scrollPosition = GUILayout.BeginScrollView(scrollPosition, false, false);
+
+ var packages = NetPkgCtl.GetPackages();
+ if (packages != null)
+ {
+ var count = 0;
+ for (int i = packages.Count - 1; i >= 0; i--)
+ {
+ var package = packages[i];
+ if (package != null)
+ {
+ count++;
+ }
+
+ if (count >= maxShowPackageCount)
+ {
+ break;
+ }
+
+ if (package.show)
+ {
+ try
+ {
+ EditorGUILayout.BeginHorizontal();
+
+ if (professionalSkin)
+ {
+ GUI.skin.button.normal.textColor = package.type == NetPackagetType.Client ? Color.yellow : Color.white;
+ }
+ else
+ {
+ GUI.skin.button.normal.textColor = package.type == NetPackagetType.Client ? Color.blue : Color.black;
+ }
+
+ if (GUILayout.Button(package.type == NetPackagetType.Client ? "CS" : "SC", GUILayout.Width(30)))
+ {
+ PackageDetailsWindow.packageTime = package.time;
+ PackageDetailsWindow.packageName = package.name;
+ PackageDetailsWindow.packageBytes = package.content;
+ PackageDetailsWindow.packageDetails = package.fieldDetails;
+ }
+
+ GUI.skin.button.normal.textColor = professionalSkin ? Color.white : Color.black;
+ var showName = StringUtility.Contact(package.time, " ", package.name);
+ EditorGUILayout.LabelField(showName, GUILayout.Width(260));
+ EditorGUILayout.TextField(package.fields);
+
+ EditorGUILayout.EndHorizontal();
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
+
+ }
+ }
+
+ GUILayout.EndScrollView();
+
+ GUILayout.BeginHorizontal();
+ if (GUILayout.Button(stopRecBtnDetail))
+ {
+ NetPkgCtl.stopRecieve = !NetPkgCtl.stopRecieve;
+ if (NetPkgCtl.stopRecieve)
+ {
+ stopRecBtnDetail = "寮�濮嬫帴鏀跺寘";
+ }
+ else
+ {
+ List<NetPackage> tempNetPkgLst = NetPkgCtl.GetTempPackages();
+ if (packages != null)
+ {
+ packages.AddRange(tempNetPkgLst);
+
+ while (packages.Count > MAX_PACKAGE_COUNT)
+ {
+ packages.RemoveAt(0);
+ }
+ }
+
+ tempNetPkgLst.Clear();
+ stopRecBtnDetail = "鏆傚仠鎺ユ敹鍖�";
+ }
+ }
+
+ if (GUILayout.Button("鎵撳嵃鎽樿"))
+ {
+ NetPkgCtl.WriteAllNetLog(false);
+ }
+
+ if (GUILayout.Button("鎵撳嵃璇︽儏"))
+ {
+ NetPkgCtl.WriteAllNetLog(true);
+ }
+
+ if (GUILayout.Button("娓呴櫎"))
+ {
+ if (NetPkgCtl.GetPackages() != null)
+ {
+ NetPkgCtl.GetPackages().Clear();
+ }
+ }
+
+ GUILayout.EndHorizontal();
+ GUILayout.EndVertical();
+ }
+
+ private void SimSendPkg()
+ {
+ GUILayout.BeginHorizontal();
+ simSendPkgDetail = EditorGUILayout.TextField("妯℃嫙鍙戝寘鍐呭锛�", simSendPkgDetail);
+ if (GUILayout.Button("妯℃嫙鍙戝寘"))
+ {
+ string sendPkgDetail = simSendPkgDetail.Replace(" ", "");
+ if (sendPkgDetail.Length % 2 != 0)
+ {
+ sendPkgDetail += " ";
+ }
+ byte[] sendBytes = new byte[sendPkgDetail.Length / 2];
+ for (int i = 0; i < sendBytes.Length; i++)
+ {
+ sendBytes[i] = Convert.ToByte(sendPkgDetail.Substring(i * 2, 2), 16);
+ }
+ GameNetSystem.Instance.SendInfo(sendBytes);
+ }
+ GUILayout.EndHorizontal();
+ }
+
+ private string NetPkgTypeString()
+ {
+ switch (m_CurrentType)
+ {
+ case NetPackagetType.All:
+ return "鍏ㄩ儴";
+ case NetPackagetType.Server:
+ return "鏀跺寘";
+ case NetPackagetType.Client:
+ return "鍙戝寘";
+ default:
+ return "鍏ㄩ儴";
+ }
+ }
+}
+
+public enum FilterType
+{
+ Filter = 0,
+ ReverFilter = 1,
+}
+
+
+
--
Gitblit v1.8.0