From 05251cfca26ce5f044923793da7c97597413ed1b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 八月 2025 19:18:54 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(主线掉落物品默认不堆叠;注:单个物品的个数可能大于1,单个战利品ID可能一次掉多个;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py |   70 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 8c1dd37..ab67681 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -18831,7 +18831,8 @@
     _pack_ = 1
     _fields_ = [
                   ("ItemID", c_int),    
-                  ("Count", c_int),    
+                  ("Count", c_int),    # 求余亿部分,个别功能单次汇总可能超20亿,如批量遣散,固统一规则
+                  ("CountEx", c_int),    # 整除亿部分
                   ("IsBind", c_ubyte),    
                   ]
 
@@ -18847,6 +18848,7 @@
     def Clear(self):
         self.ItemID = 0
         self.Count = 0
+        self.CountEx = 0
         self.IsBind = 0
         return
 
@@ -18860,11 +18862,13 @@
         DumpString = '''// A8 01 获得奖励信息 //tagMCGiveAwardInfo:
                                 ItemID:%d,
                                 Count:%d,
+                                CountEx:%d,
                                 IsBind:%d
                                 '''\
                                 %(
                                 self.ItemID,
                                 self.Count,
+                                self.CountEx,
                                 self.IsBind
                                 )
         return DumpString
@@ -19309,7 +19313,7 @@
 
 
 #------------------------------------------------------
-# A8 14 合成结果通知 #tagMCMakeItemAnswer
+# A8 14 操作结果通知 #tagMCMakeItemAnswer
 
 class  tagMCMakeItemAnswer(Structure):
     _pack_ = 1
@@ -19318,7 +19322,7 @@
                   ("SubCmd", c_ubyte),
                   ("MakeType", c_ubyte),    #类型		TMakeItemType
                   ("Result", c_ubyte),    #是否成功
-                  ("MakeItemID", c_int),    #合成的物品ID
+                  ("MakeValue", c_int),    #操作值,如合成时为合成的物品ID
                   ]
 
     def __init__(self):
@@ -19337,7 +19341,7 @@
         self.SubCmd = 0x14
         self.MakeType = 0
         self.Result = 0
-        self.MakeItemID = 0
+        self.MakeValue = 0
         return
 
     def GetLength(self):
@@ -19347,19 +19351,19 @@
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// A8 14 合成结果通知 //tagMCMakeItemAnswer:
+        DumpString = '''// A8 14 操作结果通知 //tagMCMakeItemAnswer:
                                 Cmd:%s,
                                 SubCmd:%s,
                                 MakeType:%d,
                                 Result:%d,
-                                MakeItemID:%d
+                                MakeValue:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
                                 self.MakeType,
                                 self.Result,
-                                self.MakeItemID
+                                self.MakeValue
                                 )
         return DumpString
 
@@ -44631,6 +44635,58 @@
 
 
 #------------------------------------------------------
+# B1 25 玩家武将公共信息 #tagSCPlayerHeroInfo
+
+class  tagSCPlayerHeroInfo(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("AwakeRebirthCnt", c_ubyte),    # 今日觉醒过的武将已重生次数
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB1
+        self.SubCmd = 0x25
+        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 = 0x25
+        self.AwakeRebirthCnt = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagSCPlayerHeroInfo)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B1 25 玩家武将公共信息 //tagSCPlayerHeroInfo:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                AwakeRebirthCnt:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.AwakeRebirthCnt
+                                )
+        return DumpString
+
+
+m_NAtagSCPlayerHeroInfo=tagSCPlayerHeroInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagSCPlayerHeroInfo.Cmd,m_NAtagSCPlayerHeroInfo.SubCmd))] = m_NAtagSCPlayerHeroInfo
+
+
+#------------------------------------------------------
 # B1 07 玩家点数信息 #tagMCRolePointInfo
 
 class  tagMCRolePointInfo(Structure):

--
Gitblit v1.8.0