From ba6246e20891cc2ace714653818c5b79ace56b01 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 三月 2021 15:00:35 +0800
Subject: [PATCH] 8848 【主干】【BT2】【后端】所有活动中，不能配置活动开启等级的，补充该配置(每日礼包AA25、充值返利AA27、累计充值返利仙玉AA29、成长必买AA31、节日登录AA42、节日祝福AA43、节日游历AA46 同步冲突);
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 78 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index ed0706d..0b88bbe 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -829,7 +829,7 @@
Head = tagHead()
Type = 0 #(BYTE Type)//类型
Count = 0 #(WORD Count)//数量
- UniversalGameRec = list() #(vector<tagUniversalGameRec> UniversalGameRec)///size = Count
+ UniversalGameRec = list() #(vector<tagUniversalGameRec> UniversalGameRec)///size = Count
data = None
def __init__(self):
@@ -1133,7 +1133,7 @@
FamilyID = 0 #(DWORD FamilyID)//家族ID
ActionType = 0 #(BYTE ActionType)//类型
Count = 0 #(WORD Count)//数量
- FamilyActionList = list() #(vector<tagGCFamilyAction> FamilyActionList)//size = Count
+ FamilyActionList = list() #(vector<tagGCFamilyAction> FamilyActionList)//size = Count
data = None
def __init__(self):
@@ -3352,8 +3352,8 @@
IsAlive = 0 #(BYTE IsAlive)// 是否存活
RecordLen = 0 #(WORD RecordLen)// 长度
KillRecord = "" #(String KillRecord)// 最近击杀记录时间玩家名size = RecordLen
- RefreshSecond = 0 #(DWORD RefreshSecond)// 刷新倒计时, 秒
- RefreshCD = 0 #(DWORD RefreshCD)// 刷新总CD时, 秒
+ RefreshSecond = 0 #(DWORD RefreshSecond)// 刷新倒计时, 秒
+ RefreshCD = 0 #(DWORD RefreshCD)// 刷新总CD时, 秒
data = None
def __init__(self):
@@ -4318,7 +4318,7 @@
Count = 0 #(DWORD Count)//数量
IsBind = 0 #(BYTE IsBind)//是否绑定
UserDataLen = 0 #(DWORD UserDataLen)
- UserData = "" #(String UserData)//自定义数据
+ UserData = "" #(String UserData)//自定义数据
data = None
def __init__(self):
@@ -4559,7 +4559,7 @@
Name = "" #(char Name[33])
LV = 0 #(DWORD LV)//等级
Job = 0 #(BYTE Job)
- RealmLV = 0 #(WORD RealmLV)//境界
+ RealmLV = 0 #(WORD RealmLV)//境界
data = None
def __init__(self):
@@ -6650,7 +6650,7 @@
class tagFamilyArrestOverStateInfo(Structure):
Head = tagHead()
Count = 0 #(WORD Count)
- ArrestOverStateInfo = list() #(vector<tagFamilyArrestOverState> ArrestOverStateInfo)///size = Count
+ ArrestOverStateInfo = list() #(vector<tagFamilyArrestOverState> ArrestOverStateInfo)///size = Count
data = None
def __init__(self):
@@ -7717,7 +7717,7 @@
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
("PlayerID", c_int),
- ("RefreshType", c_ubyte), #参考CDBPlayerRefresh__
+ ("RefreshType", c_ubyte), #参考CDBPlayerRefresh__
("Value", c_int),
]
@@ -7773,7 +7773,7 @@
class tagGCVoiceChat(Structure):
Head = tagHead()
- ChannelType = 0 #(BYTE ChannelType)// 1 世界 2 仙盟 3 私聊(好友) 4 队伍 5 区域
+ ChannelType = 0 #(BYTE ChannelType)// 1 世界 2 仙盟 3 私聊(好友) 4 队伍 5 区域
SrcNameLen = 0 #(BYTE SrcNameLen)
SrcName = "" #(String SrcName)//size = SrcNameLen
PlayerID = 0 #(DWORD PlayerID)
@@ -9513,7 +9513,7 @@
ItemGUID = "" #(char ItemGUID[40])
AuctionType = 0 #(BYTE AuctionType)//拍品类型，0-全服拍品，1-仙盟拍品
AddTime = "" #(char AddTime[19])//上架时间
- BidderID = 0 #(DWORD BidderID)//最高竞拍玩家ID，也就是当前最高竞价玩家ID
+ BidderID = 0 #(DWORD BidderID)//最高竞拍玩家ID，也就是当前最高竞价玩家ID
BidderPrice = 0 #(DWORD BidderPrice)//最高竞拍价格
BiddingTime = "" #(char BiddingTime[19])//竞价时间 yyyy-MM-dd hh:mm:ss
data = None
@@ -11379,8 +11379,8 @@
class tagGCCrossRealmPKBillboardInfo(Structure):
Head = tagHead()
- ZoneID = 0 #(BYTE ZoneID)// 赛区ID
- SeasonID = 0 #(BYTE SeasonID)// 赛季ID
+ ZoneID = 0 #(BYTE ZoneID)// 赛区ID
+ SeasonID = 0 #(BYTE SeasonID)// 赛季ID
Count = 0 #(WORD Count)
PKBillboardList = list() #(vector<tagGCCrossRealmPKBillboardData> PKBillboardList)
data = None
@@ -12397,7 +12397,7 @@
BackpackLV = 0 #(BYTE BackpackLV)//背包等级
WarehouseLV = 0 #(BYTE WarehouseLV)//仓库等级
TeamID = 0 #(DWORD TeamID)//队伍ID
- UseGoldType = 0 #(BYTE UseGoldType)//默认用金子/金票 类型为MoneyType
+ UseGoldType = 0 #(BYTE UseGoldType)//默认用金子/金票 类型为MoneyType
UseSilverType = 0 #(BYTE UseSilverType)//默认用的银子/银票
AttackMode = 0 #(BYTE AttackMode)//攻击模式
LastWeekOnlineTime = 0 #(DWORD LastWeekOnlineTime)//上周在线时间
@@ -15591,7 +15591,7 @@
class tagMCEquipPartXLAttr(Structure):
- EquipPlace = 0 #(BYTE EquipPlace)// 装备位
+ EquipPlace = 0 #(BYTE EquipPlace)// 装备位
XLAttrLV = 0 #(BYTE XLAttrLV)// 洗练等级
XLAttrCnt = 0 #(BYTE XLAttrCnt)// 属性条数
XLAttrList = list() #(vector<tagMCEquipPartXLAttrValue> XLAttrList)// 属性列表,索引0的代表属性1,依次递增
@@ -18169,7 +18169,7 @@
_fields_ = [
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
- ("Record", c_ubyte), #0-未领取 1-已领取
+ ("Record", c_ubyte), #0-未领取 1-已领取
]
def __init__(self):
@@ -22810,7 +22810,7 @@
PlayerID = 0 #(DWORD PlayerID)//玩家ID
EquipClassLV = 0 #(BYTE EquipClassLV)
ItemDataSize = 0 #(WORD ItemDataSize)
- ItemData = "" #(String ItemData)//物品记录
+ ItemData = "" #(String ItemData)//物品记录
data = None
def __init__(self):
@@ -23109,7 +23109,7 @@
ItemDataSize = 0 #(DWORD ItemDataSize)
ItemData = "" #(String ItemData)//物品记录
PlusDataSize = 0 #(DWORD PlusDataSize)
- PlusData = "" #(String PlusData)//扩展记录
+ PlusData = "" #(String PlusData)//扩展记录
data = None
def __init__(self):
@@ -23606,7 +23606,7 @@
_fields_ = [
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
- ("MakeType", c_ubyte), #类型 TMakeItemType
+ ("MakeType", c_ubyte), #类型 TMakeItemType
("Result", c_ubyte), #是否成功
("MakeItemID", c_int), #合成的物品ID
]
@@ -24733,6 +24733,7 @@
Head = tagHead()
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
GroupCount = 0 #(BYTE GroupCount)// 循环购买礼包组数
GroupList = list() #(vector<tagMCActGrowupBuyGroup> GroupList)//循环购买礼包组列表
data = None
@@ -24748,6 +24749,7 @@
_pos = self.Head.ReadData(_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.GroupCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GroupCount):
temGroupList = tagMCActGrowupBuyGroup()
@@ -24762,6 +24764,7 @@
self.Head.SubCmd = 0x31
self.StartDate = ""
self.EndtDate = ""
+ self.LimitLV = 0
self.GroupCount = 0
self.GroupList = list()
return
@@ -24771,6 +24774,7 @@
length += self.Head.GetLength()
length += 10
length += 10
+ length += 2
length += 1
for i in range(self.GroupCount):
length += self.GroupList[i].GetLength()
@@ -24782,6 +24786,7 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
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.GroupCount)
for i in range(self.GroupCount):
data = CommFunc.WriteString(data, self.GroupList[i].GetLength(), self.GroupList[i].GetBuffer())
@@ -24792,6 +24797,7 @@
Head:%s,
StartDate:%s,
EndtDate:%s,
+ LimitLV:%d,
GroupCount:%d,
GroupList:%s
'''\
@@ -24799,6 +24805,7 @@
self.Head.OutputString(),
self.StartDate,
self.EndtDate,
+ self.LimitLV,
self.GroupCount,
"..."
)
@@ -25336,6 +25343,7 @@
Head = tagHead()
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
IsDayReset = 0 #(BYTE IsDayReset)//是否每天重置
PrizeDays = 0 #(BYTE PrizeDays)
PrizeDayInfo = list() #(vector<tagMCActRechargePrizeDay> PrizeDayInfo)//每天对应信息; 如果只有一天，但是活动有多天，则代表每天奖励都一样
@@ -25352,6 +25360,7 @@
_pos = self.Head.ReadData(_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.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.PrizeDays,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.PrizeDays):
@@ -25367,6 +25376,7 @@
self.Head.SubCmd = 0x27
self.StartDate = ""
self.EndtDate = ""
+ self.LimitLV = 0
self.IsDayReset = 0
self.PrizeDays = 0
self.PrizeDayInfo = list()
@@ -25377,6 +25387,7 @@
length += self.Head.GetLength()
length += 10
length += 10
+ length += 2
length += 1
length += 1
for i in range(self.PrizeDays):
@@ -25389,6 +25400,7 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
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.IsDayReset)
data = CommFunc.WriteBYTE(data, self.PrizeDays)
for i in range(self.PrizeDays):
@@ -25400,6 +25412,7 @@
Head:%s,
StartDate:%s,
EndtDate:%s,
+ LimitLV:%d,
IsDayReset:%d,
PrizeDays:%d,
PrizeDayInfo:%s
@@ -25408,6 +25421,7 @@
self.Head.OutputString(),
self.StartDate,
self.EndtDate,
+ self.LimitLV,
self.IsDayReset,
self.PrizeDays,
"..."
@@ -27120,6 +27134,7 @@
class tagMCDailyGiftbagInfo(Structure):
Head = tagHead()
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
GiftbagCount = 0 #(BYTE GiftbagCount)// 礼包数
GiftbagInfo = list() #(vector<tagMCDailyGiftbag> GiftbagInfo)// 礼包信息
data = None
@@ -27133,6 +27148,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
+ self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.GiftbagCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GiftbagCount):
temGiftbagInfo = tagMCDailyGiftbag()
@@ -27145,6 +27161,7 @@
self.Head.Clear()
self.Head.Cmd = 0xAA
self.Head.SubCmd = 0x25
+ self.LimitLV = 0
self.GiftbagCount = 0
self.GiftbagInfo = list()
return
@@ -27152,6 +27169,7 @@
def GetLength(self):
length = 0
length += self.Head.GetLength()
+ length += 2
length += 1
for i in range(self.GiftbagCount):
length += self.GiftbagInfo[i].GetLength()
@@ -27161,6 +27179,7 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteWORD(data, self.LimitLV)
data = CommFunc.WriteBYTE(data, self.GiftbagCount)
for i in range(self.GiftbagCount):
data = CommFunc.WriteString(data, self.GiftbagInfo[i].GetLength(), self.GiftbagInfo[i].GetBuffer())
@@ -27169,11 +27188,13 @@
def OutputString(self):
DumpString = '''
Head:%s,
+ LimitLV:%d,
GiftbagCount:%d,
GiftbagInfo:%s
'''\
%(
self.Head.OutputString(),
+ self.LimitLV,
self.GiftbagCount,
"..."
)
@@ -27451,6 +27472,7 @@
Head = tagHead()
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
DayCount = 0 #(BYTE DayCount)// 总共几天
DayAwardList = list() #(vector<tagMCFeastLoginDayAward> DayAwardList)//登录天奖励列表
data = None
@@ -27466,6 +27488,7 @@
_pos = self.Head.ReadData(_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.DayCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.DayCount):
temDayAwardList = tagMCFeastLoginDayAward()
@@ -27480,6 +27503,7 @@
self.Head.SubCmd = 0x42
self.StartDate = ""
self.EndtDate = ""
+ self.LimitLV = 0
self.DayCount = 0
self.DayAwardList = list()
return
@@ -27489,6 +27513,7 @@
length += self.Head.GetLength()
length += 10
length += 10
+ length += 2
length += 1
for i in range(self.DayCount):
length += self.DayAwardList[i].GetLength()
@@ -27500,6 +27525,7 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
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.DayCount)
for i in range(self.DayCount):
data = CommFunc.WriteString(data, self.DayAwardList[i].GetLength(), self.DayAwardList[i].GetBuffer())
@@ -27510,6 +27536,7 @@
Head:%s,
StartDate:%s,
EndtDate:%s,
+ LimitLV:%d,
DayCount:%d,
DayAwardList:%s
'''\
@@ -27517,6 +27544,7 @@
self.Head.OutputString(),
self.StartDate,
self.EndtDate,
+ self.LimitLV,
self.DayCount,
"..."
)
@@ -27751,6 +27779,7 @@
Head = tagHead()
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点开，5点重置；2-5点开，0点重置
TravelTaskCount = 0 #(BYTE TravelTaskCount)// 游历任务数
TravelTaskList = list() #(vector<tagMCFeastTravelTask> TravelTaskList)//游历任务信息列表
@@ -27769,6 +27798,7 @@
_pos = self.Head.ReadData(_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.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.TravelTaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.TravelTaskCount):
@@ -27789,6 +27819,7 @@
self.Head.SubCmd = 0x46
self.StartDate = ""
self.EndtDate = ""
+ self.LimitLV = 0
self.ResetType = 0
self.TravelTaskCount = 0
self.TravelTaskList = list()
@@ -27801,6 +27832,7 @@
length += self.Head.GetLength()
length += 10
length += 10
+ length += 2
length += 1
length += 1
for i in range(self.TravelTaskCount):
@@ -27816,6 +27848,7 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
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.ResetType)
data = CommFunc.WriteBYTE(data, self.TravelTaskCount)
for i in range(self.TravelTaskCount):
@@ -27830,6 +27863,7 @@
Head:%s,
StartDate:%s,
EndtDate:%s,
+ LimitLV:%d,
ResetType:%d,
TravelTaskCount:%d,
TravelTaskList:%s,
@@ -27840,6 +27874,7 @@
self.Head.OutputString(),
self.StartDate,
self.EndtDate,
+ self.LimitLV,
self.ResetType,
self.TravelTaskCount,
"...",
@@ -28667,6 +28702,7 @@
Head = tagHead()
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ LimitLV = 0 #(WORD LimitLV)// 限制等级
ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点开，5点重置；2-5点开，0点重置
WishPoolShowCount = 0 #(BYTE WishPoolShowCount)//祝福池展示物品数
WishPoolShowItemList = list() #(vector<DWORD> WishPoolShowItemList)//祝福池展示物品ID列表
@@ -28685,6 +28721,7 @@
_pos = self.Head.ReadData(_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.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.WishPoolShowCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.WishPoolShowCount):
@@ -28704,6 +28741,7 @@
self.Head.SubCmd = 0x43
self.StartDate = ""
self.EndtDate = ""
+ self.LimitLV = 0
self.ResetType = 0
self.WishPoolShowCount = 0
self.WishPoolShowItemList = list()
@@ -28716,6 +28754,7 @@
length += self.Head.GetLength()
length += 10
length += 10
+ length += 2
length += 1
length += 1
length += 4 * self.WishPoolShowCount
@@ -28730,6 +28769,7 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
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.ResetType)
data = CommFunc.WriteBYTE(data, self.WishPoolShowCount)
for i in range(self.WishPoolShowCount):
@@ -28744,6 +28784,7 @@
Head:%s,
StartDate:%s,
EndtDate:%s,
+ LimitLV:%d,
ResetType:%d,
WishPoolShowCount:%d,
WishPoolShowItemList:%s,
@@ -28754,6 +28795,7 @@
self.Head.OutputString(),
self.StartDate,
self.EndtDate,
+ self.LimitLV,
self.ResetType,
self.WishPoolShowCount,
"...",
--
Gitblit v1.8.0