From bc9e2ca58aa69066ddf2e44f6d7cc81836a84445 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 十二月 2024 15:33:25 +0800
Subject: [PATCH] 10297 【越南】【英语】【砍树】【tqxbqy】轮回殿-服务端（奖励类型增加类型3 - 消耗物品，目前支持坐骑经验丹、灵宠经验丹）
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 317 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 280 insertions(+), 37 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 05df523..427682f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -4708,7 +4708,7 @@
ID = 0 #(DWORD ID)
ID2 = 0 #(DWORD ID2)
Name1 = "" #(char Name1[33])//名字1，用来显示排序对象名字
- Name2 = "" #(char Name2[33])//名字2
+ Name2 = "" #(char Name2[65])//名字2
Type2 = 0 #(BYTE Type2)//附加类型，用来表示排序对象的类型，比如，玩家所属职业门派，宠物类型等
Value1 = 0 #(DWORD Value1)//排序依赖的值，比如，等级
Value2 = 0 #(DWORD Value2)//排序依赖的值，比如，战斗力
@@ -4735,7 +4735,7 @@
self.ID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.ID2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Name1,_pos = CommFunc.ReadString(_lpData, _pos,33)
- self.Name2,_pos = CommFunc.ReadString(_lpData, _pos,33)
+ self.Name2,_pos = CommFunc.ReadString(_lpData, _pos,65)
self.Type2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Value2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
@@ -4780,7 +4780,7 @@
length += 4
length += 4
length += 33
- length += 33
+ length += 65
length += 1
length += 4
length += 4
@@ -4804,7 +4804,7 @@
data = CommFunc.WriteDWORD(data, self.ID)
data = CommFunc.WriteDWORD(data, self.ID2)
data = CommFunc.WriteString(data, 33, self.Name1)
- data = CommFunc.WriteString(data, 33, self.Name2)
+ data = CommFunc.WriteString(data, 65, self.Name2)
data = CommFunc.WriteBYTE(data, self.Type2)
data = CommFunc.WriteDWORD(data, self.Value1)
data = CommFunc.WriteDWORD(data, self.Value2)
@@ -16851,7 +16851,7 @@
ID = 0 #(DWORD ID)
ID2 = 0 #(DWORD ID2)
Name1 = "" #(char Name1[33])//名字1，用来显示排序对象名字
- Name2 = "" #(char Name2[33])//名字2
+ Name2 = "" #(char Name2[65])//名字2
Type2 = 0 #(BYTE Type2)//附加类型，用来表示排序对象的类型，比如，玩家所属职业门派，宠物类型等
Value1 = 0 #(DWORD Value1)//自定义值1
Value2 = 0 #(DWORD Value2)//自定义值2
@@ -16878,7 +16878,7 @@
self.ID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.ID2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Name1,_pos = CommFunc.ReadString(_lpData, _pos,33)
- self.Name2,_pos = CommFunc.ReadString(_lpData, _pos,33)
+ self.Name2,_pos = CommFunc.ReadString(_lpData, _pos,65)
self.Type2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Value2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
@@ -16923,7 +16923,7 @@
length += 4
length += 4
length += 33
- length += 33
+ length += 65
length += 1
length += 4
length += 4
@@ -16947,7 +16947,7 @@
data = CommFunc.WriteDWORD(data, self.ID)
data = CommFunc.WriteDWORD(data, self.ID2)
data = CommFunc.WriteString(data, 33, self.Name1)
- data = CommFunc.WriteString(data, 33, self.Name2)
+ data = CommFunc.WriteString(data, 65, self.Name2)
data = CommFunc.WriteBYTE(data, self.Type2)
data = CommFunc.WriteDWORD(data, self.Value1)
data = CommFunc.WriteDWORD(data, self.Value2)
@@ -33062,6 +33062,218 @@
#------------------------------------------------------
+# A8 01 获得奖励信息 #tagMCGiveAwardInfo
+
+class tagMCGiveAwardMoney(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(tagMCGiveAwardMoney)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A8 01 获得奖励信息 //tagMCGiveAwardInfo:
+ MoneyType:%d,
+ MoneyValue:%d
+ '''\
+ %(
+ self.MoneyType,
+ self.MoneyValue
+ )
+ return DumpString
+
+
+class tagMCGiveAwardItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("ItemID", c_int),
+ ("Count", c_int),
+ ("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.Count = 0
+ self.IsBind = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCGiveAwardItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A8 01 获得奖励信息 //tagMCGiveAwardInfo:
+ ItemID:%d,
+ Count:%d,
+ IsBind:%d
+ '''\
+ %(
+ self.ItemID,
+ self.Count,
+ self.IsBind
+ )
+ return DumpString
+
+
+class tagMCGiveAwardInfo(Structure):
+ Head = tagHead()
+ EventLen = 0 #(BYTE EventLen)
+ EventName = "" #(String EventName)
+ Exp = 0 #(DWORD Exp)// 奖励经验，求余亿部分
+ ExpPoint = 0 #(DWORD ExpPoint)// 奖励经验，整除亿部分
+ MoneyLen = 0 #(BYTE MoneyLen)
+ MoneyList = list() #(vector<tagMCGiveAwardMoney> MoneyList)// 奖励货币
+ ItemLen = 0 #(BYTE ItemLen)
+ ItemList = list() #(vector<tagMCGiveAwardItem> ItemList)// 奖励物品
+ DataLen = 0 #(WORD DataLen)
+ DataEx = "" #(String DataEx)// 扩展信息，可由不同的Event自定义信息内容
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xA8
+ self.Head.SubCmd = 0x01
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.EventLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.EventName,_pos = CommFunc.ReadString(_lpData, _pos,self.EventLen)
+ 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 = tagMCGiveAwardMoney()
+ _pos = temMoneyList.ReadData(_lpData, _pos)
+ self.MoneyList.append(temMoneyList)
+ self.ItemLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.ItemLen):
+ temItemList = tagMCGiveAwardItem()
+ _pos = temItemList.ReadData(_lpData, _pos)
+ self.ItemList.append(temItemList)
+ self.DataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.DataEx,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xA8
+ self.Head.SubCmd = 0x01
+ self.EventLen = 0
+ self.EventName = ""
+ self.Exp = 0
+ self.ExpPoint = 0
+ self.MoneyLen = 0
+ self.MoneyList = list()
+ self.ItemLen = 0
+ self.ItemList = list()
+ self.DataLen = 0
+ self.DataEx = ""
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += len(self.EventName)
+ 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()
+ length += 2
+ length += len(self.DataEx)
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.EventLen)
+ data = CommFunc.WriteString(data, self.EventLen, self.EventName)
+ 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())
+ data = CommFunc.WriteWORD(data, self.DataLen)
+ data = CommFunc.WriteString(data, self.DataLen, self.DataEx)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ EventLen:%d,
+ EventName:%s,
+ Exp:%d,
+ ExpPoint:%d,
+ MoneyLen:%d,
+ MoneyList:%s,
+ ItemLen:%d,
+ ItemList:%s,
+ DataLen:%d,
+ DataEx:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.EventLen,
+ self.EventName,
+ self.Exp,
+ self.ExpPoint,
+ self.MoneyLen,
+ "...",
+ self.ItemLen,
+ "...",
+ self.DataLen,
+ self.DataEx
+ )
+ return DumpString
+
+
+m_NAtagMCGiveAwardInfo=tagMCGiveAwardInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGiveAwardInfo.Head.Cmd,m_NAtagMCGiveAwardInfo.Head.SubCmd))] = m_NAtagMCGiveAwardInfo
+
+
+#------------------------------------------------------
# A8 12 守护成功拾取物品 #tagMCGuradPickupItemSucc
class tagMCGuradPickupItemSucc(Structure):
@@ -38468,6 +38680,9 @@
RoundMax = 0 #(BYTE RoundMax)// 最大可循环轮次
AwardCount = 0 #(BYTE AwardCount)
AwardList = list() #(vector<tagMCActLunhuidianAward> AwardList)// 每轮奖励列表
+ CTGIDCount = 0 #(BYTE CTGIDCount)
+ CTGIDList = list() #(vector<WORD> CTGIDList)// CTGID列表
+ ShopType = 0 #(WORD ShopType)// 开放商店类型，可能为0不开放
data = None
def __init__(self):
@@ -38485,6 +38700,11 @@
temAwardList = tagMCActLunhuidianAward()
_pos = temAwardList.ReadData(_lpData, _pos)
self.AwardList.append(temAwardList)
+ self.CTGIDCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.CTGIDCount):
+ value,_pos=CommFunc.ReadWORD(_lpData,_pos)
+ self.CTGIDList.append(value)
+ self.ShopType,_pos = CommFunc.ReadWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -38494,6 +38714,9 @@
self.RoundMax = 0
self.AwardCount = 0
self.AwardList = list()
+ self.CTGIDCount = 0
+ self.CTGIDList = list()
+ self.ShopType = 0
return
def GetLength(self):
@@ -38505,6 +38728,9 @@
length += 1
for i in range(self.AwardCount):
length += self.AwardList[i].GetLength()
+ length += 1
+ length += 2 * self.CTGIDCount
+ length += 2
return length
@@ -38517,6 +38743,10 @@
data = CommFunc.WriteBYTE(data, self.AwardCount)
for i in range(self.AwardCount):
data = CommFunc.WriteString(data, self.AwardList[i].GetLength(), self.AwardList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.CTGIDCount)
+ for i in range(self.CTGIDCount):
+ data = CommFunc.WriteWORD(data, self.CTGIDList[i])
+ data = CommFunc.WriteWORD(data, self.ShopType)
return data
def OutputString(self):
@@ -38526,7 +38756,10 @@
AwardTypeValue:%d,
RoundMax:%d,
AwardCount:%d,
- AwardList:%s
+ AwardList:%s,
+ CTGIDCount:%d,
+ CTGIDList:%s,
+ ShopType:%d
'''\
%(
self.RoundType,
@@ -38534,7 +38767,10 @@
self.AwardTypeValue,
self.RoundMax,
self.AwardCount,
- "..."
+ "...",
+ self.CTGIDCount,
+ "...",
+ self.ShopType
)
return DumpString
@@ -48549,11 +48785,11 @@
#------------------------------------------------------
# AA 05 推金币信息 #tagMCTuijinbiInfo
-class tagMCTuijinbiMoney(Structure):
+class tagMCTuijinbiPool(Structure):
_pack_ = 1
_fields_ = [
- ("MoneyType", c_ubyte),
- ("MoneyValue", c_int),
+ ("PrizeType", c_ubyte), # 台面奖励类型： 1-金币；2-仙玉币
+ ("PrizeCount", c_int), # 数量，每次都同步台面的总数量
]
def __init__(self):
@@ -48566,32 +48802,33 @@
return _pos + self.GetLength()
def Clear(self):
- self.MoneyType = 0
- self.MoneyValue = 0
+ self.PrizeType = 0
+ self.PrizeCount = 0
return
def GetLength(self):
- return sizeof(tagMCTuijinbiMoney)
+ return sizeof(tagMCTuijinbiPool)
def GetBuffer(self):
return string_at(addressof(self), self.GetLength())
def OutputString(self):
DumpString = '''// AA 05 推金币信息 //tagMCTuijinbiInfo:
- MoneyType:%d,
- MoneyValue:%d
+ PrizeType:%d,
+ PrizeCount:%d
'''\
%(
- self.MoneyType,
- self.MoneyValue
+ self.PrizeType,
+ self.PrizeCount
)
return DumpString
class tagMCTuijinbiInfo(Structure):
Head = tagHead()
- AwardMoneyCount = 0 #(BYTE AwardMoneyCount)
- AwardMoneyList = list() #(vector<tagMCTuijinbiMoney> AwardMoneyList)// 累计获得货币信息列表
+ DrawNum = 0 #(BYTE DrawNum)// 本次抽中位置，为0时表示非抽奖同步
+ PoolPrizeCnt = 0 #(BYTE PoolPrizeCnt)
+ PoolPrizeList = list() #(vector<tagMCTuijinbiPool> PoolPrizeList)// 台面奖池信息列表，每次都完整通知
data = None
def __init__(self):
@@ -48603,11 +48840,12 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.AwardMoneyCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.AwardMoneyCount):
- temAwardMoneyList = tagMCTuijinbiMoney()
- _pos = temAwardMoneyList.ReadData(_lpData, _pos)
- self.AwardMoneyList.append(temAwardMoneyList)
+ self.DrawNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.PoolPrizeCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.PoolPrizeCnt):
+ temPoolPrizeList = tagMCTuijinbiPool()
+ _pos = temPoolPrizeList.ReadData(_lpData, _pos)
+ self.PoolPrizeList.append(temPoolPrizeList)
return _pos
def Clear(self):
@@ -48615,36 +48853,41 @@
self.Head.Clear()
self.Head.Cmd = 0xAA
self.Head.SubCmd = 0x05
- self.AwardMoneyCount = 0
- self.AwardMoneyList = list()
+ self.DrawNum = 0
+ self.PoolPrizeCnt = 0
+ self.PoolPrizeList = list()
return
def GetLength(self):
length = 0
length += self.Head.GetLength()
length += 1
- for i in range(self.AwardMoneyCount):
- length += self.AwardMoneyList[i].GetLength()
+ length += 1
+ for i in range(self.PoolPrizeCnt):
+ length += self.PoolPrizeList[i].GetLength()
return length
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.AwardMoneyCount)
- for i in range(self.AwardMoneyCount):
- data = CommFunc.WriteString(data, self.AwardMoneyList[i].GetLength(), self.AwardMoneyList[i].GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.DrawNum)
+ data = CommFunc.WriteBYTE(data, self.PoolPrizeCnt)
+ for i in range(self.PoolPrizeCnt):
+ data = CommFunc.WriteString(data, self.PoolPrizeList[i].GetLength(), self.PoolPrizeList[i].GetBuffer())
return data
def OutputString(self):
DumpString = '''
Head:%s,
- AwardMoneyCount:%d,
- AwardMoneyList:%s
+ DrawNum:%d,
+ PoolPrizeCnt:%d,
+ PoolPrizeList:%s
'''\
%(
self.Head.OutputString(),
- self.AwardMoneyCount,
+ self.DrawNum,
+ self.PoolPrizeCnt,
"..."
)
return DumpString
--
Gitblit v1.8.0