From 7b9354771ba6087012ca989f02d7bca345ed1764 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 12:02:00 +0800
Subject: [PATCH] 860312 脱机工具封包补齐

---
 Tool/RobotTest/Protocol/PacketsSend.py |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Tool/RobotTest/Protocol/PacketsSend.py b/Tool/RobotTest/Protocol/PacketsSend.py
index 65ca319..df74de3 100644
--- a/Tool/RobotTest/Protocol/PacketsSend.py
+++ b/Tool/RobotTest/Protocol/PacketsSend.py
@@ -3516,7 +3516,7 @@
 
 class  tagCGameServerGeneralPack(Structure):
     Head = tagHead()
-    DataLen = 0    #(BYTE DataLen)//GameServer通用包长度
+    DataLen = 0    #(WORD DataLen)//GameServer通用包长度
     Data = ""    #(String Data)//GameServer统用包数据
     data = None
 
@@ -3529,7 +3529,7 @@
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
         _pos = self.Head.ReadData(_lpData, _pos)
-        self.DataLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.DataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.Data,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
         return _pos
 
@@ -3545,7 +3545,7 @@
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
-        length += 1
+        length += 2
         length += len(self.Data)
 
         return length
@@ -3553,7 +3553,7 @@
     def GetBuffer(self):
         data = ''
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.DataLen)
+        data = CommFunc.WriteWORD(data, self.DataLen)
         data = CommFunc.WriteString(data, self.DataLen, self.Data)
         return data
 
@@ -5204,6 +5204,8 @@
     Phone = 0    #(BYTE Phone)//是否绑定手机
     ServerID = 0    #(DWORD ServerID)//服务器ID
     Adult = 0    #(BYTE Adult)//是否成年 0未成年 1成年
+    ExtraLen = 0    #(BYTE ExtraLen)//扩展长度
+    Extra = ""    #(String Extra)//扩展内容，根据不同平台而定
     data = None
 
     def __init__(self):
@@ -5227,6 +5229,8 @@
         self.Phone,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.ServerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.Adult,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.ExtraLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Extra,_pos = CommFunc.ReadString(_lpData, _pos,self.ExtraLen)
         return _pos
 
     def Clear(self):
@@ -5246,6 +5250,8 @@
         self.Phone = 0
         self.ServerID = 0
         self.Adult = 0
+        self.ExtraLen = 0
+        self.Extra = ""
         return
 
     def GetLength(self):
@@ -5263,6 +5269,8 @@
         length += 1
         length += 4
         length += 1
+        length += 1
+        length += len(self.Extra)
 
         return length
 
@@ -5281,6 +5289,8 @@
         data = CommFunc.WriteBYTE(data, self.Phone)
         data = CommFunc.WriteDWORD(data, self.ServerID)
         data = CommFunc.WriteBYTE(data, self.Adult)
+        data = CommFunc.WriteBYTE(data, self.ExtraLen)
+        data = CommFunc.WriteString(data, self.ExtraLen, self.Extra)
         return data
 
     def OutputString(self):
@@ -5297,7 +5307,9 @@
                                 TokenExpire:%s,
                                 Phone:%d,
                                 ServerID:%d,
-                                Adult:%d
+                                Adult:%d,
+                                ExtraLen:%d,
+                                Extra:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
@@ -5312,7 +5324,9 @@
                                 self.TokenExpire,
                                 self.Phone,
                                 self.ServerID,
-                                self.Adult
+                                self.Adult,
+                                self.ExtraLen,
+                                self.Extra
                                 )
         return DumpString
 
@@ -7900,7 +7914,7 @@
 
 class  tagCFakePack(Structure):
     Head = tagHead()
-    MsgLen = 0    #(BYTE MsgLen)
+    MsgLen = 0    #(WORD MsgLen)
     Msg = ""    #(String Msg)//size = MsgLen
     data = None
 
@@ -7913,7 +7927,7 @@
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
         _pos = self.Head.ReadData(_lpData, _pos)
-        self.MsgLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.MsgLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.Msg,_pos = CommFunc.ReadString(_lpData, _pos,self.MsgLen)
         return _pos
 
@@ -7929,7 +7943,7 @@
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
-        length += 1
+        length += 2
         length += len(self.Msg)
 
         return length
@@ -7937,7 +7951,7 @@
     def GetBuffer(self):
         data = ''
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.MsgLen)
+        data = CommFunc.WriteWORD(data, self.MsgLen)
         data = CommFunc.WriteString(data, self.MsgLen, self.Msg)
         return data
 

--
Gitblit v1.8.0