From 0d0a2ff5d04a605abf0092c054ea801936d23b17 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 14 一月 2019 22:00:21 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发（跨服采集支持，采集支持配置共享采集次数）
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index f374b04..8f1f990 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -23199,7 +23199,7 @@
class tagMCWeekPartyAction(Structure):
TemplateID = 0 #(DWORD TemplateID)// 模板ID
ActionType = 0 #(WORD ActionType)// 活动类别
- TotalTimes = 0 #(BYTE TotalTimes)// 可完成的总次数，0表示不限次数
+ TotalTimes = 0 #(DWORD TotalTimes)// 可完成的总次数，0表示不限次数
SingleTimes = 0 #(DWORD SingleTimes)// 单次领奖需要的次数
Point = 0 #(DWORD Point)// 单次领奖积分
Count = 0 #(BYTE Count)// 物品数
@@ -23214,7 +23214,7 @@
self.Clear()
self.TemplateID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.ActionType,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.TotalTimes,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.TotalTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.SingleTimes,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Point,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -23238,7 +23238,7 @@
length = 0
length += 4
length += 2
- length += 1
+ length += 4
length += 4
length += 4
length += 1
@@ -23251,7 +23251,7 @@
data = ''
data = CommFunc.WriteDWORD(data, self.TemplateID)
data = CommFunc.WriteWORD(data, self.ActionType)
- data = CommFunc.WriteBYTE(data, self.TotalTimes)
+ data = CommFunc.WriteDWORD(data, self.TotalTimes)
data = CommFunc.WriteDWORD(data, self.SingleTimes)
data = CommFunc.WriteDWORD(data, self.Point)
data = CommFunc.WriteBYTE(data, self.Count)
@@ -23352,6 +23352,7 @@
Head = tagHead()
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
+ AdvanceMinutes = 0 #(WORD AdvanceMinutes)// 提前显示分钟
IsDayReset = 0 #(BYTE IsDayReset)//是否每天重置
ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
LimitLV = 0 #(WORD LimitLV)// 限制等级
@@ -23372,6 +23373,7 @@
_pos = self.Head.ReadData(_lpData, _pos)
self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.AdvanceMinutes,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
@@ -23394,6 +23396,7 @@
self.Head.SubCmd = 0x0A
self.StartDate = ""
self.EndtDate = ""
+ self.AdvanceMinutes = 0
self.IsDayReset = 0
self.ResetType = 0
self.LimitLV = 0
@@ -23408,6 +23411,7 @@
length += self.Head.GetLength()
length += 10
length += 10
+ length += 2
length += 1
length += 1
length += 2
@@ -23425,6 +23429,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.AdvanceMinutes)
data = CommFunc.WriteBYTE(data, self.IsDayReset)
data = CommFunc.WriteBYTE(data, self.ResetType)
data = CommFunc.WriteWORD(data, self.LimitLV)
@@ -23441,6 +23446,7 @@
Head:%s,
StartDate:%s,
EndtDate:%s,
+ AdvanceMinutes:%d,
IsDayReset:%d,
ResetType:%d,
LimitLV:%d,
@@ -23453,6 +23459,7 @@
self.Head.OutputString(),
self.StartDate,
self.EndtDate,
+ self.AdvanceMinutes,
self.IsDayReset,
self.ResetType,
self.LimitLV,
@@ -23474,7 +23481,7 @@
class tagMCWeekPartyTaskInfo(Structure):
_pack_ = 1
_fields_ = [
- ("ActionType", c_ushort), # 活动类别
+ ("TemplateID", c_ushort), # 模板ID
("CurTimes", c_ushort), #已完成次数
("GotTimes", c_ushort), #已领取次数
]
@@ -23489,7 +23496,7 @@
return _pos + self.GetLength()
def Clear(self):
- self.ActionType = 0
+ self.TemplateID = 0
self.CurTimes = 0
self.GotTimes = 0
return
@@ -23502,12 +23509,12 @@
def OutputString(self):
DumpString = '''// AA 0B 周狂欢玩家活动信息 //tagMCWeekPartyPlayerInfo:
- ActionType:%d,
+ TemplateID:%d,
CurTimes:%d,
GotTimes:%d
'''\
%(
- self.ActionType,
+ self.TemplateID,
self.CurTimes,
self.GotTimes
)
@@ -23588,7 +23595,7 @@
class tagMCWeekPartyPlayerInfo(Structure):
Head = tagHead()
Count = 0 #(BYTE Count)
- DayInfoList = list() #(vector<tagMCWeekPartyDayInfo> DayInfoList)//活动完成次数信息
+ DayInfoList = list() #(vector<tagMCWeekPartyDayPlayerInfo> DayInfoList)//活动完成次数信息
data = None
def __init__(self):
@@ -23602,7 +23609,7 @@
_pos = self.Head.ReadData(_lpData, _pos)
self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.Count):
- temDayInfoList = tagMCWeekPartyDayInfo()
+ temDayInfoList = tagMCWeekPartyDayPlayerInfo()
_pos = temDayInfoList.ReadData(_lpData, _pos)
self.DayInfoList.append(temDayInfoList)
return _pos
@@ -25204,16 +25211,12 @@
class tagMCClothesCoatLVInfo(Structure):
_pack_ = 1
_fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
("CoatIndex", c_int), #时装索引
("CoatLV", c_ubyte), #时装等级
]
def __init__(self):
self.Clear()
- self.Cmd = 0xB1
- self.SubCmd = 0x02
return
def ReadData(self, stringData, _pos=0, _len=0):
@@ -25222,8 +25225,6 @@
return _pos + self.GetLength()
def Clear(self):
- self.Cmd = 0xB1
- self.SubCmd = 0x02
self.CoatIndex = 0
self.CoatLV = 0
return
@@ -25236,14 +25237,10 @@
def OutputString(self):
DumpString = '''// B1 02 玩家时装皮肤激活状态 //tagMCClothesCoatSkinState:
- Cmd:%s,
- SubCmd:%s,
CoatIndex:%d,
CoatLV:%d
'''\
%(
- self.Cmd,
- self.SubCmd,
self.CoatIndex,
self.CoatLV
)
@@ -28198,6 +28195,7 @@
("DayPKCount", c_ubyte), # 当日已PK次数
("DayWinCount", c_ubyte), # 当日已胜利次数
("DayBuyCount", c_ubyte), # 当日已购买次数
+ ("DayItemAddCount", c_ubyte), # 当日物品增加次数
]
def __init__(self):
@@ -28222,6 +28220,7 @@
self.DayPKCount = 0
self.DayWinCount = 0
self.DayBuyCount = 0
+ self.DayItemAddCount = 0
return
def GetLength(self):
@@ -28241,7 +28240,8 @@
CWinCount:%d,
DayPKCount:%d,
DayWinCount:%d,
- DayBuyCount:%d
+ DayBuyCount:%d,
+ DayItemAddCount:%d
'''\
%(
self.Cmd,
@@ -28253,7 +28253,8 @@
self.CWinCount,
self.DayPKCount,
self.DayWinCount,
- self.DayBuyCount
+ self.DayBuyCount,
+ self.DayItemAddCount
)
return DumpString
--
Gitblit v1.8.0