From 5a91f4aa6a702388948d551158a2e92a65329834 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 14 十一月 2025 18:52:41 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(buff持续时间增加大回合支持;增加光环buff;优化攻击、治疗计算逻辑,甄宓、曹仁、董白平摊伤害技能支持;优化B427封包支持额外目标;优化dot、持续治疗结算逻辑及通知;)其他: 1. TurnFight 命令支持指定敌方武将阵容测试,直接在主线战斗 2. B424初始化前的血量变更0418通知屏蔽

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py |  145 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 133 insertions(+), 12 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index c2c0878..7f140e2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -40034,17 +40034,16 @@
 #------------------------------------------------------
 # B4 27 使用技能 #tagSCUseSkill
 
-class  tagSCUseSkillHurt(Structure):
+class  tagSCUseSkillHurtEx(Structure):
     _pack_ = 1
     _fields_ = [
-                  ("ObjID", c_int),    
-                  ("AttackTypes", c_int),    # 飘血类型汇总,支持多种类型并存,如无视防御且暴击同时被格挡,二进制或运算最终值;0-失败;1-普通;2-回血;5-格挡;6-无视防御;7-暴击;9-闪避
+                  ("ObjID", c_int),    # 额外目标,如溅射伤害、平摊伤害目标,非技能自身的主要目标
+                  ("AttackTypes", c_int),    # 飘血类型汇总,支持多种类型并存,如无视防御且暴击同时被格挡,二进制或运算最终值;0-失败;1-普通;2-回血;4-免疫;5-格挡;6-无视防御;7-暴击;8-击晕;9-闪避
                   ("HurtHP", c_int),    # 飘血值,求余亿部分
                   ("HurtHPEx", c_int),    # 飘血值,整除亿部分
                   ("CurHP", c_int),    # 更新剩余血量,求余亿部分
                   ("CurHPEx", c_int),    # 更新剩余血量,整除亿部分
                   ("SuckHP", c_int),    # 本次伤害转化的吸血量
-                  ("BounceHP", c_int),    # 本次伤害反弹的伤害量
                   ]
 
     def __init__(self):
@@ -40064,11 +40063,10 @@
         self.CurHP = 0
         self.CurHPEx = 0
         self.SuckHP = 0
-        self.BounceHP = 0
         return
 
     def GetLength(self):
-        return sizeof(tagSCUseSkillHurt)
+        return sizeof(tagSCUseSkillHurtEx)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
@@ -40081,8 +40079,110 @@
                                 HurtHPEx:%d,
                                 CurHP:%d,
                                 CurHPEx:%d,
+                                SuckHP:%d
+                                '''\
+                                %(
+                                self.ObjID,
+                                self.AttackTypes,
+                                self.HurtHP,
+                                self.HurtHPEx,
+                                self.CurHP,
+                                self.CurHPEx,
+                                self.SuckHP
+                                )
+        return DumpString
+
+
+class  tagSCUseSkillHurt(Structure):
+    ObjID = 0    #(DWORD ObjID)// 技能自身目标ID
+    AttackTypes = 0    #(DWORD AttackTypes)// 飘血类型汇总,支持多种类型并存,如无视防御且暴击同时被格挡,二进制或运算最终值;0-失败;1-普通;2-回血;4-免疫;5-格挡;6-无视防御;7-暴击;8-击晕;9-闪避
+    HurtHP = 0    #(DWORD HurtHP)// 飘血值,求余亿部分
+    HurtHPEx = 0    #(DWORD HurtHPEx)// 飘血值,整除亿部分
+    CurHP = 0    #(DWORD CurHP)// 更新剩余血量,求余亿部分
+    CurHPEx = 0    #(DWORD CurHPEx)// 更新剩余血量,整除亿部分
+    SuckHP = 0    #(DWORD SuckHP)// 本次伤害转化的吸血量
+    BounceHP = 0    #(DWORD BounceHP)// 本次伤害反弹的伤害量
+    HurtCountEx = 0    #(BYTE HurtCountEx)
+    HurtListEx = list()    #(vector<tagSCUseSkillHurtEx> HurtListEx)// 额外伤害目标列表,仅后端多次伤害的有效,如弹射的平摊伤害
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.ObjID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.AttackTypes,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.HurtHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.HurtHPEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.CurHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.CurHPEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.SuckHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.BounceHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.HurtCountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.HurtCountEx):
+            temHurtListEx = tagSCUseSkillHurtEx()
+            _pos = temHurtListEx.ReadData(_lpData, _pos)
+            self.HurtListEx.append(temHurtListEx)
+        return _pos
+
+    def Clear(self):
+        self.ObjID = 0
+        self.AttackTypes = 0
+        self.HurtHP = 0
+        self.HurtHPEx = 0
+        self.CurHP = 0
+        self.CurHPEx = 0
+        self.SuckHP = 0
+        self.BounceHP = 0
+        self.HurtCountEx = 0
+        self.HurtListEx = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 1
+        for i in range(self.HurtCountEx):
+            length += self.HurtListEx[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteDWORD(data, self.ObjID)
+        data = CommFunc.WriteDWORD(data, self.AttackTypes)
+        data = CommFunc.WriteDWORD(data, self.HurtHP)
+        data = CommFunc.WriteDWORD(data, self.HurtHPEx)
+        data = CommFunc.WriteDWORD(data, self.CurHP)
+        data = CommFunc.WriteDWORD(data, self.CurHPEx)
+        data = CommFunc.WriteDWORD(data, self.SuckHP)
+        data = CommFunc.WriteDWORD(data, self.BounceHP)
+        data = CommFunc.WriteBYTE(data, self.HurtCountEx)
+        for i in range(self.HurtCountEx):
+            data = CommFunc.WriteString(data, self.HurtListEx[i].GetLength(), self.HurtListEx[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                ObjID:%d,
+                                AttackTypes:%d,
+                                HurtHP:%d,
+                                HurtHPEx:%d,
+                                CurHP:%d,
+                                CurHPEx:%d,
                                 SuckHP:%d,
-                                BounceHP:%d
+                                BounceHP:%d,
+                                HurtCountEx:%d,
+                                HurtListEx:%s
                                 '''\
                                 %(
                                 self.ObjID,
@@ -40092,7 +40192,9 @@
                                 self.CurHP,
                                 self.CurHPEx,
                                 self.SuckHP,
-                                self.BounceHP
+                                self.BounceHP,
+                                self.HurtCountEx,
+                                "..."
                                 )
         return DumpString
 
