From 067c557365c6a749f6f41f5d8cad8ce9e941c80f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 14 十月 2025 18:07:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py |   10 ++++++++++
 1 files changed, 10 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 afc7ae1..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()
@@ -921,6 +927,10 @@
             
         triggerOne = True # 设置已经触发过一次
         
+    # 有击杀时验证是否结算,最后处理
+    if killObjList:
+        turnFight.checkOverByKilled()
+        
     return
 
 def __doCostZhanchui(turnFight, curBatObj, useSkill):

--
Gitblit v1.8.0