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 | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 29 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 6d0ddc0..427682f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -38680,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):
@@ -38697,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):
@@ -38706,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):
@@ -38717,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
@@ -38729,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):
@@ -38738,7 +38756,10 @@
AwardTypeValue:%d,
RoundMax:%d,
AwardCount:%d,
- AwardList:%s
+ AwardList:%s,
+ CTGIDCount:%d,
+ CTGIDList:%s,
+ ShopType:%d
'''\
%(
self.RoundType,
@@ -38746,7 +38767,10 @@
self.AwardTypeValue,
self.RoundMax,
self.AwardCount,
- "..."
+ "...",
+ self.CTGIDCount,
+ "...",
+ self.ShopType
)
return DumpString
@@ -48761,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):
@@ -48778,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):
@@ -48815,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):
@@ -48827,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