From 21633503720673ff5d9074a3126e9ed652178594 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 13 十月 2025 15:17:47 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化战斗结算时机，修复某个阵营全部被击杀后在某些情况下不会马上结算的bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 95 ++++++++---------------------------------------
1 files changed, 16 insertions(+), 79 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 4371b83..4c239d2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -13432,15 +13432,18 @@
#------------------------------------------------------
# B2 17 古宝升星 #tagCMGubaoStarUp
-class tagCMGubaoPieceUse(Structure):
+class tagCMGubaoStarUp(Structure):
_pack_ = 1
_fields_ = [
- ("GubaoID", c_ushort), # 通用碎片古宝ID
- ("PieceCount", c_ushort), # 使用碎片个数
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("GubaoID", c_ushort),
]
def __init__(self):
self.Clear()
+ self.Cmd = 0xB2
+ self.SubCmd = 0x17
return
def ReadData(self, stringData, _pos=0, _len=0):
@@ -13449,99 +13452,33 @@
return _pos + self.GetLength()
def Clear(self):
+ self.Cmd = 0xB2
+ self.SubCmd = 0x17
self.GubaoID = 0
- self.PieceCount = 0
return
def GetLength(self):
- return sizeof(tagCMGubaoPieceUse)
+ return sizeof(tagCMGubaoStarUp)
def GetBuffer(self):
return string_at(addressof(self), self.GetLength())
def OutputString(self):
DumpString = '''// B2 17 古宝升星 //tagCMGubaoStarUp:
- GubaoID:%d,
- PieceCount:%d
+ Cmd:%s,
+ SubCmd:%s,
+ GubaoID:%d
'''\
%(
- self.GubaoID,
- self.PieceCount
- )
- return DumpString
-
-
-class tagCMGubaoStarUp(Structure):
- Head = tagHead()
- GubaoID = 0 #(WORD GubaoID)
- PieceSelectCount = 0 #(BYTE PieceSelectCount)
- CommPieceUseList = list() #(vector<tagCMGubaoPieceUse> CommPieceUseList)// 通用古宝碎片使用列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB2
- self.Head.SubCmd = 0x17
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.GubaoID,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.PieceSelectCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.PieceSelectCount):
- temCommPieceUseList = tagCMGubaoPieceUse()
- _pos = temCommPieceUseList.ReadData(_lpData, _pos)
- self.CommPieceUseList.append(temCommPieceUseList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB2
- self.Head.SubCmd = 0x17
- self.GubaoID = 0
- self.PieceSelectCount = 0
- self.CommPieceUseList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 2
- length += 1
- for i in range(self.PieceSelectCount):
- length += self.CommPieceUseList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteWORD(data, self.GubaoID)
- data = CommFunc.WriteBYTE(data, self.PieceSelectCount)
- for i in range(self.PieceSelectCount):
- data = CommFunc.WriteString(data, self.CommPieceUseList[i].GetLength(), self.CommPieceUseList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- GubaoID:%d,
- PieceSelectCount:%d,
- CommPieceUseList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.GubaoID,
- self.PieceSelectCount,
- "..."
+ self.Cmd,
+ self.SubCmd,
+ self.GubaoID
)
return DumpString
m_NAtagCMGubaoStarUp=tagCMGubaoStarUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGubaoStarUp.Head.Cmd,m_NAtagCMGubaoStarUp.Head.SubCmd))] = m_NAtagCMGubaoStarUp
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGubaoStarUp.Cmd,m_NAtagCMGubaoStarUp.SubCmd))] = m_NAtagCMGubaoStarUp
#------------------------------------------------------
--
Gitblit v1.8.0