From c6689f941359227f0b99b20b9400ccbab81b671c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 17:02:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/NetworkPackage/Socket/ClientSocketController.cs |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Core/NetworkPackage/Socket/ClientSocketController.cs b/Core/NetworkPackage/Socket/ClientSocketController.cs
index 8ef9d0e..4fe1a58 100644
--- a/Core/NetworkPackage/Socket/ClientSocketController.cs
+++ b/Core/NetworkPackage/Socket/ClientSocketController.cs
@@ -43,7 +43,7 @@
         }
         catch (Exception e)
         {
-            DesignDebug.LogError(e.Message);
+            DebugEx.LogError(e.Message);
         }
     }
 
@@ -53,12 +53,12 @@
 
         if (ipAddresses[0].AddressFamily == AddressFamily.InterNetworkV6)
         {
-            DesignDebug.Log("褰撳墠浣跨敤鐨勭綉缁�: IPV6");
+            DebugEx.Log("褰撳墠浣跨敤鐨勭綉缁�: IPV6");
             m_Socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp);
         }
         else
         {
-            DesignDebug.Log("褰撳墠浣跨敤鐨勭綉缁�: IPV4");
+            DebugEx.Log("褰撳墠浣跨敤鐨勭綉缁�: IPV4");
             m_Socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
         }
 
@@ -81,14 +81,14 @@
     {
         if (!_result.IsCompleted)
         {
-            DesignDebug.Log("閾炬帴瓒呮椂锛�");
+            DebugEx.Log("閾炬帴瓒呮椂锛�");
             CloseConnect();
         }
         else
         {
             if (m_Socket != null && m_Socket.Connected)
             {
-                DesignDebug.Log("纭鐨勯摼鎺ュ疄鐜�");
+                DebugEx.Log("纭鐨勯摼鎺ュ疄鐜�");
                 OnConnectSuccess();
 
                 if (onConnected != null)
@@ -183,7 +183,7 @@
             }
             catch (Exception e)
             {
-                DesignDebug.Log(e);
+                DebugEx.Log(e);
             }
         }
 
@@ -236,9 +236,9 @@
                 vNetpack = PackageRegedit.TransPack(vPackBytes);
                 if (vNetpack != null)
                 {
-                    if (DesignDebug.EnableNet)
+                    if (DebugEx.EnableNetLog)
                     {
-                        DesignDebug.LogNetFormat("鏀跺寘锛歿0}", vNetpack.GetType().Name);
+                        DebugEx.NetLogFormat("鏀跺寘锛歿0}", vNetpack.GetType().Name);
                     }
 
                     GameNetSystem.Instance.PushPackage(vNetpack);
@@ -263,13 +263,13 @@
             return;
         if (vNetPack == null)
         {
-            DesignDebug.LogError("瑕佸彂鐨勪俊鎭璞′负绌�");
+            DebugEx.LogError("瑕佸彂鐨勪俊鎭璞′负绌�");
             return;
         }
 
-        if (DesignDebug.EnableNet)
+        if (DebugEx.EnableNetLog)
         {
-            DesignDebug.LogNetFormat("鍙戝寘锛歿0}", vNetPack.GetType().Name);
+            DebugEx.NetLogFormat("鍙戝寘锛歿0}", vNetPack.GetType().Name);
         }
 
         if (vNetPack.cmd == (ushort)0x03FE || vNetPack.cmd == (ushort)0x1801)
@@ -296,12 +296,12 @@
     {
         if (!Connected)
         {
-            DesignDebug.LogError("灏氭湭涓庤鍚庣閾炬帴锛佹棤娉曞彂閫佷俊鎭�");
+            DebugEx.LogError("灏氭湭涓庤鍚庣閾炬帴锛佹棤娉曞彂閫佷俊鎭�");
             return;
         }
         if (vBytes == null || vBytes.Length < 2)
         {
-            DesignDebug.LogError("瑕佸彂鐨勪俊鎭暟鎹负绌烘垨鏁版嵁涓嶈冻");
+            DebugEx.LogError("瑕佸彂鐨勪俊鎭暟鎹负绌烘垨鏁版嵁涓嶈冻");
             return;
         }
 
@@ -324,12 +324,12 @@
     {
         if (!Connected)
         {
-            DesignDebug.LogError("灏氭湭涓庤鍚庣閾炬帴锛佹棤娉曞彂閫佷俊鎭�");
+            DebugEx.LogError("灏氭湭涓庤鍚庣閾炬帴锛佹棤娉曞彂閫佷俊鎭�");
             return;
         }
         if (vBytes == null || vBytes.Length < 2)
         {
-            DesignDebug.LogError("瑕佸彂鐨勪俊鎭暟鎹负绌烘垨鏁版嵁涓嶈冻");
+            DebugEx.LogError("瑕佸彂鐨勪俊鎭暟鎹负绌烘垨鏁版嵁涓嶈冻");
             return;
         }
 
@@ -353,7 +353,7 @@
         }
         catch
         {
-            DesignDebug.LogError("鍙戦�佹椂鍙戠敓寮傚父");
+            DebugEx.LogError("鍙戦�佹椂鍙戠敓寮傚父");
         }
     }
 
@@ -373,7 +373,7 @@
         }
         catch (Exception ex)
         {
-            DesignDebug.Log(ex);
+            DebugEx.Log(ex);
         }
 
     }

--
Gitblit v1.8.0