From 152bf6b437fc82e62d788b15d6e2206e2ad0b0c4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 27 一月 2026 11:19:42 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（修复双方都有吕玲绮时某一方吕怒技击杀对方武将时不会触发另一方吕玲绮潜能释放怒技；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 8 +++++---
1 files changed, 5 insertions(+), 3 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 3636b76..d206ba3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -2084,9 +2084,11 @@
bySkillID = connBuff.GetSkillID()
passiveSkillID = passiveSkill.GetSkillID()
if passiveSkillID == bySkillID:
- #GameWorld.DebugLogEx("###被动触发技能不触发自身，防止死循环! effSkillID=%s,effectID=%s,passiveSkillID=%s", effSkillID, effectID, passiveSkillID)
- return
-
+ if not connSkill or connSkill.GetObjID() == batObj.GetID():
+ GameWorld.DebugLogEx("###被动触发技能不触发自身，防止死循环! effSkillID=%s,effectID=%s,passiveSkillID=%s", effSkillID, effectID, passiveSkillID)
+ return
+ # 不同施法者的相同技能ID可触发，如双方都有相同武将相同技能的情况下，如吕玲绮
+
if hasattr(passiveSkill, "GetRemainTime") and passiveSkill.GetRemainTime() > 0:
#GameWorld.DebugLogEx("被动触发技能CD中! skillID=%s,RemainTime=%s", passiveSkillID, passiveSkill.GetRemainTime())
return
--
Gitblit v1.8.0