From 585920f6469cc24091ada7882c329d45142fd35f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 22 一月 2026 20:14:02 +0800
Subject: [PATCH] 423 【内政】命格系统-服务端(推演增加A814回包;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.py |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.py
index c9cdba0..b3b3649 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.py
@@ -4,12 +4,12 @@
 #
 ##@package Skill.PassiveTrigger.PassiveEff_5505
 #
-# @todo:触发释放技能(验证目标生命)
+# @todo:触发释放技能(验证生命)
 # @author hxp
 # @date 2025-12-16
 # @version 1.0
 #
-# 详细描述: 触发释放技能(验证目标生命)
+# 详细描述: 触发释放技能(验证生命)
 #
 #-------------------------------------------------------------------------------
 #"""Version = 2025-12-16 19:30"""
@@ -22,19 +22,21 @@
 import ChConfig
 
 def DoSkillEffectLogic(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs):
-    skillID = curEffect.GetEffectValue(0) # 技能ID,为0时释放本技能
+    passiveSkillID = curEffect.GetEffectValue(0) # 技能ID,为0时释放本技能
     checkTagHPInfo = curEffect.GetEffectValue(1) # 可附加验证目标生命值[计算方式, 百分比]
+    checkTagType = curEffect.GetEffectValue(2) # 验证目标默认0-对方;1自己
     if checkTagHPInfo:
         checkType, checkHPPer = checkTagHPInfo
-        tagHP = tagObj.GetHP()
-        tagHPMax = tagObj.GetMaxHP()
+        checkTag = batObj if checkTagType == 1 else tagObj
+        tagHP = checkTag.GetHP()
+        tagHPMax = checkTag.GetMaxHP()
         nowPer = tagHP / float(tagHPMax) * 100
         
         effSkillTypeID = effSkill.GetSkillTypeID()
-        checkHPPer += TurnPassive.GetTriggerEffectValue(turnFight, batObj, tagObj, ChConfig.PassiveEff_AddCheckPer5505, connSkillTypeID=effSkillTypeID, **kwargs)
+        checkHPPer += TurnPassive.GetTriggerEffectValue(turnFight, batObj, checkTag, ChConfig.PassiveEff_AddCheckPer5505, connSkillTypeID=effSkillTypeID, **kwargs)
         
-        GameWorld.DebugLogEx("5505验证目标生命! tagHP=%s/%s,nowPer=%s,checkHPPer=%s,checkType=%s,effSkillTypeID=%s", 
-                             tagHP, tagHPMax, nowPer, checkHPPer, checkType, effSkillTypeID)
+        GameWorld.DebugLogEx("5505验证生命! checkTagType=%s,checkTagID=%s,HP=%s/%s,nowPer=%s,checkHPPer=%s,checkType=%s,effSkillTypeID=%s", 
+                             checkTagType, checkTag.GetID(), tagHP, tagHPMax, nowPer, checkHPPer, checkType, effSkillTypeID)
         
         # 小于等于
         if checkType == 0:
@@ -45,15 +47,11 @@
             if nowPer < checkHPPer:
                 return
             
-    if not skillID:
-        passiveSkill = effSkill
-    else:
-        passiveSkill = IpyGameDataPY.GetIpyGameData("Skill", skillID)
-    if not passiveSkill:
-        return
     effectID = curEffect.GetEffectID()
     effSkillID = effSkill.GetSkillID()
-    return TurnSkill.OnUsePassiveSkill(turnFight, batObj, tagObj, passiveSkill, connSkill, effSkillID, effectID, connBuff, **kwargs)
+    if not passiveSkillID:
+        passiveSkillID = effSkillID
+    return TurnSkill.OnUsePassiveSkill(turnFight, batObj, tagObj, passiveSkillID, connSkill, effSkillID, effectID, connBuff, **kwargs)
 
 def DoBuffEffectLogic(turnFight, batObj, tagObj, effBuff, curEffect, connSkill, connBuff, **kwargs):
     effSkill = effBuff.GetSkillData().GetIpyData()

--
Gitblit v1.8.0