From 71685e76b8f23242fd3e5ec2a1c934579efafb96 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 10:03:25 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(何太后全部技能;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 6046bb0..38f8ede 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -66,6 +66,8 @@
             triggerWay = kwargs.get("triggerWay", 0)
             if triggerWay in ChConfig.DeadCanTriggerWayList:
                 GameWorld.DebugLogEx("死亡可触发的方式触发技能可释放! skillID=%s,triggerWay=%s", skillID, triggerWay)
+            elif batType == ChConfig.TurnBattleType_Enhance:
+                GameWorld.DebugLogEx("死亡状态额外技能不限制,主技能能放的话也就能放! skillID=%s", skillID)                
             else:
                 GameWorld.DebugLogEx("死亡状态下无法释放该技能! skillID=%s", skillID)
                 return
@@ -1318,9 +1320,7 @@
             TurnAttack.SetObjKilled(turnFight, tagObj, curObj, useSkill)
     useSkill.SetKillObjList(killObjList)
     # 判断自己,因为反弹、平摊伤害的原因,有可能自己干死自己
-    selfAlive = curObj.IsAlive()
-    if selfAlive and curObj.GetHP() <= 0:
-        selfAlive = False
+    if curObj.IsAlive() and curObj.GetHP() <= 0:
         dieObjList.append(curObj)
         TurnAttack.SetObjKilled(turnFight, curObj)
         
@@ -1395,7 +1395,7 @@
     effIgnoreObjIDList = missObjIDList + immuneObjIDList
     useSkill.SetEffIgnoreObjIDList(effIgnoreObjIDList)
     # 优先触发本技能额外效果,注:仅该技能释放后该技能的额外效果视为主技能的效果,优先级最高
-    if selfAlive:
+    if curObj not in dieObjList:
         __DoCurSkillEff(turnFight, curObj, useSkill, effIgnoreObjIDList, isUseSkill)
     
     # ========== 以下触发被动 ==========

--
Gitblit v1.8.0