From faa3ba8a847f33ec0844f6b0b0b2937847a6435c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 11 十一月 2019 16:32:10 +0800
Subject: [PATCH] 1111 脱机榜改为平均每分钟获得经验

---
 Tool/Robot/Protocol/PacketsSend.py |   58 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/Tool/Robot/Protocol/PacketsSend.py b/Tool/Robot/Protocol/PacketsSend.py
index 2c3f4c8..1ae5f43 100644
--- a/Tool/Robot/Protocol/PacketsSend.py
+++ b/Tool/Robot/Protocol/PacketsSend.py
@@ -497,10 +497,10 @@
     szSex = ""    #(char szSex[3])//性别
     Age = 0    #(WORD Age)//年龄
     Birthday = ""    #(char Birthday[21])//生日
-    QQ = ""    #(char QQ[19])// QQ号    
+    QQ = ""    #(char QQ[19])// QQ号	
     Mail = ""    #(char Mail[41])// 邮箱
     Province = ""    #(char Province[11])//省份
-    City = ""    #(char City[11])//城市    
+    City = ""    #(char City[11])//城市	
     data = None
 
     def __init__(self):
@@ -1064,7 +1064,7 @@
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
                   ("PlayerID", c_int),    #目标玩家
-                  ("MemberLV", c_ubyte),    #玩家队伍等级    TTeamMemberLV
+                  ("MemberLV", c_ubyte),    #玩家队伍等级	TTeamMemberLV
                   ]
 
     def __init__(self):
@@ -2348,7 +2348,7 @@
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
                   ("TecID", c_int),    #科技ID 
-                  ("TmpLV", c_ubyte),    #加持等级     
+                  ("TmpLV", c_ubyte),    #加持等级 	
                   ]
 
     def __init__(self):
@@ -3125,7 +3125,7 @@
                   ("SubCmd", c_ubyte),
                   ("Type", c_ubyte),    #答题类型
                   ("QuestionNO", c_ushort),    # 答题号
-                  ("FunctionNO", c_ubyte),    # 功能号    
+                  ("FunctionNO", c_ubyte),    # 功能号	
                   ]
 
     def __init__(self):
@@ -3186,7 +3186,7 @@
                   ("SubjectIndex", c_ubyte),    #当前是第几题
                   ("Answer", c_ubyte),    #回答index, 1开始, 小助手回答: EXAM_ANSWER_USE_HELP
                   ("ExtraOpt1", c_ubyte),    #附加选项1
-                  ("ExtraOpt2", c_ubyte),    #附加选项2    
+                  ("ExtraOpt2", c_ubyte),    #附加选项2	
                   ("ExtraOpt3", c_ubyte),    #附加选项3
                   ("ExtraOpt4", c_ubyte),    #附加选项4
                   ]
@@ -3580,7 +3580,7 @@
 
 class  tagCAddLabelToFriend(Structure):
     Head = tagHead()
-    PlayerID = 0    #(DWORD PlayerID)// 好友ID    
+    PlayerID = 0    #(DWORD PlayerID)// 好友ID	
     LabelContent = ""    #(char LabelContent[21])//标签内容
     data = None
 
@@ -3704,7 +3704,7 @@
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("PlayerID", c_int),    # 好友ID    
+                  ("PlayerID", c_int),    # 好友ID	
                   ("LabelID", c_int),    # 系统标签ID
                   ]
 
@@ -4144,7 +4144,7 @@
     RoomType = 0    #(BYTE RoomType)// 房间类型
     VSValueMode = 0    #(BYTE VSValueMode)// 决斗值模式
     VSMode = 0    #(BYTE VSMode)// 决斗模式
-    Pws = ""    #(char Pws[7])// 密码    
+    Pws = ""    #(char Pws[7])// 密码	
     data = None
 
     def __init__(self):
@@ -4274,7 +4274,7 @@
 class  tagCJoinVsRoom(Structure):
     Head = tagHead()
     dwRoomId = 0    #(DWORD dwRoomId)// 房间ID
-    Pws = ""    #(char Pws[7])// 密码    
+    Pws = ""    #(char Pws[7])// 密码	
     data = None
 
     def __init__(self):
@@ -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
 
@@ -7635,7 +7649,7 @@
 
 class  tagCSetSignature(Structure):
     Head = tagHead()
-    Signature = ""    #(char Signature[101])// 心情签名    
+    Signature = ""    #(char Signature[101])// 心情签名	
     data = None
 
     def __init__(self):
@@ -9484,7 +9498,7 @@
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("Type", c_ubyte),    #无意义    
+                  ("Type", c_ubyte),    #无意义	
                   ]
 
     def __init__(self):
@@ -11215,8 +11229,8 @@
                   ("SrcBackpack", c_ubyte),    #源背包类型
                   ("DesBackPack", c_ubyte),    #目标背包类型
                   ("SrcIndex", c_ushort),    #起始位置
-                  ("DestIndex", c_ushort),    #目标位置    
-                  ("Count", c_ushort),    #物品数量    
+                  ("DestIndex", c_ushort),    #目标位置	
+                  ("Count", c_ushort),    #物品数量	
                   ]
 
     def __init__(self):
@@ -11330,7 +11344,7 @@
                   ("SubCmd", c_ubyte),
                   ("OperateType", c_ubyte),    #背包操作类型,由EBackpackOperate定义
                   ("SrcIndex", c_ushort),    #起始位置
-                  ("DestIndex", c_ushort),    #目标位置        
+                  ("DestIndex", c_ushort),    #目标位置		
                   ]
 
     def __init__(self):
@@ -12555,7 +12569,7 @@
                   ("SrcBackpack", c_ubyte),    #源背包类型
                   ("DesBackPack", c_ubyte),    #目标背包类型
                   ("SrcIndex", c_ushort),    #起始位置
-                  ("DestIndex", c_ushort),    #目标位置        
+                  ("DestIndex", c_ushort),    #目标位置		
                   ]
 
     def __init__(self):
@@ -12720,7 +12734,7 @@
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("RoleEquipType", c_ubyte),    #角色装备类型    
+                  ("RoleEquipType", c_ubyte),    #角色装备类型	
                   ("ItemIndex", c_ubyte),    #物品在物品背包的索引
                   ]
 
@@ -20875,7 +20889,7 @@
                   ("StuffIndex1", c_int),    #装备索引
                   ("StuffIndex2", c_int),    #装备索引
                   ("StuffIndex3", c_int),    #装备索引
-                  ("AutoBuy", c_ubyte),    #是否自动购买结魂灯    
+                  ("AutoBuy", c_ubyte),    #是否自动购买结魂灯	
                   ]
 
     def __init__(self):
@@ -21148,7 +21162,7 @@
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("VSOrder", c_int),    #要挑战的排位    
+                  ("VSOrder", c_int),    #要挑战的排位	
                   ]
 
     def __init__(self):
@@ -21431,4 +21445,4 @@
 
 
 m_NAtagCGMCMD=tagCGMCMD()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGMCMD.Head.Cmd,m_NAtagCGMCMD.Head.SubCmd))] = m_NAtagCGMCMD
\ No newline at end of file
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGMCMD.Head.Cmd,m_NAtagCGMCMD.Head.SubCmd))] = m_NAtagCGMCMD

--
Gitblit v1.8.0