From 4279d7e2bf5c4ed9414ee89d0cc4bf0a0407c607 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 六月 2024 16:15:44 +0800
Subject: [PATCH] 10185 【越南】【港台】【主干】BOSS凭证修改（有跨服凭证榜活动时验证跨服参与时间点；否则验证本服活动的参与时间点；）
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 2405 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 2,317 insertions(+), 88 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 540dd44..9872833 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -995,6 +995,7 @@
LV = 0 #(WORD LV)// 玩家等级
Job = 0 #(BYTE Job)// 玩家职业
RealmLV = 0 #(WORD RealmLV)// 玩家境界等级
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -1012,6 +1013,7 @@
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -1025,6 +1027,7 @@
self.LV = 0
self.Job = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -1036,6 +1039,7 @@
length += 2
length += 1
length += 2
+ length += 4
return length
@@ -1048,6 +1052,7 @@
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -1058,7 +1063,8 @@
Name:%s,
LV:%d,
Job:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.Head.OutputString(),
@@ -1067,7 +1073,8 @@
self.Name,
self.LV,
self.Job,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -2651,6 +2658,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)//等级
RealmLV = 0 #(WORD RealmLV)//境界，机器人读境界表取等级对应境界
+ Face = 0 #(DWORD Face)//基本脸型
FightPower = 0 #(DWORD FightPower)//战力求余亿部分，机器人读等级表取等级对应战力
FightPowerEx = 0 #(DWORD FightPowerEx)//战力整除亿部分，机器人读等级表取等级对应战力
Score = 0 #(DWORD Score)//积分
@@ -2670,6 +2678,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Score,_pos = CommFunc.ReadDWORD(_lpData, _pos)
@@ -2685,6 +2694,7 @@
self.Job = 0
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
self.FightPower = 0
self.FightPowerEx = 0
self.Score = 0
@@ -2701,6 +2711,7 @@
length += 4
length += 4
length += 4
+ length += 4
return length
@@ -2712,6 +2723,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
data = CommFunc.WriteDWORD(data, self.FightPower)
data = CommFunc.WriteDWORD(data, self.FightPowerEx)
data = CommFunc.WriteDWORD(data, self.Score)
@@ -2725,6 +2737,7 @@
Job:%d,
LV:%d,
RealmLV:%d,
+ Face:%d,
FightPower:%d,
FightPowerEx:%d,
Score:%d
@@ -2736,6 +2749,7 @@
self.Job,
self.LV,
self.RealmLV,
+ self.Face,
self.FightPower,
self.FightPowerEx,
self.Score
@@ -2756,6 +2770,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)//等级
RealmLV = 0 #(WORD RealmLV)//境界，机器人读境界表取等级对应境界
+ Face = 0 #(DWORD Face)//基本脸型
FightPower = 0 #(DWORD FightPower)//战力求余亿部分，机器人读等级表取等级对应战力
FightPowerEx = 0 #(DWORD FightPowerEx)//战力整除亿部分，机器人读等级表取等级对应战力
Score = 0 #(DWORD Score)//积分
@@ -2776,6 +2791,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Score,_pos = CommFunc.ReadDWORD(_lpData, _pos)
@@ -2791,6 +2807,7 @@
self.Job = 0
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
self.FightPower = 0
self.FightPowerEx = 0
self.Score = 0
@@ -2810,6 +2827,7 @@
length += 4
length += 4
length += 4
+ length += 4
length += 1
length += len(self.AddScore)
length += 1
@@ -2824,6 +2842,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
data = CommFunc.WriteDWORD(data, self.FightPower)
data = CommFunc.WriteDWORD(data, self.FightPowerEx)
data = CommFunc.WriteDWORD(data, self.Score)
@@ -2840,6 +2859,7 @@
Job:%d,
LV:%d,
RealmLV:%d,
+ Face:%d,
FightPower:%d,
FightPowerEx:%d,
Score:%d,
@@ -2854,6 +2874,7 @@
self.Job,
self.LV,
self.RealmLV,
+ self.Face,
self.FightPower,
self.FightPowerEx,
self.Score,
@@ -2940,6 +2961,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)//等级
RealmLV = 0 #(WORD RealmLV)//境界，机器人读境界表取等级对应境界
+ Face = 0 #(DWORD Face)//基本脸型
FightPower = 0 #(DWORD FightPower)//战力求余亿部分，机器人读等级表取等级对应战力
FightPowerEx = 0 #(DWORD FightPowerEx)//战力整除亿部分，机器人读等级表取等级对应战力
Score = 0 #(DWORD Score)//积分
@@ -2956,6 +2978,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Score,_pos = CommFunc.ReadDWORD(_lpData, _pos)
@@ -2967,6 +2990,7 @@
self.Job = 0
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
self.FightPower = 0
self.FightPowerEx = 0
self.Score = 0
@@ -2982,6 +3006,7 @@
length += 4
length += 4
length += 4
+ length += 4
return length
@@ -2992,6 +3017,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
data = CommFunc.WriteDWORD(data, self.FightPower)
data = CommFunc.WriteDWORD(data, self.FightPowerEx)
data = CommFunc.WriteDWORD(data, self.Score)
@@ -3004,6 +3030,7 @@
Job:%d,
LV:%d,
RealmLV:%d,
+ Face:%d,
FightPower:%d,
FightPowerEx:%d,
Score:%d
@@ -3014,6 +3041,7 @@
self.Job,
self.LV,
self.RealmLV,
+ self.Face,
self.FightPower,
self.FightPowerEx,
self.Score
@@ -4451,9 +4479,17 @@
Type2 = 0 #(BYTE Type2)//附加类型，用来表示排序对象的类型，比如，玩家所属职业门派，宠物类型等
Value1 = 0 #(DWORD Value1)//排序依赖的值，比如，等级
Value2 = 0 #(DWORD Value2)//排序依赖的值，比如，战斗力
+ Value3 = 0 #(DWORD Value3)//附加值
+ Value4 = 0 #(DWORD Value4)//附加值
+ Value5 = 0 #(DWORD Value5)//附加值
+ Value6 = 0 #(DWORD Value6)//附加值
+ Value7 = 0 #(DWORD Value7)//附加值
+ Value8 = 0 #(DWORD Value8)//附加值
CmpValue = 0 #(DWORD CmpValue)// 比较权值
CmpValue2 = 0 #(DWORD CmpValue2)// 比较权值
CmpValue3 = 0 #(DWORD CmpValue3)// 比较权值
+ DataLen = 0 #(WORD DataLen)
+ UserData = "" #(String UserData)//附加
data = None
def __init__(self):
@@ -4470,9 +4506,17 @@
self.Type2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Value2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value4,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value5,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value6,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value7,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value8,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.CmpValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.CmpValue2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.CmpValue3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.DataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
return _pos
def Clear(self):
@@ -4484,9 +4528,17 @@
self.Type2 = 0
self.Value1 = 0
self.Value2 = 0
+ self.Value3 = 0
+ self.Value4 = 0
+ self.Value5 = 0
+ self.Value6 = 0
+ self.Value7 = 0
+ self.Value8 = 0
self.CmpValue = 0
self.CmpValue2 = 0
self.CmpValue3 = 0
+ self.DataLen = 0
+ self.UserData = ""
return
def GetLength(self):
@@ -4502,6 +4554,14 @@
length += 4
length += 4
length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 2
+ length += len(self.UserData)
return length
@@ -4515,9 +4575,17 @@
data = CommFunc.WriteBYTE(data, self.Type2)
data = CommFunc.WriteDWORD(data, self.Value1)
data = CommFunc.WriteDWORD(data, self.Value2)
+ data = CommFunc.WriteDWORD(data, self.Value3)
+ data = CommFunc.WriteDWORD(data, self.Value4)
+ data = CommFunc.WriteDWORD(data, self.Value5)
+ data = CommFunc.WriteDWORD(data, self.Value6)
+ data = CommFunc.WriteDWORD(data, self.Value7)
+ data = CommFunc.WriteDWORD(data, self.Value8)
data = CommFunc.WriteDWORD(data, self.CmpValue)
data = CommFunc.WriteDWORD(data, self.CmpValue2)
data = CommFunc.WriteDWORD(data, self.CmpValue3)
+ data = CommFunc.WriteWORD(data, self.DataLen)
+ data = CommFunc.WriteString(data, self.DataLen, self.UserData)
return data
def OutputString(self):
@@ -4530,9 +4598,17 @@
Type2:%d,
Value1:%d,
Value2:%d,
+ Value3:%d,
+ Value4:%d,
+ Value5:%d,
+ Value6:%d,
+ Value7:%d,
+ Value8:%d,
CmpValue:%d,
CmpValue2:%d,
- CmpValue3:%d
+ CmpValue3:%d,
+ DataLen:%d,
+ UserData:%s
'''\
%(
self.OrderIndex,
@@ -4543,9 +4619,17 @@
self.Type2,
self.Value1,
self.Value2,
+ self.Value3,
+ self.Value4,
+ self.Value5,
+ self.Value6,
+ self.Value7,
+ self.Value8,
self.CmpValue,
self.CmpValue2,
- self.CmpValue3
+ self.CmpValue3,
+ self.DataLen,
+ self.UserData
)
return DumpString
@@ -5000,6 +5084,7 @@
LV = 0 #(DWORD LV)//等级
Job = 0 #(BYTE Job)
RealmLV = 0 #(WORD RealmLV)//境界
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -5013,6 +5098,7 @@
self.LV,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -5021,6 +5107,7 @@
self.LV = 0
self.Job = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -5030,6 +5117,7 @@
length += 4
length += 1
length += 2
+ length += 4
return length
@@ -5040,6 +5128,7 @@
data = CommFunc.WriteDWORD(data, self.LV)
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -5048,14 +5137,16 @@
Name:%s,
LV:%d,
Job:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.ID,
self.Name,
self.LV,
self.Job,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -5135,6 +5226,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)//等级
RealmLV = 0 #(WORD RealmLV)//境界
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -5148,6 +5240,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -5156,6 +5249,7 @@
self.Job = 0
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -5165,6 +5259,7 @@
length += 1
length += 2
length += 2
+ length += 4
return length
@@ -5175,6 +5270,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -5183,14 +5279,16 @@
PlayerName:%s,
Job:%d,
LV:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.PlayerID,
self.PlayerName,
self.Job,
self.LV,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -8076,6 +8174,148 @@
#------------------------------------------------------
+# B0 35 福地记录信息 #tagGCMineAreaRecordInfo
+
+class tagGCMineAreaRecord(Structure):
+ RecordType = 0 #(BYTE RecordType)// 记录类型；1-自己拉物品；2-物品被人抢
+ TagPlayerID = 0 #(DWORD TagPlayerID)// 目标玩家ID，等于自己玩家ID时代表拉自己的，反之为抢别人的
+ RecordTime = 0 #(DWORD RecordTime)// 记录时间戳
+ MineID = 0 #(WORD MineID)// 矿物ID，对应福地采集表中ID
+ TagPlayerName = "" #(char TagPlayerName[33])
+ TagFace = 0 #(DWORD TagFace)
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.RecordType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.TagPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.RecordTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.MineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.TagPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,33)
+ self.TagFace,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ return _pos
+
+ def Clear(self):
+ self.RecordType = 0
+ self.TagPlayerID = 0
+ self.RecordTime = 0
+ self.MineID = 0
+ self.TagPlayerName = ""
+ self.TagFace = 0
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 1
+ length += 4
+ length += 4
+ length += 2
+ length += 33
+ length += 4
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteBYTE(data, self.RecordType)
+ data = CommFunc.WriteDWORD(data, self.TagPlayerID)
+ data = CommFunc.WriteDWORD(data, self.RecordTime)
+ data = CommFunc.WriteWORD(data, self.MineID)
+ data = CommFunc.WriteString(data, 33, self.TagPlayerName)
+ data = CommFunc.WriteDWORD(data, self.TagFace)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ RecordType:%d,
+ TagPlayerID:%d,
+ RecordTime:%d,
+ MineID:%d,
+ TagPlayerName:%s,
+ TagFace:%d
+ '''\
+ %(
+ self.RecordType,
+ self.TagPlayerID,
+ self.RecordTime,
+ self.MineID,
+ self.TagPlayerName,
+ self.TagFace
+ )
+ return DumpString
+
+
+class tagGCMineAreaRecordInfo(Structure):
+ Head = tagHead()
+ RecordCount = 0 #(BYTE RecordCount)
+ AreaRecordList = list() #(vector<tagGCMineAreaRecord> AreaRecordList)
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB0
+ self.Head.SubCmd = 0x35
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.RecordCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.RecordCount):
+ temAreaRecordList = tagGCMineAreaRecord()
+ _pos = temAreaRecordList.ReadData(_lpData, _pos)
+ self.AreaRecordList.append(temAreaRecordList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB0
+ self.Head.SubCmd = 0x35
+ self.RecordCount = 0
+ self.AreaRecordList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ for i in range(self.RecordCount):
+ length += self.AreaRecordList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.RecordCount)
+ for i in range(self.RecordCount):
+ data = CommFunc.WriteString(data, self.AreaRecordList[i].GetLength(), self.AreaRecordList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ RecordCount:%d,
+ AreaRecordList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.RecordCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagGCMineAreaRecordInfo=tagGCMineAreaRecordInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCMineAreaRecordInfo.Head.Cmd,m_NAtagGCMineAreaRecordInfo.Head.SubCmd))] = m_NAtagGCMineAreaRecordInfo
+
+
+#------------------------------------------------------
# B0 32 福地物品拉预览结果 #tagGCMineItemPullPreviewRet
class tagGCMineItemPullPreviewRet(Structure):
@@ -8325,6 +8565,7 @@
Name = "" #(char Name[33])
LV = 0 #(WORD LV)
RealmLV = 0 #(WORD RealmLV)//境界等级
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -8340,6 +8581,7 @@
self.Name,_pos = CommFunc.ReadString(_lpData, _pos,33)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -8351,6 +8593,7 @@
self.Name = ""
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -8360,6 +8603,7 @@
length += 33
length += 2
length += 2
+ length += 4
return length
@@ -8370,6 +8614,7 @@
data = CommFunc.WriteString(data, 33, self.Name)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -8378,14 +8623,16 @@
AskID:%d,
Name:%s,
LV:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.Head.OutputString(),
self.AskID,
self.Name,
self.LV,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -14600,9 +14847,17 @@
Type2 = 0 #(BYTE Type2)//附加类型，用来表示排序对象的类型，比如，玩家所属职业门派，宠物类型等
Value1 = 0 #(DWORD Value1)//自定义值1
Value2 = 0 #(DWORD Value2)//自定义值2
+ Value3 = 0 #(DWORD Value3)//附加值
+ Value4 = 0 #(DWORD Value4)//附加值
+ Value5 = 0 #(DWORD Value5)//附加值
+ Value6 = 0 #(DWORD Value6)//附加值
+ Value7 = 0 #(DWORD Value7)//附加值
+ Value8 = 0 #(DWORD Value8)//附加值
CmpValue = 0 #(DWORD CmpValue)// 比较权值
CmpValue2 = 0 #(DWORD CmpValue2)// 比较权值
CmpValue3 = 0 #(DWORD CmpValue3)// 比较权值
+ DataLen = 0 #(WORD DataLen)
+ UserData = "" #(String UserData)//附加
data = None
def __init__(self):
@@ -14617,9 +14872,17 @@
self.Type2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Value2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value4,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value5,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value6,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value7,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Value8,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.CmpValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.CmpValue2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.CmpValue3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.DataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
return _pos
def Clear(self):
@@ -14629,9 +14892,17 @@
self.Type2 = 0
self.Value1 = 0
self.Value2 = 0
+ self.Value3 = 0
+ self.Value4 = 0
+ self.Value5 = 0
+ self.Value6 = 0
+ self.Value7 = 0
+ self.Value8 = 0
self.CmpValue = 0
self.CmpValue2 = 0
self.CmpValue3 = 0
+ self.DataLen = 0
+ self.UserData = ""
return
def GetLength(self):
@@ -14645,6 +14916,14 @@
length += 4
length += 4
length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 4
+ length += 2
+ length += len(self.UserData)
return length
@@ -14656,9 +14935,17 @@
data = CommFunc.WriteBYTE(data, self.Type2)
data = CommFunc.WriteDWORD(data, self.Value1)
data = CommFunc.WriteDWORD(data, self.Value2)
+ data = CommFunc.WriteDWORD(data, self.Value3)
+ data = CommFunc.WriteDWORD(data, self.Value4)
+ data = CommFunc.WriteDWORD(data, self.Value5)
+ data = CommFunc.WriteDWORD(data, self.Value6)
+ data = CommFunc.WriteDWORD(data, self.Value7)
+ data = CommFunc.WriteDWORD(data, self.Value8)
data = CommFunc.WriteDWORD(data, self.CmpValue)
data = CommFunc.WriteDWORD(data, self.CmpValue2)
data = CommFunc.WriteDWORD(data, self.CmpValue3)
+ data = CommFunc.WriteWORD(data, self.DataLen)
+ data = CommFunc.WriteString(data, self.DataLen, self.UserData)
return data
def OutputString(self):
@@ -14669,9 +14956,17 @@
Type2:%d,
Value1:%d,
Value2:%d,
+ Value3:%d,
+ Value4:%d,
+ Value5:%d,
+ Value6:%d,
+ Value7:%d,
+ Value8:%d,
CmpValue:%d,
CmpValue2:%d,
- CmpValue3:%d
+ CmpValue3:%d,
+ DataLen:%d,
+ UserData:%s
'''\
%(
self.ID,
@@ -14680,9 +14975,17 @@
self.Type2,
self.Value1,
self.Value2,
+ self.Value3,
+ self.Value4,
+ self.Value5,
+ self.Value6,
+ self.Value7,
+ self.Value8,
self.CmpValue,
self.CmpValue2,
- self.CmpValue3
+ self.CmpValue3,
+ self.DataLen,
+ self.UserData
)
return DumpString
@@ -16756,7 +17059,7 @@
class tagMCCoinToGoldCount(Structure):
_pack_ = 1
_fields_ = [
- ("RecordID", c_ubyte),
+ ("RecordID", c_ushort),
("TodayPayCount", c_ushort), # 今日已购买次数
("TotalPayCount", c_int), # 累计总购买次数
("WeekPayCount", c_ushort), # 周总购买次数
@@ -16806,7 +17109,7 @@
class tagMCCoinToGoldCountInfo(Structure):
Head = tagHead()
- RecordCount = 0 #(BYTE RecordCount)
+ RecordCount = 0 #(WORD RecordCount)
CTGCountInfoList = list() #(vector<tagMCCoinToGoldCount> CTGCountInfoList)
data = None
@@ -16819,7 +17122,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.RecordCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RecordCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
for i in range(self.RecordCount):
temCTGCountInfoList = tagMCCoinToGoldCount()
_pos = temCTGCountInfoList.ReadData(_lpData, _pos)
@@ -16838,7 +17141,7 @@
def GetLength(self):
length = 0
length += self.Head.GetLength()
- length += 1
+ length += 2
for i in range(self.RecordCount):
length += self.CTGCountInfoList[i].GetLength()
@@ -16847,7 +17150,7 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.RecordCount)
+ data = CommFunc.WriteWORD(data, self.RecordCount)
for i in range(self.RecordCount):
data = CommFunc.WriteString(data, self.CTGCountInfoList[i].GetLength(), self.CTGCountInfoList[i].GetBuffer())
return data
@@ -16878,7 +17181,7 @@
OrderLen = 0 #(BYTE OrderLen)
OrderID = "" #(String OrderID)// 订单id
Coin = 0 #(DWORD Coin)// 充值的点卷
- RecordID = 0 #(BYTE RecordID)// ctgID
+ RecordID = 0 #(WORD RecordID)// ctgID
OrderInfoLen = 0 #(BYTE OrderInfoLen)
OrderInfo = "" #(String OrderInfo)
data = None
@@ -16895,7 +17198,7 @@
self.OrderLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.OrderID,_pos = CommFunc.ReadString(_lpData, _pos,self.OrderLen)
self.Coin,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.RecordID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RecordID,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.OrderInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.OrderInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.OrderInfoLen)
return _pos
@@ -16919,7 +17222,7 @@
length += 1
length += len(self.OrderID)
length += 4
- length += 1
+ length += 2
length += 1
length += len(self.OrderInfo)
@@ -16931,7 +17234,7 @@
data = CommFunc.WriteBYTE(data, self.OrderLen)
data = CommFunc.WriteString(data, self.OrderLen, self.OrderID)
data = CommFunc.WriteDWORD(data, self.Coin)
- data = CommFunc.WriteBYTE(data, self.RecordID)
+ data = CommFunc.WriteWORD(data, self.RecordID)
data = CommFunc.WriteBYTE(data, self.OrderInfoLen)
data = CommFunc.WriteString(data, self.OrderInfoLen, self.OrderInfo)
return data
@@ -17062,6 +17365,8 @@
ExAttr19 = 0 #(DWORD ExAttr19)//预留的扩展属性字段，用来存放项目特定的属性
ExAttr20 = 0 #(DWORD ExAttr20)//预留的扩展属性字段，用来存放项目特定的属性
HPEx = 0 #(DWORD HPEx)//当前血量 超过E的记录
+ Face = 0 #(DWORD Face)//基本脸型
+ RoleType = 0 #(DWORD RoleType)//角色类型（各项目可自定义含义，如种族，与职业区分）
data = None
def __init__(self):
@@ -17168,6 +17473,8 @@
self.ExAttr19,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.ExAttr20,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.HPEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.RoleType,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -17270,6 +17577,8 @@
self.ExAttr19 = 0
self.ExAttr20 = 0
self.HPEx = 0
+ self.Face = 0
+ self.RoleType = 0
return
def GetLength(self):
@@ -17362,6 +17671,8 @@
length += 4
length += 4
length += 15
+ length += 4
+ length += 4
length += 4
length += 4
length += 4
@@ -17471,6 +17782,8 @@
data = CommFunc.WriteDWORD(data, self.ExAttr19)
data = CommFunc.WriteDWORD(data, self.ExAttr20)
data = CommFunc.WriteDWORD(data, self.HPEx)
+ data = CommFunc.WriteDWORD(data, self.Face)
+ data = CommFunc.WriteDWORD(data, self.RoleType)
return data
def OutputString(self):
@@ -17570,7 +17883,9 @@
ExAttr18:%d,
ExAttr19:%d,
ExAttr20:%d,
- HPEx:%d
+ HPEx:%d,
+ Face:%d,
+ RoleType:%d
'''\
%(
self.Head.OutputString(),
@@ -17668,7 +17983,9 @@
self.ExAttr18,
self.ExAttr19,
self.ExAttr20,
- self.HPEx
+ self.HPEx,
+ self.Face,
+ self.RoleType
)
return DumpString
@@ -18760,9 +19077,8 @@
("SubCmd", c_ubyte),
("IsReset", c_ubyte), #是否是重置的
("Score", c_int), #当前积分
- ("BattleCountToday", c_ubyte), #今日已挑战次数
("MatchRefreshCount", c_ubyte), #当前已刷新匹配列表次数，每次挑战后会重置
- ("ItemAddBattleCountToday", c_ubyte), #今日已使用物品增加的挑战次数
+ ("BattleCount", c_ubyte), #当前可挑战次数
]
def __init__(self):
@@ -18781,9 +19097,8 @@
self.SubCmd = 0xC3
self.IsReset = 0
self.Score = 0
- self.BattleCountToday = 0
self.MatchRefreshCount = 0
- self.ItemAddBattleCountToday = 0
+ self.BattleCount = 0
return
def GetLength(self):
@@ -18798,18 +19113,16 @@
SubCmd:%s,
IsReset:%d,
Score:%d,
- BattleCountToday:%d,
MatchRefreshCount:%d,
- ItemAddBattleCountToday:%d
+ BattleCount:%d
'''\
%(
self.Cmd,
self.SubCmd,
self.IsReset,
self.Score,
- self.BattleCountToday,
self.MatchRefreshCount,
- self.ItemAddBattleCountToday
+ self.BattleCount
)
return DumpString
@@ -23717,8 +24030,9 @@
RecoverCnt = 0 #(WORD RecoverCnt)//找回次数
ItemAddCnt = 0 #(WORD ItemAddCnt)//物品增加次数
PassGradeCnt = 0 #(BYTE PassGradeCnt)//星级值对应个数, 每个key存9个lineID
- PassGrade = list() #(vector<DWORD> PassGrade)//副本线路对应星级值列表
+ PassGrade = list() #(vector<DWORD> PassGrade)//副本线路对应星级值列表，一般仅线路有星级设定的才有
EnterCntTotal = 0 #(DWORD EnterCntTotal)//累计进入次数
+ PassLineID = 0 #(DWORD PassLineID)//已过关到的lineID
data = None
def __init__(self):
@@ -23736,6 +24050,7 @@
value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
self.PassGrade.append(value)
self.EnterCntTotal,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.PassLineID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -23746,6 +24061,7 @@
self.PassGradeCnt = 0
self.PassGrade = list()
self.EnterCntTotal = 0
+ self.PassLineID = 0
return
def GetLength(self):
@@ -23756,6 +24072,7 @@
length += 2
length += 1
length += 4 * self.PassGradeCnt
+ length += 4
length += 4
return length
@@ -23770,6 +24087,7 @@
for i in range(self.PassGradeCnt):
data = CommFunc.WriteDWORD(data, self.PassGrade[i])
data = CommFunc.WriteDWORD(data, self.EnterCntTotal)
+ data = CommFunc.WriteDWORD(data, self.PassLineID)
return data
def OutputString(self):
@@ -23780,7 +24098,8 @@
ItemAddCnt:%d,
PassGradeCnt:%d,
PassGrade:%s,
- EnterCntTotal:%d
+ EnterCntTotal:%d,
+ PassLineID:%d
'''\
%(
self.FBID,
@@ -23789,7 +24108,8 @@
self.ItemAddCnt,
self.PassGradeCnt,
"...",
- self.EnterCntTotal
+ self.EnterCntTotal,
+ self.PassLineID
)
return DumpString
@@ -31142,7 +31462,9 @@
class tagMCActBossTrialBillard(Structure):
Rank = 0 #(DWORD Rank)// 名次，1-代表第一名；支持夸段，如1，3 代表第1名，第2~3名
Count = 0 #(BYTE Count)// 奖励物品数
- AwardItemList = list() #(vector<tagMCActBossTrialItem> AwardItemList)// 奖励物品列表
+ AwardItemList = list() #(vector<tagMCActBossTrialItem> AwardItemList)// 奖励物品列表，当仙盟榜时，如果有该奖励则代表盟主奖励，否则默认均为成员奖励
+ MemCount = 0 #(BYTE MemCount)// 成员奖励物品数
+ MemAwardItemList = list() #(vector<tagMCActBossTrialItem> MemAwardItemList)// 成员奖励物品列表，仅仙盟榜时有效
data = None
def __init__(self):
@@ -31157,12 +31479,19 @@
temAwardItemList = tagMCActBossTrialItem()
_pos = temAwardItemList.ReadData(_lpData, _pos)
self.AwardItemList.append(temAwardItemList)
+ self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.MemCount):
+ temMemAwardItemList = tagMCActBossTrialItem()
+ _pos = temMemAwardItemList.ReadData(_lpData, _pos)
+ self.MemAwardItemList.append(temMemAwardItemList)
return _pos
def Clear(self):
self.Rank = 0
self.Count = 0
self.AwardItemList = list()
+ self.MemCount = 0
+ self.MemAwardItemList = list()
return
def GetLength(self):
@@ -31171,6 +31500,9 @@
length += 1
for i in range(self.Count):
length += self.AwardItemList[i].GetLength()
+ length += 1
+ for i in range(self.MemCount):
+ length += self.MemAwardItemList[i].GetLength()
return length
@@ -31180,17 +31512,24 @@
data = CommFunc.WriteBYTE(data, self.Count)
for i in range(self.Count):
data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.MemCount)
+ for i in range(self.MemCount):
+ data = CommFunc.WriteString(data, self.MemAwardItemList[i].GetLength(), self.MemAwardItemList[i].GetBuffer())
return data
def OutputString(self):
DumpString = '''
Rank:%d,
Count:%d,
- AwardItemList:%s
+ AwardItemList:%s,
+ MemCount:%d,
+ MemAwardItemList:%s
'''\
%(
self.Rank,
self.Count,
+ "...",
+ self.MemCount,
"..."
)
return DumpString
@@ -31265,13 +31604,19 @@
ActNum = 0 #(BYTE ActNum)// 活动编号
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ JoinStartTime = "" #(char JoinStartTime[5])// 参与开始时间点 mm:ss
+ JoinEndTime = "" #(char JoinEndTime[5])// 参与结束时间点 mm:ss
IsDayReset = 0 #(BYTE IsDayReset)// 是否每天重置
ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
LimitLV = 0 #(WORD LimitLV)// 限制等级
+ ShopType = 0 #(WORD ShopType)// 开放商店类型，可能为0不开放
+ SubResetType = 0 #(BYTE SubResetType)// 提交凭证奖励重置类型，0-跟随活动； 1-0点重置；2-5点重置
SubmitCount = 0 #(BYTE SubmitCount)
SubmitInfoList = list() #(vector<tagMCActBossTrialSubmitInfo> SubmitInfoList)// 提交凭证信息列表
- BillardCount = 0 #(BYTE BillardCount)
- BillboardInfoList = list() #(vector<tagMCActBossTrialBillard> BillboardInfoList)// 榜单信息列表
+ PersonalBillCount = 0 #(BYTE PersonalBillCount)
+ PersonalBillboardInfoList = list() #(vector<tagMCActBossTrialBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表，如果没有代表本次活动没有该榜奖励
+ FamilyBillCount = 0 #(BYTE FamilyBillCount)
+ FamilyBillboardInfoList = list() #(vector<tagMCActBossTrialBillard> FamilyBillboardInfoList)// 仙盟榜单奖励信息列表，如果没有代表本次活动没有该榜奖励
data = None
def __init__(self):
@@ -31286,19 +31631,28 @@
self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+ self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.ShopType,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.SubResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.SubmitCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.SubmitCount):
temSubmitInfoList = tagMCActBossTrialSubmitInfo()
_pos = temSubmitInfoList.ReadData(_lpData, _pos)
self.SubmitInfoList.append(temSubmitInfoList)
- self.BillardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.BillardCount):
- temBillboardInfoList = tagMCActBossTrialBillard()
- _pos = temBillboardInfoList.ReadData(_lpData, _pos)
- self.BillboardInfoList.append(temBillboardInfoList)
+ self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.PersonalBillCount):
+ temPersonalBillboardInfoList = tagMCActBossTrialBillard()
+ _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
+ self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
+ self.FamilyBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.FamilyBillCount):
+ temFamilyBillboardInfoList = tagMCActBossTrialBillard()
+ _pos = temFamilyBillboardInfoList.ReadData(_lpData, _pos)
+ self.FamilyBillboardInfoList.append(temFamilyBillboardInfoList)
return _pos
def Clear(self):
@@ -31309,13 +31663,19 @@
self.ActNum = 0
self.StartDate = ""
self.EndtDate = ""
+ self.JoinStartTime = ""
+ self.JoinEndTime = ""
self.IsDayReset = 0
self.ResetType = 0
self.LimitLV = 0
+ self.ShopType = 0
+ self.SubResetType = 0
self.SubmitCount = 0
self.SubmitInfoList = list()
- self.BillardCount = 0
- self.BillboardInfoList = list()
+ self.PersonalBillCount = 0
+ self.PersonalBillboardInfoList = list()
+ self.FamilyBillCount = 0
+ self.FamilyBillboardInfoList = list()
return
def GetLength(self):
@@ -31324,15 +31684,22 @@
length += 1
length += 10
length += 10
+ length += 5
+ length += 5
length += 1
length += 1
length += 2
+ length += 2
+ length += 1
length += 1
for i in range(self.SubmitCount):
length += self.SubmitInfoList[i].GetLength()
length += 1
- for i in range(self.BillardCount):
- length += self.BillboardInfoList[i].GetLength()
+ for i in range(self.PersonalBillCount):
+ length += self.PersonalBillboardInfoList[i].GetLength()
+ length += 1
+ for i in range(self.FamilyBillCount):
+ length += self.FamilyBillboardInfoList[i].GetLength()
return length
@@ -31342,15 +31709,22 @@
data = CommFunc.WriteBYTE(data, self.ActNum)
data = CommFunc.WriteString(data, 10, self.StartDate)
data = CommFunc.WriteString(data, 10, self.EndtDate)
+ data = CommFunc.WriteString(data, 5, self.JoinStartTime)
+ data = CommFunc.WriteString(data, 5, self.JoinEndTime)
data = CommFunc.WriteBYTE(data, self.IsDayReset)
data = CommFunc.WriteBYTE(data, self.ResetType)
data = CommFunc.WriteWORD(data, self.LimitLV)
+ data = CommFunc.WriteWORD(data, self.ShopType)
+ data = CommFunc.WriteBYTE(data, self.SubResetType)
data = CommFunc.WriteBYTE(data, self.SubmitCount)
for i in range(self.SubmitCount):
data = CommFunc.WriteString(data, self.SubmitInfoList[i].GetLength(), self.SubmitInfoList[i].GetBuffer())
- data = CommFunc.WriteBYTE(data, self.BillardCount)
- for i in range(self.BillardCount):
- data = CommFunc.WriteString(data, self.BillboardInfoList[i].GetLength(), self.BillboardInfoList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
+ for i in range(self.PersonalBillCount):
+ data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.FamilyBillCount)
+ for i in range(self.FamilyBillCount):
+ data = CommFunc.WriteString(data, self.FamilyBillboardInfoList[i].GetLength(), self.FamilyBillboardInfoList[i].GetBuffer())
return data
def OutputString(self):
@@ -31359,25 +31733,37 @@
ActNum:%d,
StartDate:%s,
EndtDate:%s,
+ JoinStartTime:%s,
+ JoinEndTime:%s,
IsDayReset:%d,
ResetType:%d,
LimitLV:%d,
+ ShopType:%d,
+ SubResetType:%d,
SubmitCount:%d,
SubmitInfoList:%s,
- BillardCount:%d,
- BillboardInfoList:%s
+ PersonalBillCount:%d,
+ PersonalBillboardInfoList:%s,
+ FamilyBillCount:%d,
+ FamilyBillboardInfoList:%s
'''\
%(
self.Head.OutputString(),
self.ActNum,
self.StartDate,
self.EndtDate,
+ self.JoinStartTime,
+ self.JoinEndTime,
self.IsDayReset,
self.ResetType,
self.LimitLV,
+ self.ShopType,
+ self.SubResetType,
self.SubmitCount,
"...",
- self.BillardCount,
+ self.PersonalBillCount,
+ "...",
+ self.FamilyBillCount,
"..."
)
return DumpString
@@ -31396,8 +31782,9 @@
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
("ActNum", c_ubyte), # 活动编号
- ("SubmitCount", c_ushort), # 已提交凭证个数
- ("SubmitCountAward", c_int), # 提交凭证奖励领奖状态
+ ("SubmitCount", c_int), # 已提交凭证个数，总个数
+ ("SubmitAwardCount", c_int), # 已提交凭证个数，关联提交奖励的个数，领奖使用该个数判断
+ ("SubmitAwardState", c_int), # 提交凭证奖励领奖状态
]
def __init__(self):
@@ -31416,7 +31803,8 @@
self.SubCmd = 0x68
self.ActNum = 0
self.SubmitCount = 0
- self.SubmitCountAward = 0
+ self.SubmitAwardCount = 0
+ self.SubmitAwardState = 0
return
def GetLength(self):
@@ -31431,20 +31819,347 @@
SubCmd:%s,
ActNum:%d,
SubmitCount:%d,
- SubmitCountAward:%d
+ SubmitAwardCount:%d,
+ SubmitAwardState:%d
'''\
%(
self.Cmd,
self.SubCmd,
self.ActNum,
self.SubmitCount,
- self.SubmitCountAward
+ self.SubmitAwardCount,
+ self.SubmitAwardState
)
return DumpString
m_NAtagMCActBossTrialPlayerInfo=tagMCActBossTrialPlayerInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActBossTrialPlayerInfo.Cmd,m_NAtagMCActBossTrialPlayerInfo.SubCmd))] = m_NAtagMCActBossTrialPlayerInfo
+
+
+#------------------------------------------------------
+# AA 74 购买次数礼包活动信息 #tagMCActBuyCountGiftInfo
+
+class tagMCActBuyCountGiftItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("ItemID", c_int),
+ ("ItemCount", c_ushort),
+ ("IsBind", c_ubyte),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.ItemID = 0
+ self.ItemCount = 0
+ self.IsBind = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActBuyCountGiftItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 74 购买次数礼包活动信息 //tagMCActBuyCountGiftInfo:
+ ItemID:%d,
+ ItemCount:%d,
+ IsBind:%d
+ '''\
+ %(
+ self.ItemID,
+ self.ItemCount,
+ self.IsBind
+ )
+ return DumpString
+
+
+class tagMCActBuyCountGift(Structure):
+ NeedBuyCount = 0 #(BYTE NeedBuyCount)// 所需总购买次数，0为免费领取的档次
+ Count = 0 #(BYTE Count)// 奖励物品数
+ AwardItemList = list() #(vector<tagMCActBuyCountGiftItem> AwardItemList)// 奖励物品列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.NeedBuyCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.Count):
+ temAwardItemList = tagMCActBuyCountGiftItem()
+ _pos = temAwardItemList.ReadData(_lpData, _pos)
+ self.AwardItemList.append(temAwardItemList)
+ return _pos
+
+ def Clear(self):
+ self.NeedBuyCount = 0
+ self.Count = 0
+ self.AwardItemList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 1
+ length += 1
+ for i in range(self.Count):
+ length += self.AwardItemList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteBYTE(data, self.NeedBuyCount)
+ data = CommFunc.WriteBYTE(data, self.Count)
+ for i in range(self.Count):
+ data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ NeedBuyCount:%d,
+ Count:%d,
+ AwardItemList:%s
+ '''\
+ %(
+ self.NeedBuyCount,
+ self.Count,
+ "..."
+ )
+ return DumpString
+
+
+class tagMCActBuyCountCTGID(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("CTGID", c_ushort), # 充值表ID
+ ("Discount", c_ushort), # 折扣力度百分比
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.CTGID = 0
+ self.Discount = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActBuyCountCTGID)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 74 购买次数礼包活动信息 //tagMCActBuyCountGiftInfo:
+ CTGID:%d,
+ Discount:%d
+ '''\
+ %(
+ self.CTGID,
+ self.Discount
+ )
+ return DumpString
+
+
+class tagMCActBuyCountGiftInfo(Structure):
+ Head = tagHead()
+ ActNum = 0 #(BYTE ActNum)// 活动编号
+ StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
+ EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ IsDayReset = 0 #(BYTE IsDayReset)// 是否每天重置
+ ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
+ CTGIDCount = 0 #(BYTE CTGIDCount)
+ CTGIDInfoList = list() #(vector<tagMCActBuyCountCTGID> CTGIDInfoList)// CTGID信息列表；总购买次数前端自己统计，直接取CTGID对应的累计购买次数累加
+ GiftCount = 0 #(BYTE GiftCount)
+ BuyCountGiftList = list() #(vector<tagMCActBuyCountGift> BuyCountGiftList)// 购买次数礼包列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x74
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.CTGIDCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.CTGIDCount):
+ temCTGIDInfoList = tagMCActBuyCountCTGID()
+ _pos = temCTGIDInfoList.ReadData(_lpData, _pos)
+ self.CTGIDInfoList.append(temCTGIDInfoList)
+ self.GiftCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.GiftCount):
+ temBuyCountGiftList = tagMCActBuyCountGift()
+ _pos = temBuyCountGiftList.ReadData(_lpData, _pos)
+ self.BuyCountGiftList.append(temBuyCountGiftList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x74
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndtDate = ""
+ self.IsDayReset = 0
+ self.ResetType = 0
+ self.LimitLV = 0
+ self.CTGIDCount = 0
+ self.CTGIDInfoList = list()
+ self.GiftCount = 0
+ self.BuyCountGiftList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 10
+ length += 10
+ length += 1
+ length += 1
+ length += 2
+ length += 1
+ for i in range(self.CTGIDCount):
+ length += self.CTGIDInfoList[i].GetLength()
+ length += 1
+ for i in range(self.GiftCount):
+ length += self.BuyCountGiftList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ActNum)
+ data = CommFunc.WriteString(data, 10, self.StartDate)
+ data = CommFunc.WriteString(data, 10, self.EndtDate)
+ data = CommFunc.WriteBYTE(data, self.IsDayReset)
+ data = CommFunc.WriteBYTE(data, self.ResetType)
+ data = CommFunc.WriteWORD(data, self.LimitLV)
+ data = CommFunc.WriteBYTE(data, self.CTGIDCount)
+ for i in range(self.CTGIDCount):
+ data = CommFunc.WriteString(data, self.CTGIDInfoList[i].GetLength(), self.CTGIDInfoList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.GiftCount)
+ for i in range(self.GiftCount):
+ data = CommFunc.WriteString(data, self.BuyCountGiftList[i].GetLength(), self.BuyCountGiftList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ActNum:%d,
+ StartDate:%s,
+ EndtDate:%s,
+ IsDayReset:%d,
+ ResetType:%d,
+ LimitLV:%d,
+ CTGIDCount:%d,
+ CTGIDInfoList:%s,
+ GiftCount:%d,
+ BuyCountGiftList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ActNum,
+ self.StartDate,
+ self.EndtDate,
+ self.IsDayReset,
+ self.ResetType,
+ self.LimitLV,
+ self.CTGIDCount,
+ "...",
+ self.GiftCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCActBuyCountGiftInfo=tagMCActBuyCountGiftInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActBuyCountGiftInfo.Head.Cmd,m_NAtagMCActBuyCountGiftInfo.Head.SubCmd))] = m_NAtagMCActBuyCountGiftInfo
+
+
+#------------------------------------------------------
+# AA 75 购买次数礼包活动玩家信息 #tagMCActBuyCountGiftPlayerInfo
+
+class tagMCActBuyCountGiftPlayerInfo(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("ActNum", c_ubyte), # 活动编号
+ ("GiftAwardRecord", c_int), # 购买次数礼包领奖记录，直接用购买次数做位运算判断是否已领取
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xAA
+ self.SubCmd = 0x75
+ 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 = 0xAA
+ self.SubCmd = 0x75
+ self.ActNum = 0
+ self.GiftAwardRecord = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActBuyCountGiftPlayerInfo)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 75 购买次数礼包活动玩家信息 //tagMCActBuyCountGiftPlayerInfo:
+ Cmd:%s,
+ SubCmd:%s,
+ ActNum:%d,
+ GiftAwardRecord:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.ActNum,
+ self.GiftAwardRecord
+ )
+ return DumpString
+
+
+m_NAtagMCActBuyCountGiftPlayerInfo=tagMCActBuyCountGiftPlayerInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActBuyCountGiftPlayerInfo.Cmd,m_NAtagMCActBuyCountGiftPlayerInfo.SubCmd))] = m_NAtagMCActBuyCountGiftPlayerInfo
#------------------------------------------------------
@@ -32134,6 +32849,273 @@
m_NAtagMCActCollectWordsPlayerInfo=tagMCActCollectWordsPlayerInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActCollectWordsPlayerInfo.Head.Cmd,m_NAtagMCActCollectWordsPlayerInfo.Head.SubCmd))] = m_NAtagMCActCollectWordsPlayerInfo
+
+
+#------------------------------------------------------
+# AA 77 仙盟充值互助活动信息 #tagMCActFamilyCTGAssistInfo
+
+class tagMCActFamilyCTGAssistItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("ItemID", c_int),
+ ("ItemCount", c_ushort),
+ ("IsBind", c_ubyte),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.ItemID = 0
+ self.ItemCount = 0
+ self.IsBind = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActFamilyCTGAssistItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 77 仙盟充值互助活动信息 //tagMCActFamilyCTGAssistInfo:
+ ItemID:%d,
+ ItemCount:%d,
+ IsBind:%d
+ '''\
+ %(
+ self.ItemID,
+ self.ItemCount,
+ self.IsBind
+ )
+ return DumpString
+
+
+class tagMCActFamilyCTGAssistAward(Structure):
+ NeedCTGPlayers = 0 #(BYTE NeedCTGPlayers)//所需充值人数
+ RecordIndex = 0 #(BYTE RecordIndex)//对应领奖记录索引
+ Count = 0 #(BYTE Count)
+ AwardItemList = list() #(vector<tagMCActFamilyCTGAssistItem> AwardItemList)// 奖励物品列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.NeedCTGPlayers,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RecordIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.Count):
+ temAwardItemList = tagMCActFamilyCTGAssistItem()
+ _pos = temAwardItemList.ReadData(_lpData, _pos)
+ self.AwardItemList.append(temAwardItemList)
+ return _pos
+
+ def Clear(self):
+ self.NeedCTGPlayers = 0
+ self.RecordIndex = 0
+ self.Count = 0
+ self.AwardItemList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 1
+ length += 1
+ length += 1
+ for i in range(self.Count):
+ length += self.AwardItemList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteBYTE(data, self.NeedCTGPlayers)
+ data = CommFunc.WriteBYTE(data, self.RecordIndex)
+ data = CommFunc.WriteBYTE(data, self.Count)
+ for i in range(self.Count):
+ data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ NeedCTGPlayers:%d,
+ RecordIndex:%d,
+ Count:%d,
+ AwardItemList:%s
+ '''\
+ %(
+ self.NeedCTGPlayers,
+ self.RecordIndex,
+ self.Count,
+ "..."
+ )
+ return DumpString
+
+
+class tagMCActFamilyCTGAssistInfo(Structure):
+ Head = tagHead()
+ ActNum = 0 #(BYTE ActNum)//活动编号
+ StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
+ EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ IsDayReset = 0 #(BYTE IsDayReset)//是否每天重置
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
+ AwardCount = 0 #(BYTE AwardCount)
+ AwardInfoList = list() #(vector<tagMCActFamilyCTGAssistAward> AwardInfoList)// 互助奖励列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x77
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.AwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.AwardCount):
+ temAwardInfoList = tagMCActFamilyCTGAssistAward()
+ _pos = temAwardInfoList.ReadData(_lpData, _pos)
+ self.AwardInfoList.append(temAwardInfoList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x77
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndtDate = ""
+ self.IsDayReset = 0
+ self.LimitLV = 0
+ self.AwardCount = 0
+ self.AwardInfoList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 10
+ length += 10
+ length += 1
+ length += 2
+ length += 1
+ for i in range(self.AwardCount):
+ length += self.AwardInfoList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ActNum)
+ data = CommFunc.WriteString(data, 10, self.StartDate)
+ data = CommFunc.WriteString(data, 10, self.EndtDate)
+ data = CommFunc.WriteBYTE(data, self.IsDayReset)
+ data = CommFunc.WriteWORD(data, self.LimitLV)
+ data = CommFunc.WriteBYTE(data, self.AwardCount)
+ for i in range(self.AwardCount):
+ data = CommFunc.WriteString(data, self.AwardInfoList[i].GetLength(), self.AwardInfoList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ActNum:%d,
+ StartDate:%s,
+ EndtDate:%s,
+ IsDayReset:%d,
+ LimitLV:%d,
+ AwardCount:%d,
+ AwardInfoList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ActNum,
+ self.StartDate,
+ self.EndtDate,
+ self.IsDayReset,
+ self.LimitLV,
+ self.AwardCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCActFamilyCTGAssistInfo=tagMCActFamilyCTGAssistInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActFamilyCTGAssistInfo.Head.Cmd,m_NAtagMCActFamilyCTGAssistInfo.Head.SubCmd))] = m_NAtagMCActFamilyCTGAssistInfo
+
+
+#------------------------------------------------------
+# AA 78 仙盟充值互助活动玩家信息 #tagMCActFamilyCTGAssistPlayerInfo
+
+class tagMCActFamilyCTGAssistPlayerInfo(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("ActNum", c_ubyte), # 活动编号
+ ("AwardRecord", c_int), # 奖励记录，按奖励记录索引位运算判断是否已领取
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xAA
+ self.SubCmd = 0x78
+ 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 = 0xAA
+ self.SubCmd = 0x78
+ self.ActNum = 0
+ self.AwardRecord = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActFamilyCTGAssistPlayerInfo)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 78 仙盟充值互助活动玩家信息 //tagMCActFamilyCTGAssistPlayerInfo:
+ Cmd:%s,
+ SubCmd:%s,
+ ActNum:%d,
+ AwardRecord:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.ActNum,
+ self.AwardRecord
+ )
+ return DumpString
+
+
+m_NAtagMCActFamilyCTGAssistPlayerInfo=tagMCActFamilyCTGAssistPlayerInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActFamilyCTGAssistPlayerInfo.Cmd,m_NAtagMCActFamilyCTGAssistPlayerInfo.SubCmd))] = m_NAtagMCActFamilyCTGAssistPlayerInfo
#------------------------------------------------------
@@ -32880,7 +33862,7 @@
class tagMCActGrowupBuyCTGInfo(Structure):
- CTGID = 0 #(BYTE CTGID)// 充值表ID
+ CTGID = 0 #(WORD CTGID)// 充值表ID
GainItemCount = 0 #(BYTE GainItemCount)// 获得物品数
GainItemList = list() #(vector<tagMCActGrowupBuyCTGItem> GainItemList)// 获得物品列表，替换充值表中的 GainItemList 字段信息
data = None
@@ -32891,7 +33873,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
- self.CTGID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.CTGID,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.GainItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GainItemCount):
temGainItemList = tagMCActGrowupBuyCTGItem()
@@ -32907,7 +33889,7 @@
def GetLength(self):
length = 0
- length += 1
+ length += 2
length += 1
for i in range(self.GainItemCount):
length += self.GainItemList[i].GetLength()
@@ -32916,7 +33898,7 @@
def GetBuffer(self):
data = ''
- data = CommFunc.WriteBYTE(data, self.CTGID)
+ data = CommFunc.WriteWORD(data, self.CTGID)
data = CommFunc.WriteBYTE(data, self.GainItemCount)
for i in range(self.GainItemCount):
data = CommFunc.WriteString(data, self.GainItemList[i].GetLength(), self.GainItemList[i].GetBuffer())
@@ -33647,6 +34629,273 @@
m_NAtagMCActLoginAwardPlayerInfo=tagMCActLoginAwardPlayerInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActLoginAwardPlayerInfo.Head.Cmd,m_NAtagMCActLoginAwardPlayerInfo.Head.SubCmd))] = m_NAtagMCActLoginAwardPlayerInfo
+
+
+#------------------------------------------------------
+# AA 69 登录活动信息新 #tagMCActLoginNew
+
+class tagMCActLoginNewItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("ItemID", c_int),
+ ("ItemCount", c_ushort),
+ ("IsBind", c_ubyte),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.ItemID = 0
+ self.ItemCount = 0
+ self.IsBind = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActLoginNewItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 69 登录活动信息新 //tagMCActLoginNew:
+ ItemID:%d,
+ ItemCount:%d,
+ IsBind:%d
+ '''\
+ %(
+ self.ItemID,
+ self.ItemCount,
+ self.IsBind
+ )
+ return DumpString
+
+
+class tagMCActLoginNewDay(Structure):
+ DayNum = 0 #(BYTE DayNum)//天编号，从1开始，过期未签到领取的天可消耗货币补签领取
+ Count = 0 #(BYTE Count)// 奖励物品数
+ AwardItemList = list() #(vector<tagMCActLoginNewItem> AwardItemList)// 奖励物品列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.DayNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.Count):
+ temAwardItemList = tagMCActLoginNewItem()
+ _pos = temAwardItemList.ReadData(_lpData, _pos)
+ self.AwardItemList.append(temAwardItemList)
+ return _pos
+
+ def Clear(self):
+ self.DayNum = 0
+ self.Count = 0
+ self.AwardItemList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 1
+ length += 1
+ for i in range(self.Count):
+ length += self.AwardItemList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteBYTE(data, self.DayNum)
+ data = CommFunc.WriteBYTE(data, self.Count)
+ for i in range(self.Count):
+ data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ DayNum:%d,
+ Count:%d,
+ AwardItemList:%s
+ '''\
+ %(
+ self.DayNum,
+ self.Count,
+ "..."
+ )
+ return DumpString
+
+
+class tagMCActLoginNew(Structure):
+ Head = tagHead()
+ ActNum = 0 #(BYTE ActNum)// 活动编号
+ StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
+ EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
+ RepSignMoneyType = 0 #(BYTE RepSignMoneyType)// 补签消耗货币类型
+ RepSignMoneyValue = 0 #(DWORD RepSignMoneyValue)// 补签消耗货币值
+ DayCount = 0 #(BYTE DayCount)
+ AwardDayList = list() #(vector<tagMCActLoginNewDay> AwardDayList)// 奖励天列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x69
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.RepSignMoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RepSignMoneyValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.DayCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.DayCount):
+ temAwardDayList = tagMCActLoginNewDay()
+ _pos = temAwardDayList.ReadData(_lpData, _pos)
+ self.AwardDayList.append(temAwardDayList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x69
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndtDate = ""
+ self.LimitLV = 0
+ self.RepSignMoneyType = 0
+ self.RepSignMoneyValue = 0
+ self.DayCount = 0
+ self.AwardDayList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 10
+ length += 10
+ length += 2
+ length += 1
+ length += 4
+ length += 1
+ for i in range(self.DayCount):
+ length += self.AwardDayList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ActNum)
+ data = CommFunc.WriteString(data, 10, self.StartDate)
+ data = CommFunc.WriteString(data, 10, self.EndtDate)
+ data = CommFunc.WriteWORD(data, self.LimitLV)
+ data = CommFunc.WriteBYTE(data, self.RepSignMoneyType)
+ data = CommFunc.WriteDWORD(data, self.RepSignMoneyValue)
+ data = CommFunc.WriteBYTE(data, self.DayCount)
+ for i in range(self.DayCount):
+ data = CommFunc.WriteString(data, self.AwardDayList[i].GetLength(), self.AwardDayList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ActNum:%d,
+ StartDate:%s,
+ EndtDate:%s,
+ LimitLV:%d,
+ RepSignMoneyType:%d,
+ RepSignMoneyValue:%d,
+ DayCount:%d,
+ AwardDayList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ActNum,
+ self.StartDate,
+ self.EndtDate,
+ self.LimitLV,
+ self.RepSignMoneyType,
+ self.RepSignMoneyValue,
+ self.DayCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCActLoginNew=tagMCActLoginNew()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActLoginNew.Head.Cmd,m_NAtagMCActLoginNew.Head.SubCmd))] = m_NAtagMCActLoginNew
+
+
+#------------------------------------------------------
+# AA 70 登录活动玩家信息新 #tagMCActLoginPlayerInfoNew
+
+class tagMCActLoginPlayerInfoNew(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("ActNum", c_ubyte), # 活动编号
+ ("LoginAward", c_int), # 是否已领取，按天索引0代表第1天记录当天是否已领取
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xAA
+ self.SubCmd = 0x70
+ 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 = 0xAA
+ self.SubCmd = 0x70
+ self.ActNum = 0
+ self.LoginAward = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActLoginPlayerInfoNew)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 70 登录活动玩家信息新 //tagMCActLoginPlayerInfoNew:
+ Cmd:%s,
+ SubCmd:%s,
+ ActNum:%d,
+ LoginAward:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.ActNum,
+ self.LoginAward
+ )
+ return DumpString
+
+
+m_NAtagMCActLoginPlayerInfoNew=tagMCActLoginPlayerInfoNew()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActLoginPlayerInfoNew.Cmd,m_NAtagMCActLoginPlayerInfoNew.SubCmd))] = m_NAtagMCActLoginPlayerInfoNew
#------------------------------------------------------
@@ -34972,6 +36221,420 @@
m_NAtagMCActSingleRechargePlayerInfo=tagMCActSingleRechargePlayerInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActSingleRechargePlayerInfo.Head.Cmd,m_NAtagMCActSingleRechargePlayerInfo.Head.SubCmd))] = m_NAtagMCActSingleRechargePlayerInfo
+
+
+#------------------------------------------------------
+# AA 71 任务活动信息 #tagMCActTaskInfo
+
+class tagMCActTaskItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("ItemID", c_int),
+ ("ItemCount", c_ushort),
+ ("IsBind", c_ubyte),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.ItemID = 0
+ self.ItemCount = 0
+ self.IsBind = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActTaskItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 71 任务活动信息 //tagMCActTaskInfo:
+ ItemID:%d,
+ ItemCount:%d,
+ IsBind:%d
+ '''\
+ %(
+ self.ItemID,
+ self.ItemCount,
+ self.IsBind
+ )
+ return DumpString
+
+
+class tagMCActTask(Structure):
+ TaskID = 0 #(DWORD TaskID)// 任务ID，1~n
+ TaskType = 0 #(BYTE TaskType)// 任务类型
+ NeedValue = 0 #(DWORD NeedValue)// 完成任务所需值
+ Count = 0 #(BYTE Count)// 奖励物品数
+ AwardItemList = list() #(vector<tagMCActTaskItem> AwardItemList)// 奖励物品列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.TaskID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.TaskType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.NeedValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.Count):
+ temAwardItemList = tagMCActTaskItem()
+ _pos = temAwardItemList.ReadData(_lpData, _pos)
+ self.AwardItemList.append(temAwardItemList)
+ return _pos
+
+ def Clear(self):
+ self.TaskID = 0
+ self.TaskType = 0
+ self.NeedValue = 0
+ self.Count = 0
+ self.AwardItemList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 4
+ length += 1
+ length += 4
+ length += 1
+ for i in range(self.Count):
+ length += self.AwardItemList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteDWORD(data, self.TaskID)
+ data = CommFunc.WriteBYTE(data, self.TaskType)
+ data = CommFunc.WriteDWORD(data, self.NeedValue)
+ data = CommFunc.WriteBYTE(data, self.Count)
+ for i in range(self.Count):
+ data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ TaskID:%d,
+ TaskType:%d,
+ NeedValue:%d,
+ Count:%d,
+ AwardItemList:%s
+ '''\
+ %(
+ self.TaskID,
+ self.TaskType,
+ self.NeedValue,
+ self.Count,
+ "..."
+ )
+ return DumpString
+
+
+class tagMCActTaskInfo(Structure):
+ Head = tagHead()
+ ActNum = 0 #(BYTE ActNum)// 活动编号
+ StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
+ EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ IsDayReset = 0 #(BYTE IsDayReset)// 是否每天重置
+ ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
+ TaskCount = 0 #(BYTE TaskCount)
+ TaskList = list() #(vector<tagMCActTask> TaskList)// 任务列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x71
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.TaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.TaskCount):
+ temTaskList = tagMCActTask()
+ _pos = temTaskList.ReadData(_lpData, _pos)
+ self.TaskList.append(temTaskList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x71
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndtDate = ""
+ self.IsDayReset = 0
+ self.ResetType = 0
+ self.LimitLV = 0
+ self.TaskCount = 0
+ self.TaskList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 10
+ length += 10
+ length += 1
+ length += 1
+ length += 2
+ length += 1
+ for i in range(self.TaskCount):
+ length += self.TaskList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ActNum)
+ data = CommFunc.WriteString(data, 10, self.StartDate)
+ data = CommFunc.WriteString(data, 10, self.EndtDate)
+ data = CommFunc.WriteBYTE(data, self.IsDayReset)
+ data = CommFunc.WriteBYTE(data, self.ResetType)
+ data = CommFunc.WriteWORD(data, self.LimitLV)
+ data = CommFunc.WriteBYTE(data, self.TaskCount)
+ for i in range(self.TaskCount):
+ data = CommFunc.WriteString(data, self.TaskList[i].GetLength(), self.TaskList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ActNum:%d,
+ StartDate:%s,
+ EndtDate:%s,
+ IsDayReset:%d,
+ ResetType:%d,
+ LimitLV:%d,
+ TaskCount:%d,
+ TaskList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ActNum,
+ self.StartDate,
+ self.EndtDate,
+ self.IsDayReset,
+ self.ResetType,
+ self.LimitLV,
+ self.TaskCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCActTaskInfo=tagMCActTaskInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActTaskInfo.Head.Cmd,m_NAtagMCActTaskInfo.Head.SubCmd))] = m_NAtagMCActTaskInfo
+
+
+#------------------------------------------------------
+# AA 73 任务活动玩家信息 #tagMCActTaskPlayerInfo
+
+class tagMCActTaskPlayerInfo(Structure):
+ Head = tagHead()
+ ActNum = 0 #(BYTE ActNum)// 活动编号
+ AwardCount = 0 #(BYTE AwardCount)
+ AwardRecordList = list() #(vector<DWORD> AwardRecordList)// 任务ID领奖记录值列表，根据任务ID位判断是否已领取，一个记录值存31位 [记录值0, 记录值1, ...]
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x73
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.AwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.AwardCount):
+ value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+ self.AwardRecordList.append(value)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x73
+ self.ActNum = 0
+ self.AwardCount = 0
+ self.AwardRecordList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 4 * self.AwardCount
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ActNum)
+ data = CommFunc.WriteBYTE(data, self.AwardCount)
+ for i in range(self.AwardCount):
+ data = CommFunc.WriteDWORD(data, self.AwardRecordList[i])
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ActNum:%d,
+ AwardCount:%d,
+ AwardRecordList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ActNum,
+ self.AwardCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCActTaskPlayerInfo=tagMCActTaskPlayerInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActTaskPlayerInfo.Head.Cmd,m_NAtagMCActTaskPlayerInfo.Head.SubCmd))] = m_NAtagMCActTaskPlayerInfo
+
+
+#------------------------------------------------------
+# AA 72 任务活动玩家任务值 #tagMCActTaskPlayerValueInfo
+
+class tagMCActTaskPlayerValue(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("TaskType", c_ubyte), # 任务类型
+ ("TaskValue", c_int), # 当前任务值，所有相同任务类型共享该进度值
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.TaskType = 0
+ self.TaskValue = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActTaskPlayerValue)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 72 任务活动玩家任务值 //tagMCActTaskPlayerValueInfo:
+ TaskType:%d,
+ TaskValue:%d
+ '''\
+ %(
+ self.TaskType,
+ self.TaskValue
+ )
+ return DumpString
+
+
+class tagMCActTaskPlayerValueInfo(Structure):
+ Head = tagHead()
+ ActNum = 0 #(BYTE ActNum)// 活动编号
+ TaskCount = 0 #(BYTE TaskCount)
+ TaskValueList = list() #(vector<tagMCActTaskPlayerValue> TaskValueList)// 有同步的任务类型直接覆盖即可
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x72
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.TaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.TaskCount):
+ temTaskValueList = tagMCActTaskPlayerValue()
+ _pos = temTaskValueList.ReadData(_lpData, _pos)
+ self.TaskValueList.append(temTaskValueList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x72
+ self.ActNum = 0
+ self.TaskCount = 0
+ self.TaskValueList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ for i in range(self.TaskCount):
+ length += self.TaskValueList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ActNum)
+ data = CommFunc.WriteBYTE(data, self.TaskCount)
+ for i in range(self.TaskCount):
+ data = CommFunc.WriteString(data, self.TaskValueList[i].GetLength(), self.TaskValueList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ActNum:%d,
+ TaskCount:%d,
+ TaskValueList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ActNum,
+ self.TaskCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCActTaskPlayerValueInfo=tagMCActTaskPlayerValueInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActTaskPlayerValueInfo.Head.Cmd,m_NAtagMCActTaskPlayerValueInfo.Head.SubCmd))] = m_NAtagMCActTaskPlayerValueInfo
#------------------------------------------------------
@@ -37201,6 +38864,290 @@
#------------------------------------------------------
+# AA 76 Boss历练跨服活动信息 #tagMCCrossActBossTrialInfo
+
+class tagMCCrossActBossTrialItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("ItemID", c_int),
+ ("ItemCount", c_ushort),
+ ("IsBind", c_ubyte),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.ItemID = 0
+ self.ItemCount = 0
+ self.IsBind = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCCrossActBossTrialItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 76 Boss历练跨服活动信息 //tagMCCrossActBossTrialInfo:
+ ItemID:%d,
+ ItemCount:%d,
+ IsBind:%d
+ '''\
+ %(
+ self.ItemID,
+ self.ItemCount,
+ self.IsBind
+ )
+ return DumpString
+
+
+class tagMCCrossActBossTrialBillard(Structure):
+ Rank = 0 #(DWORD Rank)// 名次，1-代表第一名；支持夸段，如1，3 代表第1名，第2~3名
+ Count = 0 #(BYTE Count)// 奖励物品数
+ AwardItemList = list() #(vector<tagMCCrossActBossTrialItem> AwardItemList)// 奖励物品列表，当仙盟榜时，如果有该奖励则代表盟主奖励，否则默认均为成员奖励
+ MemCount = 0 #(BYTE MemCount)// 成员奖励物品数
+ MemAwardItemList = list() #(vector<tagMCCrossActBossTrialItem> MemAwardItemList)// 成员奖励物品列表，仅仙盟榜时有效
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.Count):
+ temAwardItemList = tagMCCrossActBossTrialItem()
+ _pos = temAwardItemList.ReadData(_lpData, _pos)
+ self.AwardItemList.append(temAwardItemList)
+ self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.MemCount):
+ temMemAwardItemList = tagMCCrossActBossTrialItem()
+ _pos = temMemAwardItemList.ReadData(_lpData, _pos)
+ self.MemAwardItemList.append(temMemAwardItemList)
+ return _pos
+
+ def Clear(self):
+ self.Rank = 0
+ self.Count = 0
+ self.AwardItemList = list()
+ self.MemCount = 0
+ self.MemAwardItemList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 4
+ length += 1
+ for i in range(self.Count):
+ length += self.AwardItemList[i].GetLength()
+ length += 1
+ for i in range(self.MemCount):
+ length += self.MemAwardItemList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteDWORD(data, self.Rank)
+ data = CommFunc.WriteBYTE(data, self.Count)
+ for i in range(self.Count):
+ data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.MemCount)
+ for i in range(self.MemCount):
+ data = CommFunc.WriteString(data, self.MemAwardItemList[i].GetLength(), self.MemAwardItemList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Rank:%d,
+ Count:%d,
+ AwardItemList:%s,
+ MemCount:%d,
+ MemAwardItemList:%s
+ '''\
+ %(
+ self.Rank,
+ self.Count,
+ "...",
+ self.MemCount,
+ "..."
+ )
+ return DumpString
+
+
+class tagMCCrossActBossTrialInfo(Structure):
+ Head = tagHead()
+ ServerInfoLen = 0 #(BYTE ServerInfoLen)
+ ServerIDRangeInfo = "" #(String ServerIDRangeInfo)//开放该活动的服务器ID范围列表，json格式 [[IDA, IDB], ...]， [] 为全服
+ GroupValue1 = 0 #(BYTE GroupValue1)// 活动榜单分组值1，用于查询对应榜单
+ StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
+ EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ JoinStartTime = "" #(char JoinStartTime[5])// 参与开始时间点 mm:ss
+ JoinEndTime = "" #(char JoinEndTime[5])// 参与结束时间点 mm:ss
+ IsDayReset = 0 #(BYTE IsDayReset)// 是否每天重置
+ ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
+ RankLimitPersonal = 0 #(WORD RankLimitPersonal)// 个人榜上榜个数保底限制；
+ RankLimitFamily = 0 #(WORD RankLimitFamily)// 仙盟榜上榜个数保底限制；
+ PersonalBillCount = 0 #(BYTE PersonalBillCount)
+ PersonalBillboardInfoList = list() #(vector<tagMCCrossActBossTrialBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表，如果没有代表本次活动没有该榜奖励
+ FamilyBillCount = 0 #(BYTE FamilyBillCount)
+ FamilyBillboardInfoList = list() #(vector<tagMCCrossActBossTrialBillard> FamilyBillboardInfoList)// 仙盟榜单奖励信息列表，如果没有代表本次活动没有该榜奖励
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x76
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ServerInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.ServerIDRangeInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.ServerInfoLen)
+ self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+ self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+ self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RankLimitPersonal,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.RankLimitFamily,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.PersonalBillCount):
+ temPersonalBillboardInfoList = tagMCCrossActBossTrialBillard()
+ _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
+ self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
+ self.FamilyBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.FamilyBillCount):
+ temFamilyBillboardInfoList = tagMCCrossActBossTrialBillard()
+ _pos = temFamilyBillboardInfoList.ReadData(_lpData, _pos)
+ self.FamilyBillboardInfoList.append(temFamilyBillboardInfoList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xAA
+ self.Head.SubCmd = 0x76
+ self.ServerInfoLen = 0
+ self.ServerIDRangeInfo = ""
+ self.GroupValue1 = 0
+ self.StartDate = ""
+ self.EndtDate = ""
+ self.JoinStartTime = ""
+ self.JoinEndTime = ""
+ self.IsDayReset = 0
+ self.ResetType = 0
+ self.RankLimitPersonal = 0
+ self.RankLimitFamily = 0
+ self.PersonalBillCount = 0
+ self.PersonalBillboardInfoList = list()
+ self.FamilyBillCount = 0
+ self.FamilyBillboardInfoList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += len(self.ServerIDRangeInfo)
+ length += 1
+ length += 10
+ length += 10
+ length += 5
+ length += 5
+ length += 1
+ length += 1
+ length += 2
+ length += 2
+ length += 1
+ for i in range(self.PersonalBillCount):
+ length += self.PersonalBillboardInfoList[i].GetLength()
+ length += 1
+ for i in range(self.FamilyBillCount):
+ length += self.FamilyBillboardInfoList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ServerInfoLen)
+ data = CommFunc.WriteString(data, self.ServerInfoLen, self.ServerIDRangeInfo)
+ data = CommFunc.WriteBYTE(data, self.GroupValue1)
+ data = CommFunc.WriteString(data, 10, self.StartDate)
+ data = CommFunc.WriteString(data, 10, self.EndtDate)
+ data = CommFunc.WriteString(data, 5, self.JoinStartTime)
+ data = CommFunc.WriteString(data, 5, self.JoinEndTime)
+ data = CommFunc.WriteBYTE(data, self.IsDayReset)
+ data = CommFunc.WriteBYTE(data, self.ResetType)
+ data = CommFunc.WriteWORD(data, self.RankLimitPersonal)
+ data = CommFunc.WriteWORD(data, self.RankLimitFamily)
+ data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
+ for i in range(self.PersonalBillCount):
+ data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.FamilyBillCount)
+ for i in range(self.FamilyBillCount):
+ data = CommFunc.WriteString(data, self.FamilyBillboardInfoList[i].GetLength(), self.FamilyBillboardInfoList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ServerInfoLen:%d,
+ ServerIDRangeInfo:%s,
+ GroupValue1:%d,
+ StartDate:%s,
+ EndtDate:%s,
+ JoinStartTime:%s,
+ JoinEndTime:%s,
+ IsDayReset:%d,
+ ResetType:%d,
+ RankLimitPersonal:%d,
+ RankLimitFamily:%d,
+ PersonalBillCount:%d,
+ PersonalBillboardInfoList:%s,
+ FamilyBillCount:%d,
+ FamilyBillboardInfoList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ServerInfoLen,
+ self.ServerIDRangeInfo,
+ self.GroupValue1,
+ self.StartDate,
+ self.EndtDate,
+ self.JoinStartTime,
+ self.JoinEndTime,
+ self.IsDayReset,
+ self.ResetType,
+ self.RankLimitPersonal,
+ self.RankLimitFamily,
+ self.PersonalBillCount,
+ "...",
+ self.FamilyBillCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCCrossActBossTrialInfo=tagMCCrossActBossTrialInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossActBossTrialInfo.Head.Cmd,m_NAtagMCCrossActBossTrialInfo.Head.SubCmd))] = m_NAtagMCCrossActBossTrialInfo
+
+
+#------------------------------------------------------
# AA 25 每日礼包活动信息 #tagMCDailyGiftbagInfo
class tagMCDailyGiftbagItem(Structure):
@@ -37250,6 +39197,7 @@
RMB = 0 #(DWORD RMB)//所需RMB，元
GiftItemCount = 0 #(BYTE GiftItemCount)// 礼包物品数
ItemInfo = list() #(vector<tagMCDailyGiftbagItem> ItemInfo)// 物品信息
+ Discount = 0 #(WORD Discount)// 折扣力度百分比
data = None
def __init__(self):
@@ -37268,6 +39216,7 @@
temItemInfo = tagMCDailyGiftbagItem()
_pos = temItemInfo.ReadData(_lpData, _pos)
self.ItemInfo.append(temItemInfo)
+ self.Discount,_pos = CommFunc.ReadWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -37278,6 +39227,7 @@
self.RMB = 0
self.GiftItemCount = 0
self.ItemInfo = list()
+ self.Discount = 0
return
def GetLength(self):
@@ -37290,6 +39240,7 @@
length += 1
for i in range(self.GiftItemCount):
length += self.ItemInfo[i].GetLength()
+ length += 2
return length
@@ -37303,6 +39254,7 @@
data = CommFunc.WriteBYTE(data, self.GiftItemCount)
for i in range(self.GiftItemCount):
data = CommFunc.WriteString(data, self.ItemInfo[i].GetLength(), self.ItemInfo[i].GetBuffer())
+ data = CommFunc.WriteWORD(data, self.Discount)
return data
def OutputString(self):
@@ -37313,7 +39265,8 @@
BuyCountLimit:%d,
RMB:%d,
GiftItemCount:%d,
- ItemInfo:%s
+ ItemInfo:%s,
+ Discount:%d
'''\
%(
self.GiftID,
@@ -37322,7 +39275,8 @@
self.BuyCountLimit,
self.RMB,
self.GiftItemCount,
- "..."
+ "...",
+ self.Discount
)
return DumpString
@@ -43456,6 +45410,7 @@
TreasureState = list() #(vector<BYTE> TreasureState)// 聚宝盆是否已激活列表，[类型0是否已激活, ...]
TreasureAward = list() #(vector<BYTE> TreasureAward)// 聚宝盆奖励是否已领取列表，[类型0是否已领取, ...]
TreasureProgress = list() #(vector<BYTE> TreasureProgress)// 聚宝盆进度值列表，[类型0进度值, ...]，满进度100
+ HelpAwardCount = 0 #(BYTE HelpAwardCount)// 今日已帮助别人奖励次数
data = None
def __init__(self):
@@ -43481,6 +45436,7 @@
for i in range(self.TreasureCount):
value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
self.TreasureProgress.append(value)
+ self.HelpAwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -43496,6 +45452,7 @@
self.TreasureState = list()
self.TreasureAward = list()
self.TreasureProgress = list()
+ self.HelpAwardCount = 0
return
def GetLength(self):
@@ -43509,6 +45466,7 @@
length += 1 * self.TreasureCount
length += 1 * self.TreasureCount
length += 1 * self.TreasureCount
+ length += 1
return length
@@ -43526,6 +45484,7 @@
data = CommFunc.WriteBYTE(data, self.TreasureAward[i])
for i in range(self.TreasureCount):
data = CommFunc.WriteBYTE(data, self.TreasureProgress[i])
+ data = CommFunc.WriteBYTE(data, self.HelpAwardCount)
return data
def OutputString(self):
@@ -43538,7 +45497,8 @@
TreasureCount:%d,
TreasureState:%s,
TreasureAward:%s,
- TreasureProgress:%s
+ TreasureProgress:%s,
+ HelpAwardCount:%d
'''\
%(
self.Head.OutputString(),
@@ -43549,7 +45509,8 @@
self.TreasureCount,
"...",
"...",
- "..."
+ "...",
+ self.HelpAwardCount
)
return DumpString
@@ -43961,6 +45922,207 @@
m_NAtagMCFuncSysPrivilegeInfoList=tagMCFuncSysPrivilegeInfoList()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFuncSysPrivilegeInfoList.Head.Cmd,m_NAtagMCFuncSysPrivilegeInfoList.Head.SubCmd))] = m_NAtagMCFuncSysPrivilegeInfoList
+
+
+#------------------------------------------------------
+# B1 09 玩家挂机系统信息 #tagMCGuajiInfo
+
+class tagMCGuajiMoney(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("MoneyType", c_ubyte),
+ ("MoneyValue", c_int),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.MoneyType = 0
+ self.MoneyValue = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCGuajiMoney)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
+ MoneyType:%d,
+ MoneyValue:%d
+ '''\
+ %(
+ self.MoneyType,
+ self.MoneyValue
+ )
+ return DumpString
+
+
+class tagMCGuajiItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("ItemID", c_int),
+ ("Count", c_ushort),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.ItemID = 0
+ self.Count = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCGuajiItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
+ ItemID:%d,
+ Count:%d
+ '''\
+ %(
+ self.ItemID,
+ self.Count
+ )
+ return DumpString
+
+
+class tagMCGuajiInfo(Structure):
+ Head = tagHead()
+ QuickAwardCount = 0 #(BYTE QuickAwardCount)// 今日已快速挂机收益次数
+ AwardType = 0 #(BYTE AwardType)// 收益类型： 0-已累计预览；1-领取结算结果（包含常规领取跟快速领取）
+ AwardSeconds = 0 #(DWORD AwardSeconds)// 已累计收益时长，秒
+ Exp = 0 #(DWORD Exp)// 已累计经验，求余亿部分
+ ExpPoint = 0 #(DWORD ExpPoint)// 已累计经验，整除亿部分
+ MoneyLen = 0 #(BYTE MoneyLen)
+ MoneyList = list() #(vector<tagMCGuajiMoney> MoneyList)// 已累计货币
+ ItemLen = 0 #(BYTE ItemLen)
+ ItemList = list() #(vector<tagMCGuajiItem> ItemList)// 已累计物品
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x09
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.QuickAwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.AwardType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.AwardSeconds,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.Exp,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.ExpPoint,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.MoneyLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.MoneyLen):
+ temMoneyList = tagMCGuajiMoney()
+ _pos = temMoneyList.ReadData(_lpData, _pos)
+ self.MoneyList.append(temMoneyList)
+ self.ItemLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.ItemLen):
+ temItemList = tagMCGuajiItem()
+ _pos = temItemList.ReadData(_lpData, _pos)
+ self.ItemList.append(temItemList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x09
+ self.QuickAwardCount = 0
+ self.AwardType = 0
+ self.AwardSeconds = 0
+ self.Exp = 0
+ self.ExpPoint = 0
+ self.MoneyLen = 0
+ self.MoneyList = list()
+ self.ItemLen = 0
+ self.ItemList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 4
+ length += 4
+ length += 4
+ length += 1
+ for i in range(self.MoneyLen):
+ length += self.MoneyList[i].GetLength()
+ length += 1
+ for i in range(self.ItemLen):
+ length += self.ItemList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.QuickAwardCount)
+ data = CommFunc.WriteBYTE(data, self.AwardType)
+ data = CommFunc.WriteDWORD(data, self.AwardSeconds)
+ data = CommFunc.WriteDWORD(data, self.Exp)
+ data = CommFunc.WriteDWORD(data, self.ExpPoint)
+ data = CommFunc.WriteBYTE(data, self.MoneyLen)
+ for i in range(self.MoneyLen):
+ data = CommFunc.WriteString(data, self.MoneyList[i].GetLength(), self.MoneyList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ItemLen)
+ for i in range(self.ItemLen):
+ data = CommFunc.WriteString(data, self.ItemList[i].GetLength(), self.ItemList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ QuickAwardCount:%d,
+ AwardType:%d,
+ AwardSeconds:%d,
+ Exp:%d,
+ ExpPoint:%d,
+ MoneyLen:%d,
+ MoneyList:%s,
+ ItemLen:%d,
+ ItemList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.QuickAwardCount,
+ self.AwardType,
+ self.AwardSeconds,
+ self.Exp,
+ self.ExpPoint,
+ self.MoneyLen,
+ "...",
+ self.ItemLen,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCGuajiInfo=tagMCGuajiInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGuajiInfo.Head.Cmd,m_NAtagMCGuajiInfo.Head.SubCmd))] = m_NAtagMCGuajiInfo
#------------------------------------------------------
@@ -44497,19 +46659,17 @@
#------------------------------------------------------
# B1 10 当前任务信息 #tagMCTaskInfo
-class tagMCTaskInfo(Structure):
+class tagMCTask(Structure):
_pack_ = 1
_fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("TaskID", c_int), # 任务ID
+ ("TaskGroup", c_ubyte), # 任务组，0-主线
+ ("TaskID", c_int), # 当前任务ID，可能为0，表示该分组暂时没有任务
("CurValue", c_int), # 当前进度值
+ ("State", c_ubyte), # 任务状态 1-进行中 2-可领取
]
def __init__(self):
self.Clear()
- self.Cmd = 0xB1
- self.SubCmd = 0x10
return
def ReadData(self, stringData, _pos=0, _len=0):
@@ -44518,36 +46678,98 @@
return _pos + self.GetLength()
def Clear(self):
- self.Cmd = 0xB1
- self.SubCmd = 0x10
+ self.TaskGroup = 0
self.TaskID = 0
self.CurValue = 0
+ self.State = 0
return
def GetLength(self):
- return sizeof(tagMCTaskInfo)
+ return sizeof(tagMCTask)
def GetBuffer(self):
return string_at(addressof(self), self.GetLength())
def OutputString(self):
DumpString = '''// B1 10 当前任务信息 //tagMCTaskInfo:
- Cmd:%s,
- SubCmd:%s,
+ TaskGroup:%d,
TaskID:%d,
- CurValue:%d
+ CurValue:%d,
+ State:%d
'''\
%(
- self.Cmd,
- self.SubCmd,
+ self.TaskGroup,
self.TaskID,
- self.CurValue
+ self.CurValue,
+ self.State
+ )
+ return DumpString
+
+
+class tagMCTaskInfo(Structure):
+ Head = tagHead()
+ TaskCount = 0 #(BYTE TaskCount)
+ TaskList = list() #(vector<tagMCTask> TaskList)
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x10
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.TaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.TaskCount):
+ temTaskList = tagMCTask()
+ _pos = temTaskList.ReadData(_lpData, _pos)
+ self.TaskList.append(temTaskList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x10
+ self.TaskCount = 0
+ self.TaskList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ for i in range(self.TaskCount):
+ length += self.TaskList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.TaskCount)
+ for i in range(self.TaskCount):
+ data = CommFunc.WriteString(data, self.TaskList[i].GetLength(), self.TaskList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ TaskCount:%d,
+ TaskList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.TaskCount,
+ "..."
)
return DumpString
m_NAtagMCTaskInfo=tagMCTaskInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCTaskInfo.Cmd,m_NAtagMCTaskInfo.SubCmd))] = m_NAtagMCTaskInfo
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCTaskInfo.Head.Cmd,m_NAtagMCTaskInfo.Head.SubCmd))] = m_NAtagMCTaskInfo
#------------------------------------------------------
@@ -48233,7 +50455,8 @@
Head = tagHead()
MapID = 0 #(DWORD MapID)// 自定义地图ID，可用于绑定战斗场景功能（如野外关卡，爬塔功能，竞技场等）
FuncLineID = 0 #(WORD FuncLineID)
- PlayerID = 0 #(DWORD PlayerID)// 对应玩家ID，可为0，某些功能可能有用，如竞技场
+ TagType = 0 #(BYTE TagType)// 战斗目标类型，0-NPC，1-玩家，2-队伍
+ TagID = 0 #(DWORD TagID)// 战斗目标类型对应的ID
State = 0 #(BYTE State)// 0-起始状态标记；1-准备完毕；2-战斗中；3-战斗结束；4-结算奖励；5-结束状态标记
TurnNum = 0 #(BYTE TurnNum)// 当前轮次
TurnMax = 0 #(BYTE TurnMax)// 最大轮次
@@ -48252,7 +50475,8 @@
_pos = self.Head.ReadData(_lpData, _pos)
self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FuncLineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.PlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.TagType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.TagID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.State,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.TurnNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.TurnMax,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -48267,7 +50491,8 @@
self.Head.SubCmd = 0x20
self.MapID = 0
self.FuncLineID = 0
- self.PlayerID = 0
+ self.TagType = 0
+ self.TagID = 0
self.State = 0
self.TurnNum = 0
self.TurnMax = 0
@@ -48280,6 +50505,7 @@
length += self.Head.GetLength()
length += 4
length += 2
+ length += 1
length += 4
length += 1
length += 1
@@ -48294,7 +50520,8 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
data = CommFunc.WriteDWORD(data, self.MapID)
data = CommFunc.WriteWORD(data, self.FuncLineID)
- data = CommFunc.WriteDWORD(data, self.PlayerID)
+ data = CommFunc.WriteBYTE(data, self.TagType)
+ data = CommFunc.WriteDWORD(data, self.TagID)
data = CommFunc.WriteBYTE(data, self.State)
data = CommFunc.WriteBYTE(data, self.TurnNum)
data = CommFunc.WriteBYTE(data, self.TurnMax)
@@ -48307,7 +50534,8 @@
Head:%s,
MapID:%d,
FuncLineID:%d,
- PlayerID:%d,
+ TagType:%d,
+ TagID:%d,
State:%d,
TurnNum:%d,
TurnMax:%d,
@@ -48318,7 +50546,8 @@
self.Head.OutputString(),
self.MapID,
self.FuncLineID,
- self.PlayerID,
+ self.TagType,
+ self.TagID,
self.State,
self.TurnNum,
self.TurnMax,
--
Gitblit v1.8.0