From 18f94146c57f3a225f1082480ed34194a57bbccd Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 30 十月 2018 19:33:59 +0800
Subject: [PATCH] 4340 【前端】支持xlua方便IOS提审 修改网络封包系统,如果封包没有在C#注册,那么抛给lua

---
 Core/GameEngine/DataToCtl/PackageRegedit.cs |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/Core/GameEngine/DataToCtl/PackageRegedit.cs b/Core/GameEngine/DataToCtl/PackageRegedit.cs
index 4b452dc..4d30746 100644
--- a/Core/GameEngine/DataToCtl/PackageRegedit.cs
+++ b/Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -425,16 +425,13 @@
         }
     }
 
-    static byte[] vCmdBytes = new byte[2];
     /// <summary>
     /// 杞崲涓�涓崗璁寘
     /// </summary>
     /// <param name="vBytes"></param>
     /// <returns></returns>
-    public static GameNetPackBasic TransPack(byte[] vBytes)
+    public static GameNetPackBasic TransPack( ushort cmd, byte[] vBytes)
     {
-        vBytes = GameNetEncode.BaseXorSub(vBytes);
-
 #if UNITY_EDITOR
         int length = vBytes.Length;
         string vStr = "";
@@ -444,12 +441,9 @@
         }
 #endif
 
-        Array.Copy(vBytes, 0, vCmdBytes, 0, 2);
-        ushort vPackCmd = (ushort)((ushort)(vCmdBytes[0] << 8) + vCmdBytes[1]);
-
-        if (packageTable.ContainsKey(vPackCmd)) // 瀛樺湪鐩稿簲鐨勭櫥璁�
+        if (packageTable.ContainsKey(cmd)) // 瀛樺湪鐩稿簲鐨勭櫥璁�
         {
-            var packageType = packageTable[vPackCmd];
+            var packageType = packageTable[cmd];
             // 瀹炰緥鍖栧苟寮鸿浆涓哄崗璁寘鍩虹被
             var packageInstance = packageType.Assembly.CreateInstance(packageType.Name) as GameNetPackBasic;
             packageInstance.ReadFromBytes(vBytes);// 瑙f瀽鍐呭
@@ -464,13 +458,6 @@
             NetPkgCtl.AddNetPkg(vStr, NetPkgType.Server, packageInstance.ToString(), FieldPrint.PrintFields(packageInstance), FieldPrint.PrintFieldsExpand(packageInstance, true));
 #endif
             return packageInstance;
-        }
-        else
-        {
-#if UNITY_EDITOR
-            NetPkgCtl.AddNetPkg(vStr, NetPkgType.Server, string.Empty, string.Empty, null);
-            DebugEx.LogFormat("C#灞傛敹鍒版湭鐧昏鐨勮В鍖呭崗璁細{0},{1}", vCmdBytes[0].ToString("x2"), vCmdBytes[1].ToString("x2"));
-#endif
         }
         return null;
     }

--
Gitblit v1.8.0