From 68e048256ca3e40cbc6e73cfd0937663cd41d63c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 27 十二月 2019 20:50:44 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.173on.com:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 80 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 270b221..b7f0604 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -25483,8 +25483,9 @@
_fields_ = [
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
- ("FirstGoldRewardState", c_ubyte), #首充奖励是否已领奖
+ ("FirstGoldRewardState", c_ubyte), #首充奖励领奖记录，按位记录首充第X天是否已领取，第1天为第0索引位
("FirstGoldTry", c_ubyte), #首充试用状态0-不可试用 1-可试用 2-已试用
+ ("FirstGoldServerDay", c_ushort), #首充时是开服第几天，从1开始，0代表未记录充值
]
def __init__(self):
@@ -25503,6 +25504,7 @@
self.SubCmd = 0x02
self.FirstGoldRewardState = 0
self.FirstGoldTry = 0
+ self.FirstGoldServerDay = 0
return
def GetLength(self):
@@ -25516,13 +25518,15 @@
Cmd:%s,
SubCmd:%s,
FirstGoldRewardState:%d,
- FirstGoldTry:%d
+ FirstGoldTry:%d,
+ FirstGoldServerDay:%d
'''\
%(
self.Cmd,
self.SubCmd,
self.FirstGoldRewardState,
- self.FirstGoldTry
+ self.FirstGoldTry,
+ self.FirstGoldServerDay
)
return DumpString
@@ -29201,8 +29205,8 @@
class tagMCActivityPlaceInfo(Structure):
Head = tagHead()
- PlaceState = 0 #(BYTE PlaceState)// 是否启动状态
StartTime = 0 #(DWORD StartTime)// 开始探索time时间戳，完成一次探索会自动下一次探索并更新该时间
+ PlaceCount = 0 #(BYTE PlaceCount)// 剩余未完成探索次数
RewardCount = 0 #(BYTE RewardCount)// 累计未领取探索奖励次数
RewardLen = 0 #(BYTE RewardLen)
RewardInfo = "" #(String RewardInfo)//累计未领取探索奖励 [[itemID, count], ...]
@@ -29217,8 +29221,8 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.PlaceState,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.StartTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.PlaceCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RewardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RewardLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RewardInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.RewardLen)
@@ -29229,8 +29233,8 @@
self.Head.Clear()
self.Head.Cmd = 0xB0
self.Head.SubCmd = 0x27
- self.PlaceState = 0
self.StartTime = 0
+ self.PlaceCount = 0
self.RewardCount = 0
self.RewardLen = 0
self.RewardInfo = ""
@@ -29239,8 +29243,8 @@
def GetLength(self):
length = 0
length += self.Head.GetLength()
- length += 1
length += 4
+ length += 1
length += 1
length += 1
length += len(self.RewardInfo)
@@ -29250,8 +29254,8 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.PlaceState)
data = CommFunc.WriteDWORD(data, self.StartTime)
+ data = CommFunc.WriteBYTE(data, self.PlaceCount)
data = CommFunc.WriteBYTE(data, self.RewardCount)
data = CommFunc.WriteBYTE(data, self.RewardLen)
data = CommFunc.WriteString(data, self.RewardLen, self.RewardInfo)
@@ -29260,16 +29264,16 @@
def OutputString(self):
DumpString = '''
Head:%s,
- PlaceState:%d,
StartTime:%d,
+ PlaceCount:%d,
RewardCount:%d,
RewardLen:%d,
RewardInfo:%s
'''\
%(
self.Head.OutputString(),
- self.PlaceState,
self.StartTime,
+ self.PlaceCount,
self.RewardCount,
self.RewardLen,
self.RewardInfo
@@ -29382,6 +29386,62 @@
#------------------------------------------------------
+# B0 07 今日协助活跃令信息 #tagMCTodayAssistMoneyInfo
+
+class tagMCTodayAssistMoneyInfo(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("TodayAssistMoney", c_ushort), #今日已获得活跃令，不含社交加成
+ ("SocialMoney", c_ushort), #社交额外加成
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB0
+ self.SubCmd = 0x07
+ 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.Cmd = 0xB0
+ self.SubCmd = 0x07
+ self.TodayAssistMoney = 0
+ self.SocialMoney = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCTodayAssistMoneyInfo)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B0 07 今日协助活跃令信息 //tagMCTodayAssistMoneyInfo:
+ Cmd:%s,
+ SubCmd:%s,
+ TodayAssistMoney:%d,
+ SocialMoney:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.TodayAssistMoney,
+ self.SocialMoney
+ )
+ return DumpString
+
+
+m_NAtagMCTodayAssistMoneyInfo=tagMCTodayAssistMoneyInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCTodayAssistMoneyInfo.Cmd,m_NAtagMCTodayAssistMoneyInfo.SubCmd))] = m_NAtagMCTodayAssistMoneyInfo
+
+
+#------------------------------------------------------
# B1 02 玩家时装皮肤激活状态 #tagMCClothesCoatSkinState
class tagMCClothesCoatLVInfo(Structure):
--
Gitblit v1.8.0