From c5b0adc7d240e05adecd465d5767a7f4cce16f86 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 19 七月 2024 11:23:25 +0800
Subject: [PATCH] 10215 10213 【越南】【主干】【港台】【砍树】古宝升星效果与古宝共鸣（去除古宝共鸣手动激活流程）
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 398 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 347 insertions(+), 51 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index bd7ffd0..89efac0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -1085,7 +1085,7 @@
("Type", c_ubyte), #类型 TBillboardType
("StartIndex", c_int), #查看的起始名次索引， 默认0
("WatchCnt", c_ubyte), #查看条数，默认20，最大不超过100
- ("IsWatchSelf", c_ubyte), #是否查看自己名次前后，默认10条数据
+ ("WatchID", c_int), #查看指定ID名次前后，如玩家ID、家族ID等
]
def __init__(self):
@@ -1105,7 +1105,7 @@
self.Type = 0
self.StartIndex = 0
self.WatchCnt = 0
- self.IsWatchSelf = 0
+ self.WatchID = 0
return
def GetLength(self):
@@ -1121,7 +1121,7 @@
Type:%d,
StartIndex:%d,
WatchCnt:%d,
- IsWatchSelf:%d
+ WatchID:%d
'''\
%(
self.Cmd,
@@ -1129,7 +1129,7 @@
self.Type,
self.StartIndex,
self.WatchCnt,
- self.IsWatchSelf
+ self.WatchID
)
return DumpString
@@ -2379,6 +2379,66 @@
m_NAtagCGUseAssistThanksGift=tagCGUseAssistThanksGift()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGUseAssistThanksGift.Cmd,m_NAtagCGUseAssistThanksGift.SubCmd))] = m_NAtagCGUseAssistThanksGift
+
+
+#------------------------------------------------------
+# B0 20 请求膜拜玩家 #tagCGWorship
+
+class tagCGWorship(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("PlayerID", c_int), # 目标玩家ID
+ ("WorshipType", c_ubyte), # 膜拜类型
+ ("WorshipValue", c_int), # 膜拜类型对应的功能值，如名次或其他，由具体膜拜类型定义对应值含义
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB0
+ self.SubCmd = 0x20
+ 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 = 0x20
+ self.PlayerID = 0
+ self.WorshipType = 0
+ self.WorshipValue = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCGWorship)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B0 20 请求膜拜玩家 //tagCGWorship:
+ Cmd:%s,
+ SubCmd:%s,
+ PlayerID:%d,
+ WorshipType:%d,
+ WorshipValue:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.PlayerID,
+ self.WorshipType,
+ self.WorshipValue
+ )
+ return DumpString
+
+
+m_NAtagCGWorship=tagCGWorship()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGWorship.Cmd,m_NAtagCGWorship.SubCmd))] = m_NAtagCGWorship
#------------------------------------------------------
@@ -4613,6 +4673,9 @@
("Type", c_ubyte), #榜单类型
("GroupValue1", c_ubyte), # 分组值1
("GroupValue2", c_ubyte), # 分组值2，与分组值1组合归为同组榜单数据
+ ("StartIndex", c_int), #查看的起始名次索引， 默认0
+ ("WatchCnt", c_ubyte), #查看条数，默认20，最大不超过100
+ ("WatchID", c_int), #查看指定ID名次前后，如玩家ID、家族ID等
]
def __init__(self):
@@ -4632,6 +4695,9 @@
self.Type = 0
self.GroupValue1 = 0
self.GroupValue2 = 0
+ self.StartIndex = 0
+ self.WatchCnt = 0
+ self.WatchID = 0
return
def GetLength(self):
@@ -4646,14 +4712,20 @@
SubCmd:%s,
Type:%d,
GroupValue1:%d,
- GroupValue2:%d
+ GroupValue2:%d,
+ StartIndex:%d,
+ WatchCnt:%d,
+ WatchID:%d
'''\
%(
self.Cmd,
self.SubCmd,
self.Type,
self.GroupValue1,
- self.GroupValue2
+ self.GroupValue2,
+ self.StartIndex,
+ self.WatchCnt,
+ self.WatchID
)
return DumpString
@@ -5092,7 +5164,7 @@
_fields_ = [
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
- ("RecordID", c_ubyte), #充值记录ID，也就是充值ID，发0则查全部
+ ("RecordID", c_ushort), #充值记录ID，也就是充值ID，发0则查全部
]
def __init__(self):
@@ -5182,6 +5254,62 @@
m_NAtagCMRefreshMainServerRole=tagCMRefreshMainServerRole()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshMainServerRole.Cmd,m_NAtagCMRefreshMainServerRole.SubCmd))] = m_NAtagCMRefreshMainServerRole
+
+
+#------------------------------------------------------
+# A1 26 充值自选物品选择 #tagCMSelectCTGItem
+
+class tagCMSelectCTGItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("RecordID", c_ushort), #充值ID
+ ("SelectItemValue", c_int), # 自选物品索引值，每两位存储每个自选索引对应选择的物品索引+1，存储位值为0代表未选择，最多支持选择4种物品
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA1
+ self.SubCmd = 0x26
+ 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 = 0xA1
+ self.SubCmd = 0x26
+ self.RecordID = 0
+ self.SelectItemValue = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMSelectCTGItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A1 26 充值自选物品选择 //tagCMSelectCTGItem:
+ Cmd:%s,
+ SubCmd:%s,
+ RecordID:%d,
+ SelectItemValue:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.RecordID,
+ self.SelectItemValue
+ )
+ return DumpString
+
+
+m_NAtagCMSelectCTGItem=tagCMSelectCTGItem()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSelectCTGItem.Cmd,m_NAtagCMSelectCTGItem.SubCmd))] = m_NAtagCMSelectCTGItem
#------------------------------------------------------
@@ -18636,19 +18764,99 @@
# B2 22 砍树装备操作 #tagCMCutTreeEquipOP
class tagCMCutTreeEquipOP(Structure):
+ Head = tagHead()
+ IndexCount = 0 #(BYTE IndexCount)
+ ItemIndexList = list() #(vector<BYTE> ItemIndexList)// 物品在砍树背包的索引列表
+ OPType = 0 #(BYTE OPType)// 操作类型：1-替换；2-分解
+ AutoDecompose = 0 #(BYTE AutoDecompose)// 替换后是否自动分解原装备：0否1是，仅替换操作下有用
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x22
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.IndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.IndexCount):
+ value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
+ self.ItemIndexList.append(value)
+ self.OPType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.AutoDecompose,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x22
+ self.IndexCount = 0
+ self.ItemIndexList = list()
+ self.OPType = 0
+ self.AutoDecompose = 0
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1 * self.IndexCount
+ length += 1
+ length += 1
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.IndexCount)
+ for i in range(self.IndexCount):
+ data = CommFunc.WriteBYTE(data, self.ItemIndexList[i])
+ data = CommFunc.WriteBYTE(data, self.OPType)
+ data = CommFunc.WriteBYTE(data, self.AutoDecompose)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ IndexCount:%d,
+ ItemIndexList:%s,
+ OPType:%d,
+ AutoDecompose:%d
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.IndexCount,
+ "...",
+ self.OPType,
+ self.AutoDecompose
+ )
+ return DumpString
+
+
+m_NAtagCMCutTreeEquipOP=tagCMCutTreeEquipOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCutTreeEquipOP.Head.Cmd,m_NAtagCMCutTreeEquipOP.Head.SubCmd))] = m_NAtagCMCutTreeEquipOP
+
+
+#------------------------------------------------------
+# B2 25 新聚魂操作 #tagCMGatherTheSoulOP
+
+class tagCMGatherTheSoulOP(Structure):
_pack_ = 1
_fields_ = [
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
- ("ItemIndex", c_ubyte), # 物品在砍树背包的索引
- ("OPType", c_ubyte), # 操作类型：1-替换；2-分解
- ("AutoDecompose", c_ubyte), # 替换后是否自动分解原装备：0否1是，仅替换操作下有用
+ ("OpType", c_ubyte), # 0-激活升级; 1-穿戴替换; 2-卸下
+ ("SoulID", c_int), # 聚魂ID；当操作升级时，如果为0代表一键升级所有可升级的
]
def __init__(self):
self.Clear()
self.Cmd = 0xB2
- self.SubCmd = 0x22
+ self.SubCmd = 0x25
return
def ReadData(self, stringData, _pos=0, _len=0):
@@ -18658,38 +18866,35 @@
def Clear(self):
self.Cmd = 0xB2
- self.SubCmd = 0x22
- self.ItemIndex = 0
- self.OPType = 0
- self.AutoDecompose = 0
+ self.SubCmd = 0x25
+ self.OpType = 0
+ self.SoulID = 0
return
def GetLength(self):
- return sizeof(tagCMCutTreeEquipOP)
+ return sizeof(tagCMGatherTheSoulOP)
def GetBuffer(self):
return string_at(addressof(self), self.GetLength())
def OutputString(self):
- DumpString = '''// B2 22 砍树装备操作 //tagCMCutTreeEquipOP:
+ DumpString = '''// B2 25 新聚魂操作 //tagCMGatherTheSoulOP:
Cmd:%s,
SubCmd:%s,
- ItemIndex:%d,
- OPType:%d,
- AutoDecompose:%d
+ OpType:%d,
+ SoulID:%d
'''\
%(
self.Cmd,
self.SubCmd,
- self.ItemIndex,
- self.OPType,
- self.AutoDecompose
+ self.OpType,
+ self.SoulID
)
return DumpString
-m_NAtagCMCutTreeEquipOP=tagCMCutTreeEquipOP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCutTreeEquipOP.Cmd,m_NAtagCMCutTreeEquipOP.SubCmd))] = m_NAtagCMCutTreeEquipOP
+m_NAtagCMGatherTheSoulOP=tagCMGatherTheSoulOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGatherTheSoulOP.Cmd,m_NAtagCMGatherTheSoulOP.SubCmd))] = m_NAtagCMGatherTheSoulOP
#------------------------------------------------------
@@ -19404,6 +19609,62 @@
m_NAtagCMTreeLVUP=tagCMTreeLVUP()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTreeLVUP.Cmd,m_NAtagCMTreeLVUP.SubCmd))] = m_NAtagCMTreeLVUP
+
+
+#------------------------------------------------------
+# B2 24 使用仙树升级减时物品 #tagCMUseTreeLVUPTimeItem
+
+class tagCMUseTreeLVUPTimeItem(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("UseCount", c_int), # 使用个数
+ ("IsAutoBuy", c_ubyte), # 不足个数是否自动购买
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x24
+ 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 = 0xB2
+ self.SubCmd = 0x24
+ self.UseCount = 0
+ self.IsAutoBuy = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMUseTreeLVUPTimeItem)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B2 24 使用仙树升级减时物品 //tagCMUseTreeLVUPTimeItem:
+ Cmd:%s,
+ SubCmd:%s,
+ UseCount:%d,
+ IsAutoBuy:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.UseCount,
+ self.IsAutoBuy
+ )
+ return DumpString
+
+
+m_NAtagCMUseTreeLVUPTimeItem=tagCMUseTreeLVUPTimeItem()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUseTreeLVUPTimeItem.Cmd,m_NAtagCMUseTreeLVUPTimeItem.SubCmd))] = m_NAtagCMUseTreeLVUPTimeItem
#------------------------------------------------------
@@ -20870,60 +21131,95 @@
# B4 10 回合制战斗 #tagCMTurnFight
class tagCMTurnFight(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("MapID", c_int), # 自定义地图ID，可用于绑定战斗场景功能（如野外关卡，爬塔功能，竞技场等）
- ("FuncLineID", c_ushort),
- ("PlayerID", c_int), # 对应玩家ID，可为0，某些功能可能有用，如竞技场
- ]
+ Head = tagHead()
+ MapID = 0 #(DWORD MapID)// 自定义地图ID，可用于绑定战斗场景功能（如野外关卡，爬塔功能，竞技场等）
+ FuncLineID = 0 #(WORD FuncLineID)
+ TagType = 0 #(BYTE TagType)// 战斗目标类型，0-NPC，1-玩家，2-队伍
+ TagID = 0 #(DWORD TagID)// 战斗目标类型对应的ID
+ ValueCount = 0 #(BYTE ValueCount)
+ ValueList = list() #(vector<DWORD> ValueList)// 附加值列表，可选，具体含义由MapID决定
+ data = None
def __init__(self):
self.Clear()
- self.Cmd = 0xB4
- self.SubCmd = 0x10
+ self.Head.Cmd = 0xB4
+ self.Head.SubCmd = 0x10
return
- def ReadData(self, stringData, _pos=0, _len=0):
+ def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.FuncLineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.TagType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.TagID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.ValueCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.ValueCount):
+ value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+ self.ValueList.append(value)
+ return _pos
def Clear(self):
- self.Cmd = 0xB4
- self.SubCmd = 0x10
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB4
+ self.Head.SubCmd = 0x10
self.MapID = 0
self.FuncLineID = 0
- self.PlayerID = 0
+ self.TagType = 0
+ self.TagID = 0
+ self.ValueCount = 0
+ self.ValueList = list()
return
def GetLength(self):
- return sizeof(tagCMTurnFight)
+ length = 0
+ length += self.Head.GetLength()
+ length += 4
+ length += 2
+ length += 1
+ length += 4
+ length += 1
+ length += 4 * self.ValueCount
+
+ return length
def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteDWORD(data, self.MapID)
+ data = CommFunc.WriteWORD(data, self.FuncLineID)
+ data = CommFunc.WriteBYTE(data, self.TagType)
+ data = CommFunc.WriteDWORD(data, self.TagID)
+ data = CommFunc.WriteBYTE(data, self.ValueCount)
+ for i in range(self.ValueCount):
+ data = CommFunc.WriteDWORD(data, self.ValueList[i])
+ return data
def OutputString(self):
- DumpString = '''// B4 10 回合制战斗 //tagCMTurnFight:
- Cmd:%s,
- SubCmd:%s,
+ DumpString = '''
+ Head:%s,
MapID:%d,
FuncLineID:%d,
- PlayerID:%d
+ TagType:%d,
+ TagID:%d,
+ ValueCount:%d,
+ ValueList:%s
'''\
%(
- self.Cmd,
- self.SubCmd,
+ self.Head.OutputString(),
self.MapID,
self.FuncLineID,
- self.PlayerID
+ self.TagType,
+ self.TagID,
+ self.ValueCount,
+ "..."
)
return DumpString
m_NAtagCMTurnFight=tagCMTurnFight()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTurnFight.Cmd,m_NAtagCMTurnFight.SubCmd))] = m_NAtagCMTurnFight
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTurnFight.Head.Cmd,m_NAtagCMTurnFight.Head.SubCmd))] = m_NAtagCMTurnFight
#------------------------------------------------------
--
Gitblit v1.8.0