From 24bac6db1ab91c1c81322bc94b033a753c4394c8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 30 一月 2026 17:06:50 +0800
Subject: [PATCH] 412 【挑战】定军阁-服务端（修复开启自动一键选择时如果只剩下当前未选择的时候无法自动选择的bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 1171 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 851 insertions(+), 320 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 475dfb6..ec4969b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -4769,227 +4769,6 @@
#------------------------------------------------------
-# A5 71 命格分解 #tagCMBirthChartDecompose
-
-class tagCMBirthChartDecompose(Structure):
- Head = tagHead()
- IsAll = 0 #(BYTE IsAll)// 是否全部分解，优先级最高，锁定除外
- QualityCnt = 0 #(BYTE QualityCnt)// 按全部分解品质数
- QualityList = list() #(vector<BYTE> QualityList)// 全部分解的品质列表，发送的品质会全部分解，锁定除外
- Count = 0 #(BYTE Count)// 指定批量分解数，最大不超过50个
- PlaceIndexList = list() #(vector<WORD> PlaceIndexList)// 批量分解位置索引列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xA5
- self.Head.SubCmd = 0x71
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.IsAll,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.QualityCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.QualityCnt):
- value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
- self.QualityList.append(value)
- self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.Count):
- value,_pos=CommFunc.ReadWORD(_lpData,_pos)
- self.PlaceIndexList.append(value)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xA5
- self.Head.SubCmd = 0x71
- self.IsAll = 0
- self.QualityCnt = 0
- self.QualityList = list()
- self.Count = 0
- self.PlaceIndexList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 1
- length += 1 * self.QualityCnt
- length += 1
- length += 2 * self.Count
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.IsAll)
- data = CommFunc.WriteBYTE(data, self.QualityCnt)
- for i in range(self.QualityCnt):
- data = CommFunc.WriteBYTE(data, self.QualityList[i])
- data = CommFunc.WriteBYTE(data, self.Count)
- for i in range(self.Count):
- data = CommFunc.WriteWORD(data, self.PlaceIndexList[i])
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- IsAll:%d,
- QualityCnt:%d,
- QualityList:%s,
- Count:%d,
- PlaceIndexList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.IsAll,
- self.QualityCnt,
- "...",
- self.Count,
- "..."
- )
- return DumpString
-
-
-m_NAtagCMBirthChartDecompose=tagCMBirthChartDecompose()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBirthChartDecompose.Head.Cmd,m_NAtagCMBirthChartDecompose.Head.SubCmd))] = m_NAtagCMBirthChartDecompose
-
-
-#------------------------------------------------------
-# A5 72 命格锁定状态变更 #tagCMBirthChartLock
-
-class tagCMBirthChartLock(Structure):
- Head = tagHead()
- LockState = 0 #(BYTE LockState)// 锁定状态， 0-锁定，1-解锁
- Count = 0 #(BYTE Count)// 批量操作数，最大不超过50个
- PlaceIndexList = list() #(vector<WORD> PlaceIndexList)// 批量操作位置索引列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xA5
- self.Head.SubCmd = 0x72
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.LockState,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.Count):
- value,_pos=CommFunc.ReadWORD(_lpData,_pos)
- self.PlaceIndexList.append(value)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xA5
- self.Head.SubCmd = 0x72
- self.LockState = 0
- self.Count = 0
- self.PlaceIndexList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 1
- length += 2 * self.Count
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.LockState)
- data = CommFunc.WriteBYTE(data, self.Count)
- for i in range(self.Count):
- data = CommFunc.WriteWORD(data, self.PlaceIndexList[i])
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- LockState:%d,
- Count:%d,
- PlaceIndexList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.LockState,
- self.Count,
- "..."
- )
- return DumpString
-
-
-m_NAtagCMBirthChartLock=tagCMBirthChartLock()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBirthChartLock.Head.Cmd,m_NAtagCMBirthChartLock.Head.SubCmd))] = m_NAtagCMBirthChartLock
-
-
-#------------------------------------------------------
-# A5 70 命格升级 #tagCMBirthChartUp
-
-class tagCMBirthChartUp(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("PlaceType", c_ubyte), # 位置类型；0-命格背包，1-命格孔
- ("PlaceIndex", c_ushort), # 位置索引
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x70
- 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 = 0x70
- self.PlaceType = 0
- self.PlaceIndex = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMBirthChartUp)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 70 命格升级 //tagCMBirthChartUp:
- Cmd:%s,
- SubCmd:%s,
- PlaceType:%d,
- PlaceIndex:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.PlaceType,
- self.PlaceIndex
- )
- return DumpString
-
-
-m_NAtagCMBirthChartUp=tagCMBirthChartUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBirthChartUp.Cmd,m_NAtagCMBirthChartUp.SubCmd))] = m_NAtagCMBirthChartUp
-
-
-#------------------------------------------------------
# A5 52 购买功能NPC采集次数 #tagCMBuyCollectionCnt
class tagCMBuyCollectionCnt(Structure):
@@ -6834,54 +6613,6 @@
#------------------------------------------------------
-# A5 69 刷新寻宝免费次数 #tagCMRefreshTreasureFreeCnt
-
-class tagCMRefreshTreasureFreeCnt(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x69
- 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 = 0x69
- return
-
- def GetLength(self):
- return sizeof(tagCMRefreshTreasureFreeCnt)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 69 刷新寻宝免费次数 //tagCMRefreshTreasureFreeCnt:
- Cmd:%s,
- SubCmd:%s
- '''\
- %(
- self.Cmd,
- self.SubCmd
- )
- return DumpString
-
-
-m_NAtagCMRefreshTreasureFreeCnt=tagCMRefreshTreasureFreeCnt()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshTreasureFreeCnt.Cmd,m_NAtagCMRefreshTreasureFreeCnt.SubCmd))] = m_NAtagCMRefreshTreasureFreeCnt
-
-
-#------------------------------------------------------
# A5 37 请求邮件操作 #tagCMRequestMail
class tagCMRequestMail(Structure):
@@ -7331,55 +7062,94 @@
#------------------------------------------------------
-# A5 73 解锁命格孔 #tagCMUnLockBirthChartHole
+# A5 69 寻宝心愿物品选择 #tagCSTreasureWishSelect
-class tagCMUnLockBirthChartHole(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("BirthChartIndex", c_ubyte), # 孔索引
- ]
+class tagCSTreasureWishSelect(Structure):
+ Head = tagHead()
+ TreasureType = 0 #(BYTE TreasureType)//寻宝类型
+ WishCnt = 0 #(BYTE WishCnt)
+ WishIDList = list() #(vector<DWORD> WishIDList)// 选择的寻宝物品库中的数据ID，注意不是库ID
+ WishCardUseCnt = 0 #(BYTE WishCardUseCnt)
+ WishCardUseLibIDList = list() #(vector<WORD> WishCardUseLibIDList)// 使用心愿卡的库ID列表
+ data = None
def __init__(self):
self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x73
+ self.Head.Cmd = 0xA5
+ self.Head.SubCmd = 0x69
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.TreasureType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.WishCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.WishCnt):
+ value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+ self.WishIDList.append(value)
+ self.WishCardUseCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.WishCardUseCnt):
+ value,_pos=CommFunc.ReadWORD(_lpData,_pos)
+ self.WishCardUseLibIDList.append(value)
+ return _pos
def Clear(self):
- self.Cmd = 0xA5
- self.SubCmd = 0x73
- self.BirthChartIndex = 0
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xA5
+ self.Head.SubCmd = 0x69
+ self.TreasureType = 0
+ self.WishCnt = 0
+ self.WishIDList = list()
+ self.WishCardUseCnt = 0
+ self.WishCardUseLibIDList = list()
return
def GetLength(self):
- return sizeof(tagCMUnLockBirthChartHole)
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 4 * self.WishCnt
+ length += 1
+ length += 2 * self.WishCardUseCnt
+
+ 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.WriteBYTE(data, self.TreasureType)
+ data = CommFunc.WriteBYTE(data, self.WishCnt)
+ for i in range(self.WishCnt):
+ data = CommFunc.WriteDWORD(data, self.WishIDList[i])
+ data = CommFunc.WriteBYTE(data, self.WishCardUseCnt)
+ for i in range(self.WishCardUseCnt):
+ data = CommFunc.WriteWORD(data, self.WishCardUseLibIDList[i])
+ return data
def OutputString(self):
- DumpString = '''// A5 73 解锁命格孔 //tagCMUnLockBirthChartHole:
- Cmd:%s,
- SubCmd:%s,
- BirthChartIndex:%d
+ DumpString = '''
+ Head:%s,
+ TreasureType:%d,
+ WishCnt:%d,
+ WishIDList:%s,
+ WishCardUseCnt:%d,
+ WishCardUseLibIDList:%s
'''\
%(
- self.Cmd,
- self.SubCmd,
- self.BirthChartIndex
+ self.Head.OutputString(),
+ self.TreasureType,
+ self.WishCnt,
+ "...",
+ self.WishCardUseCnt,
+ "..."
)
return DumpString
-m_NAtagCMUnLockBirthChartHole=tagCMUnLockBirthChartHole()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUnLockBirthChartHole.Cmd,m_NAtagCMUnLockBirthChartHole.SubCmd))] = m_NAtagCMUnLockBirthChartHole
+m_NAtagCSTreasureWishSelect=tagCSTreasureWishSelect()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSTreasureWishSelect.Head.Cmd,m_NAtagCSTreasureWishSelect.Head.SubCmd))] = m_NAtagCSTreasureWishSelect
#------------------------------------------------------
@@ -10941,6 +10711,140 @@
#------------------------------------------------------
+# B1 02 定军阁效果选择 #tagCSDingjungeEffSelect
+
+class tagCSDingjungeEffSelect(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("SelectType", c_ubyte), #0-手动选择，1-放弃本次选择，2-一键选择（仅开启了自动选择时有效）
+ ("SelectIndex", c_ubyte), #手动选择索引 0~n
+ ("ReplaceHole", c_ubyte), #手动选择替换槽位 1~n，槽位=槽索引+1，升级时可直接发0
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB1
+ self.SubCmd = 0x02
+ 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 = 0xB1
+ self.SubCmd = 0x02
+ self.SelectType = 0
+ self.SelectIndex = 0
+ self.ReplaceHole = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSDingjungeEffSelect)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B1 02 定军阁效果选择 //tagCSDingjungeEffSelect:
+ Cmd:%s,
+ SubCmd:%s,
+ SelectType:%d,
+ SelectIndex:%d,
+ ReplaceHole:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.SelectType,
+ self.SelectIndex,
+ self.ReplaceHole
+ )
+ return DumpString
+
+
+m_NAtagCSDingjungeEffSelect=tagCSDingjungeEffSelect()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSDingjungeEffSelect.Cmd,m_NAtagCSDingjungeEffSelect.SubCmd))] = m_NAtagCSDingjungeEffSelect
+
+
+#------------------------------------------------------
+# B1 01 定军阁效果预设 #tagCSDingjungeEffSet
+
+class tagCSDingjungeEffSet(Structure):
+ Head = tagHead()
+ SelectAuto = 0 #(BYTE SelectAuto)//是否启用自动选择
+ SelectSetCnt = 0 #(BYTE SelectSetCnt)
+ SelectSetAttrIDList = list() #(vector<WORD> SelectSetAttrIDList)//预设优先选择属性ID列表 [优先级1属性ID, ...]
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x01
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.SelectAuto,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.SelectSetCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.SelectSetCnt):
+ value,_pos=CommFunc.ReadWORD(_lpData,_pos)
+ self.SelectSetAttrIDList.append(value)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x01
+ self.SelectAuto = 0
+ self.SelectSetCnt = 0
+ self.SelectSetAttrIDList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 2 * self.SelectSetCnt
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.SelectAuto)
+ data = CommFunc.WriteBYTE(data, self.SelectSetCnt)
+ for i in range(self.SelectSetCnt):
+ data = CommFunc.WriteWORD(data, self.SelectSetAttrIDList[i])
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ SelectAuto:%d,
+ SelectSetCnt:%d,
+ SelectSetAttrIDList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.SelectAuto,
+ self.SelectSetCnt,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagCSDingjungeEffSet=tagCSDingjungeEffSet()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSDingjungeEffSet.Head.Cmd,m_NAtagCSDingjungeEffSet.Head.SubCmd))] = m_NAtagCSDingjungeEffSet
+
+
+#------------------------------------------------------
# B1 08 快速一键过关副本 #tagCMFBQuickPass
class tagCMFBQuickPass(Structure):
@@ -11193,6 +11097,62 @@
#------------------------------------------------------
+# B2 63 战斗预设切换 #tagCSBatPresetSwitch
+
+class tagCSBatPresetSwitch(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("BatPresetType", c_ubyte), #战斗预设类型：1-主线战斗；2-演武场防守；
+ ("BatPresetID", c_ubyte), #切换至目标战斗预设ID
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x63
+ 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 = 0x63
+ self.BatPresetType = 0
+ self.BatPresetID = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSBatPresetSwitch)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B2 63 战斗预设切换 //tagCSBatPresetSwitch:
+ Cmd:%s,
+ SubCmd:%s,
+ BatPresetType:%d,
+ BatPresetID:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.BatPresetType,
+ self.BatPresetID
+ )
+ return DumpString
+
+
+m_NAtagCSBatPresetSwitch=tagCSBatPresetSwitch()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSBatPresetSwitch.Cmd,m_NAtagCSBatPresetSwitch.SubCmd))] = m_NAtagCSBatPresetSwitch
+
+
+#------------------------------------------------------
# B2 19 红颜激活 #tagCSBeautyActivate
class tagCSBeautyActivate(Structure):
@@ -11362,6 +11322,200 @@
m_NAtagCSBeautySkinOP=tagCSBeautySkinOP()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSBeautySkinOP.Cmd,m_NAtagCSBeautySkinOP.SubCmd))] = m_NAtagCSBeautySkinOP
+
+
+#------------------------------------------------------
+# B2 62 功能预设切换 #tagCSFuncPresetSwitch
+
+class tagCSFuncPresetSwitch(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("BatPresetID", c_ubyte), #所属战斗预设ID
+ ("FuncPresetType", c_ubyte), #预设类型，2-阵容；3-命格；
+ ("PresetID", c_ubyte), #本功能切换至目标预设ID
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x62
+ 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 = 0x62
+ self.BatPresetID = 0
+ self.FuncPresetType = 0
+ self.PresetID = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSFuncPresetSwitch)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B2 62 功能预设切换 //tagCSFuncPresetSwitch:
+ Cmd:%s,
+ SubCmd:%s,
+ BatPresetID:%d,
+ FuncPresetType:%d,
+ PresetID:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.BatPresetID,
+ self.FuncPresetType,
+ self.PresetID
+ )
+ return DumpString
+
+
+m_NAtagCSFuncPresetSwitch=tagCSFuncPresetSwitch()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSFuncPresetSwitch.Cmd,m_NAtagCSFuncPresetSwitch.SubCmd))] = m_NAtagCSFuncPresetSwitch
+
+
+#------------------------------------------------------
+# B2 60 功能预设解锁 #tagCSFuncPresetUnlock
+
+class tagCSFuncPresetUnlock(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("FuncPresetType", c_ubyte), #预设类型，1-全局；2-阵容；3-命格；
+ ("PresetID", c_ubyte), #预设ID
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x60
+ 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 = 0x60
+ self.FuncPresetType = 0
+ self.PresetID = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSFuncPresetUnlock)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B2 60 功能预设解锁 //tagCSFuncPresetUnlock:
+ Cmd:%s,
+ SubCmd:%s,
+ FuncPresetType:%d,
+ PresetID:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.FuncPresetType,
+ self.PresetID
+ )
+ return DumpString
+
+
+m_NAtagCSFuncPresetUnlock=tagCSFuncPresetUnlock()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSFuncPresetUnlock.Cmd,m_NAtagCSFuncPresetUnlock.SubCmd))] = m_NAtagCSFuncPresetUnlock
+
+
+#------------------------------------------------------
+# B2 61 功能预设改名 #tagCSFuncPresetUpdName
+
+class tagCSFuncPresetUpdName(Structure):
+ Head = tagHead()
+ FuncPresetType = 0 #(BYTE FuncPresetType)//预设类型，1-全局；2-阵容；3-命格；
+ PresetID = 0 #(BYTE PresetID)//预设ID
+ NameLen = 0 #(BYTE NameLen)
+ PresetName = "" #(String PresetName)//预设名称
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x61
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.FuncPresetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.PresetID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.PresetName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x61
+ self.FuncPresetType = 0
+ self.PresetID = 0
+ self.NameLen = 0
+ self.PresetName = ""
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 1
+ length += len(self.PresetName)
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.FuncPresetType)
+ data = CommFunc.WriteBYTE(data, self.PresetID)
+ data = CommFunc.WriteBYTE(data, self.NameLen)
+ data = CommFunc.WriteString(data, self.NameLen, self.PresetName)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ FuncPresetType:%d,
+ PresetID:%d,
+ NameLen:%d,
+ PresetName:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.FuncPresetType,
+ self.PresetID,
+ self.NameLen,
+ self.PresetName
+ )
+ return DumpString
+
+
+m_NAtagCSFuncPresetUpdName=tagCSFuncPresetUpdName()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSFuncPresetUpdName.Head.Cmd,m_NAtagCSFuncPresetUpdName.Head.SubCmd))] = m_NAtagCSFuncPresetUpdName
#------------------------------------------------------
@@ -11860,6 +12014,87 @@
#------------------------------------------------------
+# B2 41 武将宿缘 #tagCSHeroFates
+
+class tagCSHeroFates(Structure):
+ Head = tagHead()
+ FatesID = 0 #(BYTE FatesID)// 宿缘ID
+ OPType = 0 #(BYTE OPType)// 0-激活领奖；1-升级
+ IndexCnt = 0 #(BYTE IndexCnt)
+ ItemIndexList = list() #(vector<WORD> ItemIndexList)// 升级时消耗的材料卡在武将背包索引列表，升级时才发
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x41
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.FatesID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.OPType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.IndexCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.IndexCnt):
+ value,_pos=CommFunc.ReadWORD(_lpData,_pos)
+ self.ItemIndexList.append(value)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x41
+ self.FatesID = 0
+ self.OPType = 0
+ self.IndexCnt = 0
+ self.ItemIndexList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 1
+ length += 2 * self.IndexCnt
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.FatesID)
+ data = CommFunc.WriteBYTE(data, self.OPType)
+ data = CommFunc.WriteBYTE(data, self.IndexCnt)
+ for i in range(self.IndexCnt):
+ data = CommFunc.WriteWORD(data, self.ItemIndexList[i])
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ FatesID:%d,
+ OPType:%d,
+ IndexCnt:%d,
+ ItemIndexList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.FatesID,
+ self.OPType,
+ self.IndexCnt,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagCSHeroFates=tagCSHeroFates()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHeroFates.Head.Cmd,m_NAtagCSHeroFates.Head.SubCmd))] = m_NAtagCSHeroFates
+
+
+#------------------------------------------------------
# B2 38 武将锁定 #tagCSHeroLock
class tagCSHeroLock(Structure):
@@ -11976,6 +12211,9 @@
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
("ItemIndex", c_ushort), #武将物品所在武将背包位置索引
+ ("LVReset", c_ubyte), #重置等级
+ ("BreakReset", c_ubyte), #重置突破
+ ("AwakeReset", c_ubyte), #重置觉醒
]
def __init__(self):
@@ -11993,6 +12231,9 @@
self.Cmd = 0xB2
self.SubCmd = 0x39
self.ItemIndex = 0
+ self.LVReset = 0
+ self.BreakReset = 0
+ self.AwakeReset = 0
return
def GetLength(self):
@@ -12005,12 +12246,18 @@
DumpString = '''// B2 39 武将重生 //tagCSHeroRebirth:
Cmd:%s,
SubCmd:%s,
- ItemIndex:%d
+ ItemIndex:%d,
+ LVReset:%d,
+ BreakReset:%d,
+ AwakeReset:%d
'''\
%(
self.Cmd,
self.SubCmd,
- self.ItemIndex
+ self.ItemIndex,
+ self.LVReset,
+ self.BreakReset,
+ self.AwakeReset
)
return DumpString
@@ -12426,6 +12673,237 @@
m_NAtagCSHorseLVUP=tagCSHorseLVUP()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHorseLVUP.Cmd,m_NAtagCSHorseLVUP.SubCmd))] = m_NAtagCSHorseLVUP
+
+
+#------------------------------------------------------
+# B2 51 命格分解 #tagCSMinggeDecompose
+
+class tagCSMinggeDecompose(Structure):
+ Head = tagHead()
+ Count = 0 #(BYTE Count)
+ IndexList = list() #(vector<BYTE> IndexList)// 推演背包中的物品格子索引列表
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x51
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.Count):
+ value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
+ self.IndexList.append(value)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x51
+ self.Count = 0
+ self.IndexList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1 * self.Count
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.Count)
+ for i in range(self.Count):
+ data = CommFunc.WriteBYTE(data, self.IndexList[i])
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ Count:%d,
+ IndexList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.Count,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagCSMinggeDecompose=tagCSMinggeDecompose()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSMinggeDecompose.Head.Cmd,m_NAtagCSMinggeDecompose.Head.SubCmd))] = m_NAtagCSMinggeDecompose
+
+
+#------------------------------------------------------
+# B2 52 命格装备替换 #tagCSMinggeEquip
+
+class tagCSMinggeEquip(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("MGNum", c_ubyte), # 装到哪一套命格，目前支持3套，从1开始
+ ("Index", c_ubyte), # 推演背包中的物品格子索引
+ ("AutoDec", c_ubyte), # 是否自动分解
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x52
+ 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 = 0x52
+ self.MGNum = 0
+ self.Index = 0
+ self.AutoDec = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSMinggeEquip)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B2 52 命格装备替换 //tagCSMinggeEquip:
+ Cmd:%s,
+ SubCmd:%s,
+ MGNum:%d,
+ Index:%d,
+ AutoDec:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.MGNum,
+ self.Index,
+ self.AutoDec
+ )
+ return DumpString
+
+
+m_NAtagCSMinggeEquip=tagCSMinggeEquip()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSMinggeEquip.Cmd,m_NAtagCSMinggeEquip.SubCmd))] = m_NAtagCSMinggeEquip
+
+
+#------------------------------------------------------
+# B2 53 命格祈灵#tagCSMinggeQiling
+
+class tagCSMinggeQiling(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("UseCount", c_int), #使用个数
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x53
+ 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 = 0x53
+ self.UseCount = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSMinggeQiling)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B2 53 命格祈灵//tagCSMinggeQiling:
+ Cmd:%s,
+ SubCmd:%s,
+ UseCount:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.UseCount
+ )
+ return DumpString
+
+
+m_NAtagCSMinggeQiling=tagCSMinggeQiling()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSMinggeQiling.Cmd,m_NAtagCSMinggeQiling.SubCmd))] = m_NAtagCSMinggeQiling
+
+
+#------------------------------------------------------
+# B2 50 命格推演 #tagCSMinggeTuiyan
+
+class tagCSMinggeTuiyan(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("Count", c_ubyte), #推演个数
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x50
+ 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 = 0x50
+ self.Count = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSMinggeTuiyan)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B2 50 命格推演 //tagCSMinggeTuiyan:
+ Cmd:%s,
+ SubCmd:%s,
+ Count:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.Count
+ )
+ return DumpString
+
+
+m_NAtagCSMinggeTuiyan=tagCSMinggeTuiyan()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSMinggeTuiyan.Cmd,m_NAtagCSMinggeTuiyan.SubCmd))] = m_NAtagCSMinggeTuiyan
#------------------------------------------------------
@@ -13584,9 +14062,9 @@
#------------------------------------------------------
-# B4 12 战斗阵容保存 #tagCSHeroLineupSave
+# B4 12 战斗阵容预设保存 #tagCSHeroPresetSave
-class tagCSHeroLineupPos(Structure):
+class tagCSHeroPresetPos(Structure):
_pack_ = 1
_fields_ = [
("ItemIndex", c_ushort), #武将物品所在武将背包位置索引
@@ -13608,13 +14086,13 @@
return
def GetLength(self):
- return sizeof(tagCSHeroLineupPos)
+ return sizeof(tagCSHeroPresetPos)
def GetBuffer(self):
return string_at(addressof(self), self.GetLength())
def OutputString(self):
- DumpString = '''// B4 12 战斗阵容保存 //tagCSHeroLineupSave:
+ DumpString = '''// B4 12 战斗阵容预设保存 //tagCSHeroPresetSave:
ItemIndex:%d,
PosNum:%d
'''\
@@ -13625,12 +14103,11 @@
return DumpString
-class tagCSHeroLineupSave(Structure):
+class tagCSHeroPresetSave(Structure):
Head = tagHead()
- LineupID = 0 #(BYTE LineupID)//阵容ID：1-主阵容；其他待扩展，如某个防守阵容
- ShapeType = 0 #(BYTE ShapeType)//本阵容阵型，0为默认阵型，可扩展不同的阵型
+ PresetID = 0 #(BYTE PresetID)//阵容方案预设ID
PosCnt = 0 #(BYTE PosCnt)
- HeroPosList = list() #(vector<tagCSHeroLineupPos> HeroPosList)// 保存的阵容，只发送最终的阵容武将位置即可
+ HeroPosList = list() #(vector<tagCSHeroPresetPos> HeroPosList)// 保存的阵容，只发送最终的阵容武将位置即可
data = None
def __init__(self):
@@ -13642,11 +14119,10 @@
def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
_pos = self.Head.ReadData(_lpData, _pos)
- self.LineupID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.ShapeType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.PresetID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.PosCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.PosCnt):
- temHeroPosList = tagCSHeroLineupPos()
+ temHeroPosList = tagCSHeroPresetPos()
_pos = temHeroPosList.ReadData(_lpData, _pos)
self.HeroPosList.append(temHeroPosList)
return _pos
@@ -13656,8 +14132,7 @@
self.Head.Clear()
self.Head.Cmd = 0xB4
self.Head.SubCmd = 0x12
- self.LineupID = 0
- self.ShapeType = 0
+ self.PresetID = 0
self.PosCnt = 0
self.HeroPosList = list()
return
@@ -13665,7 +14140,6 @@
def GetLength(self):
length = 0
length += self.Head.GetLength()
- length += 1
length += 1
length += 1
for i in range(self.PosCnt):
@@ -13676,8 +14150,7 @@
def GetBuffer(self):
data = ''
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.LineupID)
- data = CommFunc.WriteBYTE(data, self.ShapeType)
+ data = CommFunc.WriteBYTE(data, self.PresetID)
data = CommFunc.WriteBYTE(data, self.PosCnt)
for i in range(self.PosCnt):
data = CommFunc.WriteString(data, self.HeroPosList[i].GetLength(), self.HeroPosList[i].GetBuffer())
@@ -13686,23 +14159,21 @@
def OutputString(self):
DumpString = '''
Head:%s,
- LineupID:%d,
- ShapeType:%d,
+ PresetID:%d,
PosCnt:%d,
HeroPosList:%s
'''\
%(
self.Head.OutputString(),
- self.LineupID,
- self.ShapeType,
+ self.PresetID,
self.PosCnt,
"..."
)
return DumpString
-m_NAtagCSHeroLineupSave=tagCSHeroLineupSave()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHeroLineupSave.Head.Cmd,m_NAtagCSHeroLineupSave.Head.SubCmd))] = m_NAtagCSHeroLineupSave
+m_NAtagCSHeroPresetSave=tagCSHeroPresetSave()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHeroPresetSave.Head.Cmd,m_NAtagCSHeroPresetSave.Head.SubCmd))] = m_NAtagCSHeroPresetSave
#------------------------------------------------------
@@ -14907,6 +15378,66 @@
#------------------------------------------------------
+# B4 16 查看NPC属性 #tagCSViewNPCAttr
+
+class tagCSViewNPCAttr(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("MapID", c_int), # 自定义地图ID，可用于绑定战斗地图场景功能（如主线boss、爬塔、竞技场等）
+ ("FuncLineID", c_int), # MapID对应的扩展值，如具体某个关卡等
+ ("ViewNPCID", c_int), # 指定查看某个NPCID，发0则查看该关卡阵容所有NPC
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB4
+ self.SubCmd = 0x16
+ 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 = 0xB4
+ self.SubCmd = 0x16
+ self.MapID = 0
+ self.FuncLineID = 0
+ self.ViewNPCID = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCSViewNPCAttr)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B4 16 查看NPC属性 //tagCSViewNPCAttr:
+ Cmd:%s,
+ SubCmd:%s,
+ MapID:%d,
+ FuncLineID:%d,
+ ViewNPCID:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.MapID,
+ self.FuncLineID,
+ self.ViewNPCID
+ )
+ return DumpString
+
+
+m_NAtagCSViewNPCAttr=tagCSViewNPCAttr()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSViewNPCAttr.Cmd,m_NAtagCSViewNPCAttr.SubCmd))] = m_NAtagCSViewNPCAttr
+
+
+#------------------------------------------------------
# B5 18 拍卖行修改关注物品 #tagCGAttentionAuctionItemChange
class tagCGAttentionAuctionItemChange(Structure):
--
Gitblit v1.8.0