xdh
2018-10-15 33213bf05479454d216a067d7a30f739d5eaaff9
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -1547,7 +1547,6 @@
        
        # 血盾 
        hurtValue = CalcBloodShield(atkObj, defObj, hurtValue)
        remainHP = min(dMaxHP, max(0, dHP - hurtValue)) # 剩余血量
    
    remainHP = int(remainHP)    #防范
@@ -1569,6 +1568,12 @@
    else:
        GameWorld.ErrLog('计算伤血值时,防守方类型错误:defObjType = %s' % (defObjType))
        return resultHurtType
    if GameObj.GetHP(defObj) > 0:
        # 被攻击者将部分伤害转化为血量, 返回转化的百分比(小数点)
        changePer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(defObj, atkObj, None, ChConfig.TriggerType_ChangeHurtToHP)
        if changePer:
            SkillCommon.SkillAddHP(defObj, 0, int(changePer*hurtValue))
    
    lostValue = dHP - GameObj.GetHP(defObj) # 实际掉血量
    resultHurtType.LostHP = lostValue
@@ -1719,6 +1724,10 @@
        # 暴击增加技能伤害
        atkSkillPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_SuperHitSkillPer)
    if isLuckyHit:
        # 会心一击时增加会心伤害百分比
        aLuckyHit += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_LuckyHit)
    #参与运算的数值
    rand = random.random()                #种子数 0~1
@@ -2079,7 +2088,9 @@
        #PVP 攻击回血
        atkBackHP += PlayerControl.GetPVPAtkBackHP(atkObj)
        # 百分比吸血
        atkBackHPPer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, None, None, ChConfig.TriggerType_Buff_SuckBloodPer)
        atkBackHPPer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, defObj, None, ChConfig.TriggerType_Buff_SuckBloodPer)
        atkBackHPPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, None, ChConfig.TriggerType_Buff_SuckBloodPer)
        atkBackHP += int(hurtValue * atkBackHPPer*1.0 / ChConfig.Def_MaxRateValue)
    suckHP += atkBackHP