From 8e58003832de0edacda49f3c088ba95d77f56d52 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 11 十月 2025 14:48:38 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（B427使用技能增加同步关联的技能；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 9 ++++++++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 3 +++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 815a832..02d7e2a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -42846,10 +42846,11 @@
Head = tagHead()
ObjID = 0 #(DWORD ObjID)
PMType = 0 #(BYTE PMType)// 物法类型 0或1-物理；2-法术
- BattleType = 0 #(BYTE BattleType)// 战斗类型 0-常规；1-连击；2-反击；3-追击
+ BattleType = 0 #(BYTE BattleType)// 战斗类型 0-常规；1-连击；2-反击；3-追击；4-子技能；5-被动触发的
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
data = None
@@ -42869,6 +42870,7 @@
self.CurHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.CurHPEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.SkillID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.RelatedSkillID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.HurtCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.HurtCount):
temHurtList = tagSCUseSkillHurt()
@@ -42887,6 +42889,7 @@
self.CurHP = 0
self.CurHPEx = 0
self.SkillID = 0
+ self.RelatedSkillID = 0
self.HurtCount = 0
self.HurtList = list()
return
@@ -42897,6 +42900,7 @@
length += 4
length += 1
length += 1
+ length += 4
length += 4
length += 4
length += 4
@@ -42915,6 +42919,7 @@
data = CommFunc.WriteDWORD(data, self.CurHP)
data = CommFunc.WriteDWORD(data, self.CurHPEx)
data = CommFunc.WriteDWORD(data, self.SkillID)
+ data = CommFunc.WriteDWORD(data, self.RelatedSkillID)
data = CommFunc.WriteBYTE(data, self.HurtCount)
for i in range(self.HurtCount):
data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())
@@ -42929,6 +42934,7 @@
CurHP:%d,
CurHPEx:%d,
SkillID:%d,
+ RelatedSkillID:%d,
HurtCount:%d,
HurtList:%s
'''\
@@ -42940,6 +42946,7 @@
self.CurHP,
self.CurHPEx,
self.SkillID,
+ self.RelatedSkillID,
self.HurtCount,
"..."
)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
index 3616675..afc7ae1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -1730,6 +1730,8 @@
def Sync_UseSkill(turnFight, curBatObj, useSkill):
## 通知释放技能
+ bySkill = useSkill.GetBySkill()
+ relatedSkillID = bySkill.GetSkillID() if bySkill else 0
poolMgr = ObjPool.GetPoolMgr()
clientPack = poolMgr.acquire(ChPyNetSendPack.tagSCUseSkill)
clientPack.ObjID = curBatObj.GetID()
@@ -1738,6 +1740,7 @@
clientPack.CurHP = curBatObj.GetHP() % ChConfig.Def_PerPointValue
clientPack.CurHPEx = curBatObj.GetHP() / ChConfig.Def_PerPointValue
clientPack.SkillID = useSkill.GetSkillID()
+ clientPack.RelatedSkillID = relatedSkillID
clientPack.HurtList = []
for hurtObj in useSkill.GetHurtObjList():
hurt = poolMgr.acquire(ChPyNetSendPack.tagSCUseSkillHurt)
--
Gitblit v1.8.0