From f089bf39d557fc228f7bd3b2eb8c85c7b402e7dc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 02 十一月 2018 18:40:13 +0800
Subject: [PATCH] 4575 脱机挂测试
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 188 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 148 insertions(+), 40 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index cedf488..ddf5afc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -6585,6 +6585,66 @@
#------------------------------------------------------
+# B9 13 进入组队副本失败原因 #tagGCEnterTeamFBFailReason
+
+class tagGCEnterTeamFBFailReason(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("MapID", c_int), # 请求进入的地图ID
+ ("AskType", c_ubyte), # 请求类型： 0-匹配请求；1-进入请求
+ ("Reason", c_ubyte), # 失败原因：2-次数不足；3-进入CD中；6-门票不足
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB9
+ self.SubCmd = 0x13
+ return
+
+ def ReadData(self, stringData, _pos=0, _len=0):
+ self.Clear()
+ memmove(addressof(self), stringData[_pos:], self.GetLength())
+ return _pos + self.GetLength()
+
+ def Clear(self):
+ self.Cmd = 0xB9
+ self.SubCmd = 0x13
+ self.MapID = 0
+ self.AskType = 0
+ self.Reason = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagGCEnterTeamFBFailReason)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B9 13 进入组队副本失败原因 //tagGCEnterTeamFBFailReason:
+ Cmd:%s,
+ SubCmd:%s,
+ MapID:%d,
+ AskType:%d,
+ Reason:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.MapID,
+ self.AskType,
+ self.Reason
+ )
+ return DumpString
+
+
+m_NAtagGCEnterTeamFBFailReason=tagGCEnterTeamFBFailReason()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCEnterTeamFBFailReason.Cmd,m_NAtagGCEnterTeamFBFailReason.SubCmd))] = m_NAtagGCEnterTeamFBFailReason
+
+
+#------------------------------------------------------
# B9 01 收到邀请加入队伍信息 #tagGCInviteJoinTeamInfo
class tagGCInviteJoinTeamInfo(Structure):
@@ -12171,6 +12231,7 @@
_fields_ = [
("FuncID", c_ubyte), # 功能ID
("State", c_ubyte), # 是否开启
+ ("AwardState", c_ubyte), # 是否已领奖励
]
def __init__(self):
@@ -12185,6 +12246,7 @@
def Clear(self):
self.FuncID = 0
self.State = 0
+ self.AwardState = 0
return
def GetLength(self):
@@ -12196,11 +12258,13 @@
def OutputString(self):
DumpString = '''//A3 02 功能开通状态 //tagMCFuncOpenStateList:
FuncID:%d,
- State:%d
+ State:%d,
+ AwardState:%d
'''\
%(
self.FuncID,
- self.State
+ self.State,
+ self.AwardState
)
return DumpString
@@ -16714,6 +16778,58 @@
#------------------------------------------------------
+# A7 17 聊天气泡框状态 #tagMCChatBubbleBoxState
+
+class tagMCChatBubbleBoxState(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("BoxState", c_int), # 按二进制位存储代表是否已开启，暂支持31位，以后有需要再加
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA7
+ self.SubCmd = 0x17
+ return
+
+ def ReadData(self, stringData, _pos=0, _len=0):
+ self.Clear()
+ memmove(addressof(self), stringData[_pos:], self.GetLength())
+ return _pos + self.GetLength()
+
+ def Clear(self):
+ self.Cmd = 0xA7
+ self.SubCmd = 0x17
+ self.BoxState = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCChatBubbleBoxState)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A7 17 聊天气泡框状态 //tagMCChatBubbleBoxState:
+ Cmd:%s,
+ SubCmd:%s,
+ BoxState:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.BoxState
+ )
+ return DumpString
+
+
+m_NAtagMCChatBubbleBoxState=tagMCChatBubbleBoxState()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCChatBubbleBoxState.Cmd,m_NAtagMCChatBubbleBoxState.SubCmd))] = m_NAtagMCChatBubbleBoxState
+
+
+#------------------------------------------------------
# A7 13 动态障碍物状态 #tagMCDynamicBarrierState
class tagMCDynamicBarrier(Structure):
@@ -17200,6 +17316,7 @@
("Value3", c_int), # 自定义值3
("Value4", c_int), # 自定义值4
("Value5", c_int), # 自定义值5
+ ("Value6", c_int), # 自定义值6
]
def __init__(self):
@@ -17218,6 +17335,7 @@
self.Value3 = 0
self.Value4 = 0
self.Value5 = 0
+ self.Value6 = 0
return
def GetLength(self):
@@ -17233,7 +17351,8 @@
Value2:%d,
Value3:%d,
Value4:%d,
- Value5:%d
+ Value5:%d,
+ Value6:%d
'''\
%(
self.SetNum,
@@ -17241,7 +17360,8 @@
self.Value2,
self.Value3,
self.Value4,
- self.Value5
+ self.Value5,
+ self.Value6
)
return DumpString
@@ -21811,64 +21931,52 @@
# AA 16 通知超值礼包信息 #tagMCSuperGiftInfo
class tagMCSuperGiftInfo(Structure):
- Head = tagHead()
- GiftID = 0 #(DWORD GiftID)//商品ID
- EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
- data = None
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("StartTime", c_int),
+ ]
def __init__(self):
self.Clear()
- self.Head.Cmd = 0xAA
- self.Head.SubCmd = 0x16
+ self.Cmd = 0xAA
+ self.SubCmd = 0x16
return
- def ReadData(self, _lpData, _pos=0, _Len=0):
+ def ReadData(self, stringData, _pos=0, _len=0):
self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.GiftID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
- return _pos
+ memmove(addressof(self), stringData[_pos:], self.GetLength())
+ return _pos + self.GetLength()
def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xAA
- self.Head.SubCmd = 0x16
- self.GiftID = 0
- self.EndtDate = ""
+ self.Cmd = 0xAA
+ self.SubCmd = 0x16
+ self.StartTime = 0
return
def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 4
- length += 10
-
- return length
+ return sizeof(tagMCSuperGiftInfo)
def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteDWORD(data, self.GiftID)
- data = CommFunc.WriteString(data, 10, self.EndtDate)
- return data
+ return string_at(addressof(self), self.GetLength())
def OutputString(self):
- DumpString = '''
- Head:%s,
- GiftID:%d,
- EndtDate:%s
+ DumpString = '''// AA 16 通知超值礼包信息 //tagMCSuperGiftInfo:
+ Cmd:%s,
+ SubCmd:%s,
+ StartTime:%d
'''\
%(
- self.Head.OutputString(),
- self.GiftID,
- self.EndtDate
+ self.Cmd,
+ self.SubCmd,
+ self.StartTime
)
return DumpString
m_NAtagMCSuperGiftInfo=tagMCSuperGiftInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCSuperGiftInfo.Head.Cmd,m_NAtagMCSuperGiftInfo.Head.SubCmd))] = m_NAtagMCSuperGiftInfo
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCSuperGiftInfo.Cmd,m_NAtagMCSuperGiftInfo.SubCmd))] = m_NAtagMCSuperGiftInfo
#------------------------------------------------------
--
Gitblit v1.8.0