From 9ace49a5f3e058625896c3696ade30329e388550 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 三月 2024 15:10:00 +0800
Subject: [PATCH] 10144 【越南】【砍树】【主干】充值表的RecordID 支持超过255
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 26 +++++++++++++-------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py | 2 +-
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 2 +-
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 26 +++++++++++++-------------
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index 122e1d4..f32553e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -4988,7 +4988,7 @@
_fields_ = [
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
- ("RecordID", c_ubyte), #充值记录ID，也就是充值ID，发0则查全部
+ ("RecordID", c_ushort), #充值记录ID，也就是充值ID，发0则查全部
]
def __init__(self):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index bcddf2d..ee509f8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -16324,7 +16324,7 @@
class tagMCCoinToGoldCount(Structure):
_pack_ = 1
_fields_ = [
- ("RecordID", c_ubyte),
+ ("RecordID", c_ushort),
("TodayPayCount", c_ushort), # 今日已购买次数
("TotalPayCount", c_int), # 累计总购买次数
("WeekPayCount", c_ushort), # 周总购买次数
@@ -16374,7 +16374,7 @@
class tagMCCoinToGoldCountInfo(Structure):
Head = tagHead()
- RecordCount = 0 #(BYTE RecordCount)
+ RecordCount = 0 #(WORD RecordCount)
CTGCountInfoList = list() #(vector<tagMCCoinToGoldCount> CTGCountInfoList)
data = None
@@ -16387,7 +16387,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.RecordCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RecordCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
for i in range(self.RecordCount):
temCTGCountInfoList = tagMCCoinToGoldCount()
_pos = temCTGCountInfoList.ReadData(_lpData, _pos)
@@ -16406,7 +16406,7 @@
def GetLength(self):
length = 0
length += self.Head.GetLength()
- length += 1
+ length += 2
for i in range(self.RecordCount):
length += self.CTGCountInfoList[i].GetLength()
@@ -16415,7 +16415,7 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.RecordCount)
+ data = CommFunc.WriteWORD(data, self.RecordCount)
for i in range(self.RecordCount):
data = CommFunc.WriteString(data, self.CTGCountInfoList[i].GetLength(), self.CTGCountInfoList[i].GetBuffer())
return data
@@ -16446,7 +16446,7 @@
OrderLen = 0 #(BYTE OrderLen)
OrderID = "" #(String OrderID)// 订单id
Coin = 0 #(DWORD Coin)// 充值的点卷
- RecordID = 0 #(BYTE RecordID)// ctgID
+ RecordID = 0 #(WORD RecordID)// ctgID
OrderInfoLen = 0 #(BYTE OrderInfoLen)
OrderInfo = "" #(String OrderInfo)
data = None
@@ -16463,7 +16463,7 @@
self.OrderLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.OrderID,_pos = CommFunc.ReadString(_lpData, _pos,self.OrderLen)
self.Coin,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.RecordID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RecordID,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.OrderInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.OrderInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.OrderInfoLen)
return _pos
@@ -16487,7 +16487,7 @@
length += 1
length += len(self.OrderID)
length += 4
- length += 1
+ length += 2
length += 1
length += len(self.OrderInfo)
@@ -16499,7 +16499,7 @@
data = CommFunc.WriteBYTE(data, self.OrderLen)
data = CommFunc.WriteString(data, self.OrderLen, self.OrderID)
data = CommFunc.WriteDWORD(data, self.Coin)
- data = CommFunc.WriteBYTE(data, self.RecordID)
+ data = CommFunc.WriteWORD(data, self.RecordID)
data = CommFunc.WriteBYTE(data, self.OrderInfoLen)
data = CommFunc.WriteString(data, self.OrderInfoLen, self.OrderInfo)
return data
@@ -32440,7 +32440,7 @@
class tagMCActGrowupBuyCTGInfo(Structure):
- CTGID = 0 #(BYTE CTGID)// 充值表ID
+ CTGID = 0 #(WORD CTGID)// 充值表ID
GainItemCount = 0 #(BYTE GainItemCount)// 获得物品数
GainItemList = list() #(vector<tagMCActGrowupBuyCTGItem> GainItemList)// 获得物品列表，替换充值表中的 GainItemList 字段信息
data = None
@@ -32451,7 +32451,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
- self.CTGID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.CTGID,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.GainItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GainItemCount):
temGainItemList = tagMCActGrowupBuyCTGItem()
@@ -32467,7 +32467,7 @@
def GetLength(self):
length = 0
- length += 1
+ length += 2
length += 1
for i in range(self.GainItemCount):
length += self.GainItemList[i].GetLength()
@@ -32476,7 +32476,7 @@
def GetBuffer(self):
data = ''
- data = CommFunc.WriteBYTE(data, self.CTGID)
+ data = CommFunc.WriteWORD(data, self.CTGID)
data = CommFunc.WriteBYTE(data, self.GainItemCount)
for i in range(self.GainItemCount):
data = CommFunc.WriteString(data, self.GainItemList[i].GetLength(), self.GainItemList[i].GetBuffer())
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 122e1d4..f32553e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -4988,7 +4988,7 @@
_fields_ = [
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
- ("RecordID", c_ubyte), #充值记录ID，也就是充值ID，发0则查全部
+ ("RecordID", c_ushort), #充值记录ID，也就是充值ID，发0则查全部
]
def __init__(self):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index bcddf2d..ee509f8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -16324,7 +16324,7 @@
class tagMCCoinToGoldCount(Structure):
_pack_ = 1
_fields_ = [
- ("RecordID", c_ubyte),
+ ("RecordID", c_ushort),
("TodayPayCount", c_ushort), # 今日已购买次数
("TotalPayCount", c_int), # 累计总购买次数
("WeekPayCount", c_ushort), # 周总购买次数
@@ -16374,7 +16374,7 @@
class tagMCCoinToGoldCountInfo(Structure):
Head = tagHead()
- RecordCount = 0 #(BYTE RecordCount)
+ RecordCount = 0 #(WORD RecordCount)
CTGCountInfoList = list() #(vector<tagMCCoinToGoldCount> CTGCountInfoList)
data = None
@@ -16387,7 +16387,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.RecordCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RecordCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
for i in range(self.RecordCount):
temCTGCountInfoList = tagMCCoinToGoldCount()
_pos = temCTGCountInfoList.ReadData(_lpData, _pos)
@@ -16406,7 +16406,7 @@
def GetLength(self):
length = 0
length += self.Head.GetLength()
- length += 1
+ length += 2
for i in range(self.RecordCount):
length += self.CTGCountInfoList[i].GetLength()
@@ -16415,7 +16415,7 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.RecordCount)
+ data = CommFunc.WriteWORD(data, self.RecordCount)
for i in range(self.RecordCount):
data = CommFunc.WriteString(data, self.CTGCountInfoList[i].GetLength(), self.CTGCountInfoList[i].GetBuffer())
return data
@@ -16446,7 +16446,7 @@
OrderLen = 0 #(BYTE OrderLen)
OrderID = "" #(String OrderID)// 订单id
Coin = 0 #(DWORD Coin)// 充值的点卷
- RecordID = 0 #(BYTE RecordID)// ctgID
+ RecordID = 0 #(WORD RecordID)// ctgID
OrderInfoLen = 0 #(BYTE OrderInfoLen)
OrderInfo = "" #(String OrderInfo)
data = None
@@ -16463,7 +16463,7 @@
self.OrderLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.OrderID,_pos = CommFunc.ReadString(_lpData, _pos,self.OrderLen)
self.Coin,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.RecordID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RecordID,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.OrderInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.OrderInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.OrderInfoLen)
return _pos
@@ -16487,7 +16487,7 @@
length += 1
length += len(self.OrderID)
length += 4
- length += 1
+ length += 2
length += 1
length += len(self.OrderInfo)
@@ -16499,7 +16499,7 @@
data = CommFunc.WriteBYTE(data, self.OrderLen)
data = CommFunc.WriteString(data, self.OrderLen, self.OrderID)
data = CommFunc.WriteDWORD(data, self.Coin)
- data = CommFunc.WriteBYTE(data, self.RecordID)
+ data = CommFunc.WriteWORD(data, self.RecordID)
data = CommFunc.WriteBYTE(data, self.OrderInfoLen)
data = CommFunc.WriteString(data, self.OrderInfoLen, self.OrderInfo)
return data
@@ -32440,7 +32440,7 @@
class tagMCActGrowupBuyCTGInfo(Structure):
- CTGID = 0 #(BYTE CTGID)// 充值表ID
+ CTGID = 0 #(WORD CTGID)// 充值表ID
GainItemCount = 0 #(BYTE GainItemCount)// 获得物品数
GainItemList = list() #(vector<tagMCActGrowupBuyCTGItem> GainItemList)// 获得物品列表，替换充值表中的 GainItemList 字段信息
data = None
@@ -32451,7 +32451,7 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
- self.CTGID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.CTGID,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.GainItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GainItemCount):
temGainItemList = tagMCActGrowupBuyCTGItem()
@@ -32467,7 +32467,7 @@
def GetLength(self):
length = 0
- length += 1
+ length += 2
length += 1
for i in range(self.GainItemCount):
length += self.GainItemList[i].GetLength()
@@ -32476,7 +32476,7 @@
def GetBuffer(self):
data = ''
- data = CommFunc.WriteBYTE(data, self.CTGID)
+ data = CommFunc.WriteWORD(data, self.CTGID)
data = CommFunc.WriteBYTE(data, self.GainItemCount)
for i in range(self.GainItemCount):
data = CommFunc.WriteString(data, self.GainItemList[i].GetLength(), self.GainItemList[i].GetBuffer())
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
index 1c51289..20e71b4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -244,7 +244,7 @@
#struct tagCMQueryCoinToGoldCount
#{
# tagHead Head;
-# BYTE RecordID; //充值记录ID，也就是充值ID，发0则查全部
+# WORD RecordID; //充值记录ID，也就是充值ID，发0则查全部
#};
def OnQueryCoinToGoldCount(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
--
Gitblit v1.8.0