From 133a8b5682a9b7637b20f2be88d27628fb6ca39a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 12 二月 2019 15:53:56 +0800
Subject: [PATCH] 5819 【后端】【1.6】运营活动支持对应不同的职业和世界等级(累计充值修改)
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 129 ++----------------------------------------
1 files changed, 7 insertions(+), 122 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 09ea263..a4a0e09 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -4719,7 +4719,7 @@
class tagGCFeastRedPacketDay(Structure):
RedPacketCount = 0 #(BYTE RedPacketCount)
- RedPacketIDList = list() #(vector<WORD> RedPacketIDList)// 当日定时发放的系统红包ID列表
+ RedPacketIDList = list() #(vector<WORD> RedPacketIDList)// 当日定时发放的系统红包表ID列表
data = None
def __init__(self):
@@ -25471,125 +25471,6 @@
#------------------------------------------------------
-# AB 26 节日红包任务进度信息 #tagMCFeastRedPackTaskInfo
-
-class tagMCFeastRedPackTaskProgress(Structure):
- _pack_ = 1
- _fields_ = [
- ("TaskType", c_ubyte), #任务类型
- ("TaskData", c_int), #任务数据
- ("CurTimes", c_ushort), #当前完成次数
- ]
-
- def __init__(self):
- self.Clear()
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.TaskType = 0
- self.TaskData = 0
- self.CurTimes = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCFeastRedPackTaskProgress)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 26 节日红包任务进度信息 //tagMCFeastRedPackTaskInfo:
- TaskType:%d,
- TaskData:%d,
- CurTimes:%d
- '''\
- %(
- self.TaskType,
- self.TaskData,
- self.CurTimes
- )
- return DumpString
-
-
-class tagMCFeastRedPackTaskInfo(Structure):
- Head = tagHead()
- FeastDay = 0 #(BYTE FeastDay)//节日第几天
- TaskCount = 0 #(BYTE TaskCount)//今日任务数
- TaskProgressList = list() #(vector<tagMCFeastRedPackTaskProgress> TaskProgressList)// 任务进度信息列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xAB
- self.Head.SubCmd = 0x26
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.FeastDay,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.TaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.TaskCount):
- temTaskProgressList = tagMCFeastRedPackTaskProgress()
- _pos = temTaskProgressList.ReadData(_lpData, _pos)
- self.TaskProgressList.append(temTaskProgressList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xAB
- self.Head.SubCmd = 0x26
- self.FeastDay = 0
- self.TaskCount = 0
- self.TaskProgressList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 1
- for i in range(self.TaskCount):
- length += self.TaskProgressList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.FeastDay)
- data = CommFunc.WriteBYTE(data, self.TaskCount)
- for i in range(self.TaskCount):
- data = CommFunc.WriteString(data, self.TaskProgressList[i].GetLength(), self.TaskProgressList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- FeastDay:%d,
- TaskCount:%d,
- TaskProgressList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.FeastDay,
- self.TaskCount,
- "..."
- )
- return DumpString
-
-
-m_NAtagMCFeastRedPackTaskInfo=tagMCFeastRedPackTaskInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFeastRedPackTaskInfo.Head.Cmd,m_NAtagMCFeastRedPackTaskInfo.Head.SubCmd))] = m_NAtagMCFeastRedPackTaskInfo
-
-
-#------------------------------------------------------
# AB 07 节日活动奖励状态 #tagMCFestivalLoginAwardState
class tagMCFestivalLoginAwardState(Structure):
@@ -28624,6 +28505,7 @@
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
("Floor", c_int), # 已通关层
+ ("LastFloor", c_int), # 上次挑战层
]
def __init__(self):
@@ -28641,6 +28523,7 @@
self.Cmd = 0xB2
self.SubCmd = 0x13
self.Floor = 0
+ self.LastFloor = 0
return
def GetLength(self):
@@ -28653,12 +28536,14 @@
DumpString = '''// B2 13 诛仙塔通关层数 //tagMCZhuXianTowerInfo:
Cmd:%s,
SubCmd:%s,
- Floor:%d
+ Floor:%d,
+ LastFloor:%d
'''\
%(
self.Cmd,
self.SubCmd,
- self.Floor
+ self.Floor,
+ self.LastFloor
)
return DumpString
--
Gitblit v1.8.0