@@ -40101,13 +40203,15 @@
     Head = tagHead()
     ObjID = 0    #(DWORD ObjID)
     PMType = 0    #(BYTE PMType)// 物法类型 0或1-物理;2-法术
-    BattleType = 0    #(BYTE BattleType)// 战斗类型 0-常规;1-连击;2-反击;3-追击;4-子技能;5-被动触发的
+    BattleType = 0    #(BYTE BattleType)// 战斗类型 0-常规;1-连击;2-反击;3-追击;4-子技能;5-被动触发的;6-dot结算;7-持续治疗结算
     CurHP = 0    #(DWORD CurHP)// 释放技能后剩余血量,吸血、反弹可能引起变化,求余亿部分
     CurHPEx = 0    #(DWORD CurHPEx)// 释放技能后剩余血量,吸血、反弹可能引起变化,整除亿部分
     SkillID = 0    #(DWORD SkillID)
     RelatedSkillID = 0    #(DWORD RelatedSkillID)// 关联的技能ID,一般是主技能ID或由于某个技能释放引起的
-    HurtCount = 0    #(BYTE HurtCount)//伤害数目
-    HurtList = list()    #(vector<tagSCUseSkillHurt> HurtList)//size = HurtCount
+    HurtCount = 0    #(BYTE HurtCount)
+    HurtList = list()    #(vector<tagSCUseSkillHurt> HurtList)// 主要伤害目标列表
+    HurtCountEx = 0    #(BYTE HurtCountEx)
+    HurtListEx = list()    #(vector<tagSCUseSkillHurtEx> HurtListEx)// 额外伤害目标列表,仅后端单次伤害的有效,如平摊或溅射伤害
     data = None
 
     def __init__(self):
@@ -40131,6 +40235,11 @@
             temHurtList = tagSCUseSkillHurt()
             _pos = temHurtList.ReadData(_lpData, _pos)
             self.HurtList.append(temHurtList)
+        self.HurtCountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.HurtCountEx):
+            temHurtListEx = tagSCUseSkillHurtEx()
+            _pos = temHurtListEx.ReadData(_lpData, _pos)
+            self.HurtListEx.append(temHurtListEx)
         return _pos
 
     def Clear(self):
@@ -40147,6 +40256,8 @@
         self.RelatedSkillID = 0
         self.HurtCount = 0
         self.HurtList = list()
+        self.HurtCountEx = 0
+        self.HurtListEx = list()
         return
 
     def GetLength(self):
@@ -40162,6 +40273,9 @@
         length += 1
         for i in range(self.HurtCount):
             length += self.HurtList[i].GetLength()
+        length += 1
+        for i in range(self.HurtCountEx):
+            length += self.HurtListEx[i].GetLength()
 
         return length
 
@@ -40178,6 +40292,9 @@
         data = CommFunc.WriteBYTE(data, self.HurtCount)
         for i in range(self.HurtCount):
             data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.HurtCountEx)
+        for i in range(self.HurtCountEx):
+            data = CommFunc.WriteString(data, self.HurtListEx[i].GetLength(), self.HurtListEx[i].GetBuffer())
         return data
 
     def OutputString(self):
@@ -40191,7 +40308,9 @@
                                 SkillID:%d,
                                 RelatedSkillID:%d,
                                 HurtCount:%d,
-                                HurtList:%s
+                                HurtList:%s,
+                                HurtCountEx:%d,
+                                HurtListEx:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
@@ -40203,6 +40322,8 @@
                                 self.SkillID,
                                 self.RelatedSkillID,
                                 self.HurtCount,
+                                "...",
+                                self.HurtCountEx,
                                 "..."
                                 )
         return DumpString

--
Gitblit v1.8.0