From f59c80a64aa99e451082cce8d338ce1faa53b00a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 26 三月 2019 20:05:58 +0800
Subject: [PATCH] 6374 新版无绑玉，原先绑玉再仙玉的扣法改成 扣仙玉
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 302 +++++++-------------------------------------------
1 files changed, 44 insertions(+), 258 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index e8ff6de..3be2ddf 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -3371,62 +3371,6 @@
#------------------------------------------------------
-#A9 05 天梯竞技场每日奖励信息#tagGCHighLadderRewardInfo
-
-class tagGCHighLadderRewardInfo(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("hadGot", c_ubyte), #是否已领取
- ("Order", c_ushort), #奖励排名
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA9
- self.SubCmd = 0x05
- 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 = 0xA9
- self.SubCmd = 0x05
- self.hadGot = 0
- self.Order = 0
- return
-
- def GetLength(self):
- return sizeof(tagGCHighLadderRewardInfo)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''//A9 05 天梯竞技场每日奖励信息//tagGCHighLadderRewardInfo:
- Cmd:%s,
- SubCmd:%s,
- hadGot:%d,
- Order:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.hadGot,
- self.Order
- )
- return DumpString
-
-
-m_NAtagGCHighLadderRewardInfo=tagGCHighLadderRewardInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCHighLadderRewardInfo.Cmd,m_NAtagGCHighLadderRewardInfo.SubCmd))] = m_NAtagGCHighLadderRewardInfo
-
-
-#------------------------------------------------------
#A9 03 开服活动奖励数量刷新#tagGCOpenServerCampaignAwardCount
class tagGCOpenServerCampaignAwardCount(Structure):
@@ -6899,6 +6843,7 @@
ItemCount = 0 #(WORD ItemCount)
AddTime = "" #(char AddTime[19])//上架时间 yyyy-MM-dd hh:mm:ss
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
+ BiddingTime = "" #(char BiddingTime[19])//竞价时间 yyyy-MM-dd hh:mm:ss
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
data = None
@@ -6915,6 +6860,7 @@
self.ItemCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.BiddingTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
return _pos
@@ -6926,6 +6872,7 @@
self.ItemCount = 0
self.AddTime = ""
self.BidderPrice = 0
+ self.BiddingTime = ""
self.UserDataLen = 0
self.UserData = ""
return
@@ -6938,6 +6885,7 @@
length += 2
length += 19
length += 2
+ length += 19
length += 2
length += len(self.UserData)
@@ -6951,6 +6899,7 @@
data = CommFunc.WriteWORD(data, self.ItemCount)
data = CommFunc.WriteString(data, 19, self.AddTime)
data = CommFunc.WriteWORD(data, self.BidderPrice)
+ data = CommFunc.WriteString(data, 19, self.BiddingTime)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
return data
@@ -6963,6 +6912,7 @@
ItemCount:%d,
AddTime:%s,
BidderPrice:%d,
+ BiddingTime:%s,
UserDataLen:%d,
UserData:%s
'''\
@@ -6973,6 +6923,7 @@
self.ItemCount,
self.AddTime,
self.BidderPrice,
+ self.BiddingTime,
self.UserDataLen,
self.UserData
)
@@ -7055,6 +7006,7 @@
ItemCount = 0 #(WORD ItemCount)
AddTime = "" #(char AddTime[19])//上架时间 yyyy-MM-dd hh:mm:ss
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
+ BiddingTime = "" #(char BiddingTime[19])//竞价时间 yyyy-MM-dd hh:mm:ss
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
data = None
@@ -7071,6 +7023,7 @@
self.ItemCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.BiddingTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
return _pos
@@ -7082,6 +7035,7 @@
self.ItemCount = 0
self.AddTime = ""
self.BidderPrice = 0
+ self.BiddingTime = ""
self.UserDataLen = 0
self.UserData = ""
return
@@ -7094,6 +7048,7 @@
length += 2
length += 19
length += 2
+ length += 19
length += 2
length += len(self.UserData)
@@ -7107,6 +7062,7 @@
data = CommFunc.WriteWORD(data, self.ItemCount)
data = CommFunc.WriteString(data, 19, self.AddTime)
data = CommFunc.WriteWORD(data, self.BidderPrice)
+ data = CommFunc.WriteString(data, 19, self.BiddingTime)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
return data
@@ -7119,6 +7075,7 @@
ItemCount:%d,
AddTime:%s,
BidderPrice:%d,
+ BiddingTime:%s,
UserDataLen:%d,
UserData:%s
'''\
@@ -7129,6 +7086,7 @@
self.ItemCount,
self.AddTime,
self.BidderPrice,
+ self.BiddingTime,
self.UserDataLen,
self.UserData
)
@@ -7288,6 +7246,7 @@
AddTime = "" #(char AddTime[19])//上架时间 yyyy-MM-dd hh:mm:ss
BidderID = 0 #(DWORD BidderID)//竞拍玩家ID，也就是当前最高竞价玩家ID
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
+ BiddingTime = "" #(char BiddingTime[19])//竞价时间 yyyy-MM-dd hh:mm:ss
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
data = None
@@ -7305,6 +7264,7 @@
self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.BidderID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.BiddingTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
return _pos
@@ -7317,6 +7277,7 @@
self.AddTime = ""
self.BidderID = 0
self.BidderPrice = 0
+ self.BiddingTime = ""
self.UserDataLen = 0
self.UserData = ""
return
@@ -7330,6 +7291,7 @@
length += 19
length += 4
length += 2
+ length += 19
length += 2
length += len(self.UserData)
@@ -7344,6 +7306,7 @@
data = CommFunc.WriteString(data, 19, self.AddTime)
data = CommFunc.WriteDWORD(data, self.BidderID)
data = CommFunc.WriteWORD(data, self.BidderPrice)
+ data = CommFunc.WriteString(data, 19, self.BiddingTime)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
return data
@@ -7357,6 +7320,7 @@
AddTime:%s,
BidderID:%d,
BidderPrice:%d,
+ BiddingTime:%s,
UserDataLen:%d,
UserData:%s
'''\
@@ -7368,6 +7332,7 @@
self.AddTime,
self.BidderID,
self.BidderPrice,
+ self.BiddingTime,
self.UserDataLen,
self.UserData
)
@@ -7557,6 +7522,7 @@
ItemCount = 0 #(WORD ItemCount)
AddTime = "" #(char AddTime[19])//上架时间 yyyy-MM-dd hh:mm:ss
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
+ BiddingTime = "" #(char BiddingTime[19])//竞价时间 yyyy-MM-dd hh:mm:ss
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
FamilyPlayerIDLen = 0 #(WORD FamilyPlayerIDLen)
@@ -7576,6 +7542,7 @@
self.ItemCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.BiddingTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
self.FamilyPlayerIDLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
@@ -7590,6 +7557,7 @@
self.ItemCount = 0
self.AddTime = ""
self.BidderPrice = 0
+ self.BiddingTime = ""
self.UserDataLen = 0
self.UserData = ""
self.FamilyPlayerIDLen = 0
@@ -7605,6 +7573,7 @@
length += 2
length += 19
length += 2
+ length += 19
length += 2
length += len(self.UserData)
length += 2
@@ -7621,6 +7590,7 @@
data = CommFunc.WriteWORD(data, self.ItemCount)
data = CommFunc.WriteString(data, 19, self.AddTime)
data = CommFunc.WriteWORD(data, self.BidderPrice)
+ data = CommFunc.WriteString(data, 19, self.BiddingTime)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
data = CommFunc.WriteWORD(data, self.FamilyPlayerIDLen)
@@ -7636,6 +7606,7 @@
ItemCount:%d,
AddTime:%s,
BidderPrice:%d,
+ BiddingTime:%s,
UserDataLen:%d,
UserData:%s,
FamilyPlayerIDLen:%d,
@@ -7649,6 +7620,7 @@
self.ItemCount,
self.AddTime,
self.BidderPrice,
+ self.BiddingTime,
self.UserDataLen,
self.UserData,
self.FamilyPlayerIDLen,
@@ -7734,6 +7706,7 @@
ItemCount = 0 #(WORD ItemCount)
AddTime = "" #(char AddTime[19])//上架时间 yyyy-MM-dd hh:mm:ss
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
+ BiddingTime = "" #(char BiddingTime[19])//竞价时间 yyyy-MM-dd hh:mm:ss
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
data = None
@@ -7750,6 +7723,7 @@
self.ItemCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.BiddingTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
return _pos
@@ -7761,6 +7735,7 @@
self.ItemCount = 0
self.AddTime = ""
self.BidderPrice = 0
+ self.BiddingTime = ""
self.UserDataLen = 0
self.UserData = ""
return
@@ -7773,6 +7748,7 @@
length += 2
length += 19
length += 2
+ length += 19
length += 2
length += len(self.UserData)
@@ -7786,6 +7762,7 @@
data = CommFunc.WriteWORD(data, self.ItemCount)
data = CommFunc.WriteString(data, 19, self.AddTime)
data = CommFunc.WriteWORD(data, self.BidderPrice)
+ data = CommFunc.WriteString(data, 19, self.BiddingTime)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
return data
@@ -7798,6 +7775,7 @@
ItemCount:%d,
AddTime:%s,
BidderPrice:%d,
+ BiddingTime:%s,
UserDataLen:%d,
UserData:%s
'''\
@@ -7808,6 +7786,7 @@
self.ItemCount,
self.AddTime,
self.BidderPrice,
+ self.BiddingTime,
self.UserDataLen,
self.UserData
)
@@ -8066,6 +8045,7 @@
AddTime = "" #(char AddTime[19])//上架时间
BidderID = 0 #(DWORD BidderID)//最高竞拍玩家ID，也就是当前最高竞价玩家ID
BidderPrice = 0 #(DWORD BidderPrice)//最高竞拍价格
+ BiddingTime = "" #(char BiddingTime[19])//竞价时间 yyyy-MM-dd hh:mm:ss
data = None
def __init__(self):
@@ -8079,6 +8059,7 @@
self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
self.BidderID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.BidderPrice,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.BiddingTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
return _pos
def Clear(self):
@@ -8087,6 +8068,7 @@
self.AddTime = ""
self.BidderID = 0
self.BidderPrice = 0
+ self.BiddingTime = ""
return
def GetLength(self):
@@ -8096,6 +8078,7 @@
length += 19
length += 4
length += 4
+ length += 19
return length
@@ -8106,6 +8089,7 @@
data = CommFunc.WriteString(data, 19, self.AddTime)
data = CommFunc.WriteDWORD(data, self.BidderID)
data = CommFunc.WriteDWORD(data, self.BidderPrice)
+ data = CommFunc.WriteString(data, 19, self.BiddingTime)
return data
def OutputString(self):
@@ -8114,14 +8098,16 @@
AuctionType:%d,
AddTime:%s,
BidderID:%d,
- BidderPrice:%d
+ BidderPrice:%d,
+ BiddingTime:%s
'''\
%(
self.ItemGUID,
self.AuctionType,
self.AddTime,
self.BidderID,
- self.BidderPrice
+ self.BidderPrice,
+ self.BiddingTime
)
return DumpString
@@ -18139,74 +18125,6 @@
#------------------------------------------------------
-#A5 34 天梯竞技场状态#tagMCHighLadderState
-
-class tagMCHighLadderState(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("Count", c_ubyte), #已挑战次数
- ("MaxCount", c_ubyte), #最大次数
- ("CDTime", c_int), #累计冷却时间
- ("IsRelCD", c_ubyte), #是否正在真实冷却状态
- ("Currency", c_int), #积分
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x34
- 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 = 0xA5
- self.SubCmd = 0x34
- self.Count = 0
- self.MaxCount = 0
- self.CDTime = 0
- self.IsRelCD = 0
- self.Currency = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCHighLadderState)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''//A5 34 天梯竞技场状态//tagMCHighLadderState:
- Cmd:%s,
- SubCmd:%s,
- Count:%d,
- MaxCount:%d,
- CDTime:%d,
- IsRelCD:%d,
- Currency:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.Count,
- self.MaxCount,
- self.CDTime,
- self.IsRelCD,
- self.Currency
- )
- return DumpString
-
-
-m_NAtagMCHighLadderState=tagMCHighLadderState()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCHighLadderState.Cmd,m_NAtagMCHighLadderState.SubCmd))] = m_NAtagMCHighLadderState
-
-
-#------------------------------------------------------
#A5 01 查看已申请加入的家族信息 #tagMCNotifyRequestJoinFamilyInfo
class tagRequestJoinFamily(Structure):
@@ -26021,138 +25939,6 @@
m_NAtagMCBossRebornPlayerInfo=tagMCBossRebornPlayerInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCBossRebornPlayerInfo.Head.Cmd,m_NAtagMCBossRebornPlayerInfo.Head.SubCmd))] = m_NAtagMCBossRebornPlayerInfo
-
-
-#------------------------------------------------------
-# AB 06 活动物品兑换次数记录 #tagMCExchangeActionItemCntRecord
-
-class tagMCExchangeActionItemCnt(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("ItemID", c_int),
- ("ExcCnt", c_int), # 已兑换次数
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x06
- 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 = 0xAB
- self.SubCmd = 0x06
- self.ItemID = 0
- self.ExcCnt = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCExchangeActionItemCnt)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 06 活动物品兑换次数记录 //tagMCExchangeActionItemCntRecord:
- Cmd:%s,
- SubCmd:%s,
- ItemID:%d,
- ExcCnt:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.ItemID,
- self.ExcCnt
- )
- return DumpString
-
-
-class tagMCExchangeActionItemCntRecord(Structure):
- Head = tagHead()
- ActionKeyLen = 0 #(BYTE ActionKeyLen)
- ActionKey = "" #(String ActionKey)
- RecordCnt = 0 #(BYTE RecordCnt)
- RecordList = list() #(vector<tagMCExchangeActionItemCnt> RecordList)
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xAB
- self.Head.SubCmd = 0x06
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.ActionKeyLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.ActionKey,_pos = CommFunc.ReadString(_lpData, _pos,self.ActionKeyLen)
- self.RecordCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.RecordCnt):
- temRecordList = tagMCExchangeActionItemCnt()
- _pos = temRecordList.ReadData(_lpData, _pos)
- self.RecordList.append(temRecordList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xAB
- self.Head.SubCmd = 0x06
- self.ActionKeyLen = 0
- self.ActionKey = ""
- self.RecordCnt = 0
- self.RecordList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += len(self.ActionKey)
- length += 1
- for i in range(self.RecordCnt):
- length += self.RecordList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.ActionKeyLen)
- data = CommFunc.WriteString(data, self.ActionKeyLen, self.ActionKey)
- data = CommFunc.WriteBYTE(data, self.RecordCnt)
- for i in range(self.RecordCnt):
- data = CommFunc.WriteString(data, self.RecordList[i].GetLength(), self.RecordList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- ActionKeyLen:%d,
- ActionKey:%s,
- RecordCnt:%d,
- RecordList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.ActionKeyLen,
- self.ActionKey,
- self.RecordCnt,
- "..."
- )
- return DumpString
-
-
-m_NAtagMCExchangeActionItemCntRecord=tagMCExchangeActionItemCntRecord()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCExchangeActionItemCntRecord.Head.Cmd,m_NAtagMCExchangeActionItemCntRecord.Head.SubCmd))] = m_NAtagMCExchangeActionItemCntRecord
#------------------------------------------------------
--
Gitblit v1.8.0