From 73dfbfa4721b3d21b687d6e68905f4236ed24d4f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 二月 2019 14:10:15 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单（封包）
---
ServerPython/CoreServerGroup/GameServer/Script/PyGameDataStruct.py | 7 +++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 55 +++++----------------------
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 55 +++++----------------------
3 files changed, 27 insertions(+), 90 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 3b7dc92..d789483 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -7041,7 +7041,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7058,7 +7057,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7070,7 +7068,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7083,7 +7080,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7097,7 +7093,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7109,8 +7104,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7120,8 +7114,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -7204,7 +7197,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7221,7 +7213,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7233,7 +7224,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7246,7 +7236,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7260,7 +7249,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7272,8 +7260,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7283,8 +7270,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -7436,7 +7422,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7453,7 +7438,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7465,7 +7449,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7478,7 +7461,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7492,7 +7474,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7504,8 +7485,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7515,8 +7495,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -7869,7 +7848,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7886,7 +7864,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7898,7 +7875,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7911,7 +7887,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7925,7 +7900,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7937,8 +7911,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7948,8 +7921,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -8189,7 +8161,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -8209,7 +8180,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -8225,7 +8195,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -8239,7 +8208,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -8254,7 +8222,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -8267,8 +8234,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.Head.OutputString(),
@@ -8279,8 +8245,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyGameDataStruct.py b/ServerPython/CoreServerGroup/GameServer/Script/PyGameDataStruct.py
index 1330232..ced9f6a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/PyGameDataStruct.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/PyGameDataStruct.py
@@ -193,6 +193,7 @@
('FamilyID', ctypes.c_ulong),
('ItemID', ctypes.c_ulong),
('Count', ctypes.c_ushort),
+ ('AuctionType', ctypes.c_ubyte),
('AddTime', ctypes.c_char * 19),
('BiddingTime', ctypes.c_char * 19),
('BidderID', ctypes.c_ulong),
@@ -220,6 +221,7 @@
self.FamilyID = 0
self.ItemID = 0
self.Count = 0
+ self.AuctionType = 0
self.AddTime = ''
self.BiddingTime = ''
self.BidderID = 0
@@ -246,6 +248,7 @@
self.FamilyID, pos = CommFunc.ReadDWORD(buf, pos)
self.ItemID, pos = CommFunc.ReadDWORD(buf, pos)
self.Count, pos = CommFunc.ReadWORD(buf, pos)
+ self.AuctionType, pos = CommFunc.ReadBYTE(buf, pos)
self.AddTime, pos = CommFunc.ReadString(buf, pos, 19)
self.BiddingTime, pos = CommFunc.ReadString(buf, pos, 19)
self.BidderID, pos = CommFunc.ReadDWORD(buf, pos)
@@ -272,6 +275,7 @@
buf = CommFunc.WriteDWORD(buf, self.FamilyID)
buf = CommFunc.WriteDWORD(buf, self.ItemID)
buf = CommFunc.WriteWORD(buf, self.Count)
+ buf = CommFunc.WriteBYTE(buf, self.AuctionType)
buf = CommFunc.WriteString(buf, sizeof(ctypes.c_char) * 19, self.AddTime)
buf = CommFunc.WriteString(buf, sizeof(ctypes.c_char) * 19, self.BiddingTime)
buf = CommFunc.WriteDWORD(buf, self.BidderID)
@@ -295,6 +299,7 @@
length += sizeof(ctypes.c_ulong)
length += sizeof(ctypes.c_ulong)
length += sizeof(ctypes.c_ushort)
+ length += sizeof(ctypes.c_ubyte)
length += sizeof(ctypes.c_char) * 19
length += sizeof(ctypes.c_char) * 19
length += sizeof(ctypes.c_ulong)
@@ -318,6 +323,7 @@
FamilyID = %s,
ItemID = %s,
Count = %s,
+ AuctionType = %s,
AddTime = %s,
BiddingTime = %s,
BidderID = %s,
@@ -339,6 +345,7 @@
self.FamilyID,
self.ItemID,
self.Count,
+ self.AuctionType,
self.AddTime,
self.BiddingTime,
self.BidderID,
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 3b7dc92..d789483 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -7041,7 +7041,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7058,7 +7057,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7070,7 +7068,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7083,7 +7080,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7097,7 +7093,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7109,8 +7104,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7120,8 +7114,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -7204,7 +7197,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7221,7 +7213,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7233,7 +7224,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7246,7 +7236,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7260,7 +7249,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7272,8 +7260,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7283,8 +7270,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -7436,7 +7422,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7453,7 +7438,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7465,7 +7449,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7478,7 +7461,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7492,7 +7474,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7504,8 +7485,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7515,8 +7495,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -7869,7 +7848,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -7886,7 +7864,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -7898,7 +7875,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -7911,7 +7887,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -7925,7 +7900,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -7937,8 +7911,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.ItemGUID,
@@ -7948,8 +7921,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
@@ -8189,7 +8161,6 @@
BidderPrice = 0 #(WORD BidderPrice)//竞拍玩家出价
UserDataLen = 0 #(WORD UserDataLen)
UserData = "" #(String UserData)//自定义数据
- CanGetMoney = 0 #(BYTE CanGetMoney)//可否获得收益
data = None
def __init__(self):
@@ -8209,7 +8180,6 @@
self.BidderPrice,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
- self.CanGetMoney,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -8225,7 +8195,6 @@
self.BidderPrice = 0
self.UserDataLen = 0
self.UserData = ""
- self.CanGetMoney = 0
return
def GetLength(self):
@@ -8239,7 +8208,6 @@
length += 2
length += 2
length += len(self.UserData)
- length += 1
return length
@@ -8254,7 +8222,6 @@
data = CommFunc.WriteWORD(data, self.BidderPrice)
data = CommFunc.WriteWORD(data, self.UserDataLen)
data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
- data = CommFunc.WriteBYTE(data, self.CanGetMoney)
return data
def OutputString(self):
@@ -8267,8 +8234,7 @@
AddTime:%s,
BidderPrice:%d,
UserDataLen:%d,
- UserData:%s,
- CanGetMoney:%d
+ UserData:%s
'''\
%(
self.Head.OutputString(),
@@ -8279,8 +8245,7 @@
self.AddTime,
self.BidderPrice,
self.UserDataLen,
- self.UserData,
- self.CanGetMoney
+ self.UserData
)
return DumpString
--
Gitblit v1.8.0