From ac62d3ed146acbe0fbc196cc6b1226a52fe5b3cf Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 26 十二月 2018 18:06:36 +0800
Subject: [PATCH] Merge branch 'Cross_Server'
---
Assets/Editor/Tool/NetPkgTool.cs | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/Assets/Editor/Tool/NetPkgTool.cs b/Assets/Editor/Tool/NetPkgTool.cs
index 374d914..89a7313 100644
--- a/Assets/Editor/Tool/NetPkgTool.cs
+++ b/Assets/Editor/Tool/NetPkgTool.cs
@@ -49,6 +49,20 @@
}
}
+ bool showMainServerPackage {
+ get { return LocalSave.GetBool("MainServerPackage", true); }
+ set {
+ LocalSave.SetBool("MainServerPackage", value);
+ }
+ }
+
+ bool showCrossServerPackage {
+ get { return LocalSave.GetBool("CrossServerPackage", true); }
+ set {
+ LocalSave.SetBool("CrossServerPackage", value);
+ }
+ }
+
static int maxShowPackageCount {
get { return LocalSave.GetInt("NetPackageShowMaxCount", 100); }
set { LocalSave.SetInt("NetPackageShowMaxCount", value); }
@@ -76,6 +90,8 @@
GUILayout.BeginHorizontal();
maxShowPackageCount = EditorGUILayout.IntField("鏈�澶ф樉绀哄皝鍖呮暟锛�", maxShowPackageCount);
showHeartPackage = GUILayout.Toggle(showHeartPackage, "蹇冭烦鍖�");
+ showMainServerPackage = GUILayout.Toggle(showMainServerPackage, "涓绘湇");
+ showCrossServerPackage = GUILayout.Toggle(showCrossServerPackage, "璺ㄦ湇");
m_CurNetPkgType = GUILayout.Toggle(m_CurNetPkgType == NetPkgType.All, "鍏ㄩ儴") ? NetPkgType.All : m_CurNetPkgType;
m_CurNetPkgType = GUILayout.Toggle(m_CurNetPkgType == NetPkgType.Server, "鏀跺寘") ? NetPkgType.Server : m_CurNetPkgType;
@@ -115,6 +131,16 @@
continue;
}
+ if (!showMainServerPackage && NetPkgLst[i].socketType == GameNetSystem.SocketType.Main)
+ {
+ continue;
+ }
+
+ if (!showCrossServerPackage && NetPkgLst[i].socketType == GameNetSystem.SocketType.CrossSever)
+ {
+ continue;
+ }
+
if (!showHeartPackage &&
(NetPkgLst[i].GameNetName.Contains("OnlineReturn")
|| NetPkgLst[i].GameNetName.Contains("ServerHeart")
--
Gitblit v1.8.0