From ddd5e4a4849951f0b64de317d4fa01a5042d863f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 24 二月 2021 11:56:45 +0800
Subject: [PATCH] 8716 【主干】【后端】【BT2】H.活动-节日祈愿（游历活动封包AA46数值类型修改；集字封包AA40兑换次数数值类型修改）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 20 ++++++++++----------
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 20 ++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 51c31cb..2ee8ecf 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -24179,7 +24179,7 @@
class tagMCActCollectWordsExchangeItem(Structure):
ExchangeNum = 0 #(BYTE ExchangeNum)//兑换编号
- ExchangeCountMax = 0 #(BYTE ExchangeCountMax)//最大兑换次数，0不限制
+ ExchangeCountMax = 0 #(WORD ExchangeCountMax)//最大兑换次数，0不限制
ItemID = 0 #(DWORD ItemID)//目标物品
ItemCount = 0 #(WORD ItemCount)
IsBind = 0 #(BYTE IsBind)
@@ -24194,7 +24194,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
self.ExchangeNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.ExchangeCountMax,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.ExchangeCountMax,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.ItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.ItemCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.IsBind,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -24218,7 +24218,7 @@
def GetLength(self):
length = 0
length += 1
- length += 1
+ length += 2
length += 4
length += 2
length += 1
@@ -24231,7 +24231,7 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteBYTE(data, self.ExchangeNum)
- data = CommFunc.WriteBYTE(data, self.ExchangeCountMax)
+ data = CommFunc.WriteWORD(data, self.ExchangeCountMax)
data = CommFunc.WriteDWORD(data, self.ItemID)
data = CommFunc.WriteWORD(data, self.ItemCount)
data = CommFunc.WriteBYTE(data, self.IsBind)
@@ -27530,7 +27530,7 @@
class tagMCFeastTravelAward(Structure):
AwardIndex = 0 #(BYTE AwardIndex)//游历奖励索引
NeedTravelPoint = 0 #(WORD NeedTravelPoint)//单次领奖所需游历值
- AwardCountMax = 0 #(BYTE AwardCountMax)//最大可领取次数，0代表不限
+ AwardCountMax = 0 #(WORD AwardCountMax)//最大可领取次数，0代表不限
AwardItemCount = 0 #(BYTE AwardItemCount)//奖励物品数
AwardItemList = list() #(vector<tagMCFeastTravelAwardItem> AwardItemList)//奖励物品列表
data = None
@@ -27543,7 +27543,7 @@
self.Clear()
self.AwardIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.NeedTravelPoint,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.AwardCountMax,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.AwardCountMax,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.AwardItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.AwardItemCount):
temAwardItemList = tagMCFeastTravelAwardItem()
@@ -27563,7 +27563,7 @@
length = 0
length += 1
length += 2
- length += 1
+ length += 2
length += 1
for i in range(self.AwardItemCount):
length += self.AwardItemList[i].GetLength()
@@ -27574,7 +27574,7 @@
data = ''
data = CommFunc.WriteBYTE(data, self.AwardIndex)
data = CommFunc.WriteWORD(data, self.NeedTravelPoint)
- data = CommFunc.WriteBYTE(data, self.AwardCountMax)
+ data = CommFunc.WriteWORD(data, self.AwardCountMax)
data = CommFunc.WriteBYTE(data, self.AwardItemCount)
for i in range(self.AwardItemCount):
data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
@@ -27603,8 +27603,8 @@
_fields_ = [
("TravelTaskID", c_ubyte), #游历任务ID
("FinishNeedValue", c_ushort), #单次完成所需进度
- ("FinishTimeMax", c_ubyte), #最大可完成次数，0代表不限
- ("AddTravelPoint", c_ubyte), #单次完成获得游历值
+ ("FinishTimeMax", c_ushort), #最大可完成次数，0代表不限
+ ("AddTravelPoint", c_ushort), #单次完成获得游历值
]
def __init__(self):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 51c31cb..2ee8ecf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -24179,7 +24179,7 @@
class tagMCActCollectWordsExchangeItem(Structure):
ExchangeNum = 0 #(BYTE ExchangeNum)//兑换编号
- ExchangeCountMax = 0 #(BYTE ExchangeCountMax)//最大兑换次数，0不限制
+ ExchangeCountMax = 0 #(WORD ExchangeCountMax)//最大兑换次数，0不限制
ItemID = 0 #(DWORD ItemID)//目标物品
ItemCount = 0 #(WORD ItemCount)
IsBind = 0 #(BYTE IsBind)
@@ -24194,7 +24194,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
self.ExchangeNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.ExchangeCountMax,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.ExchangeCountMax,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.ItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.ItemCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.IsBind,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -24218,7 +24218,7 @@
def GetLength(self):
length = 0
length += 1
- length += 1
+ length += 2
length += 4
length += 2
length += 1
@@ -24231,7 +24231,7 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteBYTE(data, self.ExchangeNum)
- data = CommFunc.WriteBYTE(data, self.ExchangeCountMax)
+ data = CommFunc.WriteWORD(data, self.ExchangeCountMax)
data = CommFunc.WriteDWORD(data, self.ItemID)
data = CommFunc.WriteWORD(data, self.ItemCount)
data = CommFunc.WriteBYTE(data, self.IsBind)
@@ -27530,7 +27530,7 @@
class tagMCFeastTravelAward(Structure):
AwardIndex = 0 #(BYTE AwardIndex)//游历奖励索引
NeedTravelPoint = 0 #(WORD NeedTravelPoint)//单次领奖所需游历值
- AwardCountMax = 0 #(BYTE AwardCountMax)//最大可领取次数，0代表不限
+ AwardCountMax = 0 #(WORD AwardCountMax)//最大可领取次数，0代表不限
AwardItemCount = 0 #(BYTE AwardItemCount)//奖励物品数
AwardItemList = list() #(vector<tagMCFeastTravelAwardItem> AwardItemList)//奖励物品列表
data = None
@@ -27543,7 +27543,7 @@
self.Clear()
self.AwardIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.NeedTravelPoint,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.AwardCountMax,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.AwardCountMax,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.AwardItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.AwardItemCount):
temAwardItemList = tagMCFeastTravelAwardItem()
@@ -27563,7 +27563,7 @@
length = 0
length += 1
length += 2
- length += 1
+ length += 2
length += 1
for i in range(self.AwardItemCount):
length += self.AwardItemList[i].GetLength()
@@ -27574,7 +27574,7 @@
data = ''
data = CommFunc.WriteBYTE(data, self.AwardIndex)
data = CommFunc.WriteWORD(data, self.NeedTravelPoint)
- data = CommFunc.WriteBYTE(data, self.AwardCountMax)
+ data = CommFunc.WriteWORD(data, self.AwardCountMax)
data = CommFunc.WriteBYTE(data, self.AwardItemCount)
for i in range(self.AwardItemCount):
data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
@@ -27603,8 +27603,8 @@
_fields_ = [
("TravelTaskID", c_ubyte), #游历任务ID
("FinishNeedValue", c_ushort), #单次完成所需进度
- ("FinishTimeMax", c_ubyte), #最大可完成次数，0代表不限
- ("AddTravelPoint", c_ubyte), #单次完成获得游历值
+ ("FinishTimeMax", c_ushort), #最大可完成次数，0代表不限
+ ("AddTravelPoint", c_ushort), #单次完成获得游历值
]
def __init__(self):
--
Gitblit v1.8.0