From b6e2e296d9fd4fc7e503a852da6906a31f8e9088 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 22 十月 2025 11:20:45 +0800
Subject: [PATCH] 16 卡牌服务端(删除开服活动)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

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..829ab66 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -693,7 +693,13 @@
                 纵排: 优先前面的单位
     '''
     
+    if turnFight.winFaction:
+        return
+    
     if not useSkill.ComboEnable():
+        return
+    
+    if not atkObj.IsAlive():
         return
     
     tagFriendly = useSkill.GetTagFriendly()
@@ -920,6 +926,10 @@
             TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BePursue, curObj, connSkill=useSkill)
             
         triggerOne = True # 设置已经触发过一次
+        
+    # 有击杀时验证是否结算,最后处理
+    if killObjList:
+        turnFight.checkOverByKilled()
         
     return
 
@@ -1730,6 +1740,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 +1750,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