ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -1520,7 +1520,7 @@
    
    # 被动技能触发
    defObj.SetDict(ChConfig.Def_PlayerKey_GodWeaponBeforeProDef, curProDef)
    PassiveBuffEffMng.OnPassiveSkillTrigger(defObj, atkObj, curSkill, ChConfig.TriggerType_ProDefValue, tick)
    PassiveBuffEffMng.OnPassiveSkillTrigger(defObj, atkObj, None, ChConfig.TriggerType_ProDefValue, tick)
    return hurtValue - absortValue
## 计算伤血值
@@ -1627,7 +1627,20 @@
    
    remainHP = int(remainHP)    #防范
    if defObjType == IPY_GameWorld.gotPlayer:
        curHP = GameObj.GetHP(defObj)
        GameObj.SetHP(defObj, remainHP, False)
        lockHPPer = PassiveBuffEffMng.OnObjsPassiveSkillLockHP(defObj, atkObj, curSkill, ChConfig.TriggerType_LockHP, tick)
        if lockHPPer:
            # 锁血情况
            lockHP = GameObj.GetMaxHP(defObj)*lockHPPer/ChConfig.Def_MaxRateValue
            if lockHP < curHP and remainHP < lockHP:
                remainHP = lockHP
            elif lockHP >= curHP:
                remainHP = curHP
            #锁血纠正血量
            GameObj.SetHP(defObj, remainHP, False)
            
    elif defObjType == IPY_GameWorld.gotNPC:
        if defObj.GetGameNPCObjType() == IPY_GameWorld.gnotPet: