From be4dbe923ecbcc9254cf72b82d377725f798b3f1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 23 八月 2021 23:52:54 +0800
Subject: [PATCH] 8796 【主干】【gt_1.101.1】【后端】Part1 2、每日在线送符印寻宝20次（领取记录通知固定只发当天的）；
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 24a5c17..c038c90 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -25013,7 +25013,8 @@
("ActNum", c_ubyte), #活动编号
("GarbageSortingType", c_ubyte), #垃圾分类类型
("IsRight", c_ubyte), #是否正确
- ("AddEnvValue", c_ushort), #增加环保值
+ ("AddEnvValue", c_int), #增加环保值
+ ("HisEnvValueTotal", c_int), # 当前活动累计获得环保值
]
def __init__(self):
@@ -25034,6 +25035,7 @@
self.GarbageSortingType = 0
self.IsRight = 0
self.AddEnvValue = 0
+ self.HisEnvValueTotal = 0
return
def GetLength(self):
@@ -25049,7 +25051,8 @@
ActNum:%d,
GarbageSortingType:%d,
IsRight:%d,
- AddEnvValue:%d
+ AddEnvValue:%d,
+ HisEnvValueTotal:%d
'''\
%(
self.Cmd,
@@ -25057,7 +25060,8 @@
self.ActNum,
self.GarbageSortingType,
self.IsRight,
- self.AddEnvValue
+ self.AddEnvValue,
+ self.HisEnvValueTotal
)
return DumpString
@@ -25074,7 +25078,7 @@
_fields_ = [
("GarbageTaskID", c_ubyte), #垃圾任务ID
("GarbageTaskValue", c_int), #当前进度值，一直累加
- ("GarbageTaskFinishCount", c_ubyte), #当前已完成次数; 前端计算未完成次数的进度值=max(0, 当前进度值 - (完成次数 * 单次所需进度))
+ ("GarbageTaskFinishCount", c_int), #当前已完成次数; 前端计算未完成次数的进度值=max(0, 当前进度值 - (完成次数 * 单次所需进度))
]
def __init__(self):
@@ -25115,6 +25119,7 @@
class tagMCActGarbageTaskInfo(Structure):
Head = tagHead()
ActNum = 0 #(BYTE ActNum)// 活动编号
+ HisEnvValueTotal = 0 #(DWORD HisEnvValueTotal)// 当前活动累计获得环保值
GarbageTaskCount = 0 #(BYTE GarbageTaskCount)//任务数
GarbageTaskList = list() #(vector<tagMCActGarbageTask> GarbageTaskList)//任务信息列表
data = None
@@ -25129,6 +25134,7 @@
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.HisEnvValueTotal,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.GarbageTaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GarbageTaskCount):
temGarbageTaskList = tagMCActGarbageTask()
@@ -25142,6 +25148,7 @@
self.Head.Cmd = 0xAA
self.Head.SubCmd = 0x56
self.ActNum = 0
+ self.HisEnvValueTotal = 0
self.GarbageTaskCount = 0
self.GarbageTaskList = list()
return
@@ -25150,6 +25157,7 @@
length = 0
length += self.Head.GetLength()
length += 1
+ length += 4
length += 1
for i in range(self.GarbageTaskCount):
length += self.GarbageTaskList[i].GetLength()
@@ -25160,6 +25168,7 @@
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
data = CommFunc.WriteBYTE(data, self.ActNum)
+ data = CommFunc.WriteDWORD(data, self.HisEnvValueTotal)
data = CommFunc.WriteBYTE(data, self.GarbageTaskCount)
for i in range(self.GarbageTaskCount):
data = CommFunc.WriteString(data, self.GarbageTaskList[i].GetLength(), self.GarbageTaskList[i].GetBuffer())
@@ -25169,12 +25178,14 @@
DumpString = '''
Head:%s,
ActNum:%d,
+ HisEnvValueTotal:%d,
GarbageTaskCount:%d,
GarbageTaskList:%s
'''\
%(
self.Head.OutputString(),
self.ActNum,
+ self.HisEnvValueTotal,
self.GarbageTaskCount,
"..."
)
@@ -27281,8 +27292,9 @@
LimitLV = 0 #(WORD LimitLV)// 限制等级
CTGPrizeCount = 0 #(BYTE CTGPrizeCount)
CTGPrizeList = list() #(vector<DWORD> CTGPrizeList)// 累计充值额度奖励次数列表 [奖励第1次所需累计充值额度, 第2次, ...]
- UseGoldPrizeCount = 0 #(BYTE UseGoldPrizeCount)
- UseGoldPrizeList = list() #(vector<DWORD> UseGoldPrizeList)// 累计消费仙玉奖励次数列表 [奖励第1次所需累计消费仙玉, 第2次, ...]
+ UseMoneyType = 0 #(BYTE UseMoneyType)// 累计消费货币类型
+ UseMoneyPrizeCount = 0 #(BYTE UseMoneyPrizeCount)
+ UseMoneyPrizeList = list() #(vector<DWORD> UseMoneyPrizeList)// 累计消费货币奖励次数列表 [奖励第1次所需累计消费货币, 第2次, ...]
TurnItemCount = 0 #(BYTE TurnItemCount)
TurnItemList = list() #(vector<tagMCActTurntableItem> TurnItemList)// 转盘已确定的物品列表，包含常规物品+极品物品+终极物品，活动开始时，后端直接随机生成常规物品，已确定的物品不包含极品、终极物品时需要先选择才能使用转盘；
GoodItemCount = 0 #(BYTE GoodItemCount)
@@ -27311,10 +27323,11 @@
for i in range(self.CTGPrizeCount):
value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
self.CTGPrizeList.append(value)
- self.UseGoldPrizeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.UseGoldPrizeCount):
+ self.UseMoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.UseMoneyPrizeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.UseMoneyPrizeCount):
value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
- self.UseGoldPrizeList.append(value)
+ self.UseMoneyPrizeList.append(value)
self.TurnItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.TurnItemCount):
temTurnItemList = tagMCActTurntableItem()
@@ -27346,8 +27359,9 @@
self.LimitLV = 0
self.CTGPrizeCount = 0
self.CTGPrizeList = list()
- self.UseGoldPrizeCount = 0
- self.UseGoldPrizeList = list()
+ self.UseMoneyType = 0
+ self.UseMoneyPrizeCount = 0
+ self.UseMoneyPrizeList = list()
self.TurnItemCount = 0
self.TurnItemList = list()
self.GoodItemCount = 0
@@ -27369,7 +27383,8 @@
length += 1
length += 4 * self.CTGPrizeCount
length += 1
- length += 4 * self.UseGoldPrizeCount
+ length += 1
+ length += 4 * self.UseMoneyPrizeCount
length += 1
for i in range(self.TurnItemCount):
length += self.TurnItemList[i].GetLength()
@@ -27395,9 +27410,10 @@
data = CommFunc.WriteBYTE(data, self.CTGPrizeCount)
for i in range(self.CTGPrizeCount):
data = CommFunc.WriteDWORD(data, self.CTGPrizeList[i])
- data = CommFunc.WriteBYTE(data, self.UseGoldPrizeCount)
- for i in range(self.UseGoldPrizeCount):
- data = CommFunc.WriteDWORD(data, self.UseGoldPrizeList[i])
+ data = CommFunc.WriteBYTE(data, self.UseMoneyType)
+ data = CommFunc.WriteBYTE(data, self.UseMoneyPrizeCount)
+ for i in range(self.UseMoneyPrizeCount):
+ data = CommFunc.WriteDWORD(data, self.UseMoneyPrizeList[i])
data = CommFunc.WriteBYTE(data, self.TurnItemCount)
for i in range(self.TurnItemCount):
data = CommFunc.WriteString(data, self.TurnItemList[i].GetLength(), self.TurnItemList[i].GetBuffer())
@@ -27421,8 +27437,9 @@
LimitLV:%d,
CTGPrizeCount:%d,
CTGPrizeList:%s,
- UseGoldPrizeCount:%d,
- UseGoldPrizeList:%s,
+ UseMoneyType:%d,
+ UseMoneyPrizeCount:%d,
+ UseMoneyPrizeList:%s,
TurnItemCount:%d,
TurnItemList:%s,
GoodItemCount:%d,
@@ -27441,7 +27458,8 @@
self.LimitLV,
self.CTGPrizeCount,
"...",
- self.UseGoldPrizeCount,
+ self.UseMoneyType,
+ self.UseMoneyPrizeCount,
"...",
self.TurnItemCount,
"...",
@@ -27470,7 +27488,7 @@
("ActNum", c_ubyte), #活动编号
("CanUseCount", c_ubyte), #可转盘次数
("CTGTotal", c_int), #累计充值额度
- ("UseGoldTotal", c_int), #累计消费仙玉额度
+ ("UseMoneyTotal", c_int), #累计消费货币额度
("TurnItemState", c_int), #转盘物品已抽中记录，按转盘物品编号二进制位代表是否已抽中
("GetItemNum", c_ubyte), #本次抽中的物品编号，非转盘结果时为0，大于0时为通知本次转到的物品编号
]
@@ -27492,7 +27510,7 @@
self.ActNum = 0
self.CanUseCount = 0
self.CTGTotal = 0
- self.UseGoldTotal = 0
+ self.UseMoneyTotal = 0
self.TurnItemState = 0
self.GetItemNum = 0
return
@@ -27510,7 +27528,7 @@
ActNum:%d,
CanUseCount:%d,
CTGTotal:%d,
- UseGoldTotal:%d,
+ UseMoneyTotal:%d,
TurnItemState:%d,
GetItemNum:%d
'''\
@@ -27520,7 +27538,7 @@
self.ActNum,
self.CanUseCount,
self.CTGTotal,
- self.UseGoldTotal,
+ self.UseMoneyTotal,
self.TurnItemState,
self.GetItemNum
)
--
Gitblit v1.8.0