hxp
2019-03-29 31779da0ff5baba545b421e791a3a22a5b4fdf73
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -1320,7 +1320,7 @@
                  ChConfig.Def_HurtType_LuckyHit:lambda aObj, dObj, hState:__HurtTypeHappen_LuckyHit(aObj, dObj, hState),
                  ChConfig.Def_HurtType_SuperHit:lambda aObj, dObj, hState:__HurtTypeHappen_SuperHit(aObj, dObj, hState),
                  ChConfig.Def_HurtType_Parry:lambda aObj, dObj, hState:__HurtTypeHappen_Parry(aObj, dObj, hState),
                  ChConfig.Def_HurtType_Zhuxian:lambda aObj, dObj, hState:__HurtTypeHappen_Zhuxian(aObj, dObj, hState),
                  #ChConfig.Def_HurtType_Zhuxian:lambda aObj, dObj, hState:__HurtTypeHappen_Zhuxian(aObj, dObj, hState),
                  }
    
    hadCheckList = [] # 已经处理过的伤害类型列表
@@ -1328,7 +1328,7 @@
    for mutexHurtTypeList in mutexList:
        curMHHappen = False # 当前互斥列表是否有触发的
        for hType in mutexHurtTypeList:
            if hType not in calcTypeList:
            if hType not in calcTypeList or hType not in happenFunc:
                continue
            if hType in hadCheckList:
                continue
@@ -1344,7 +1344,7 @@
            
    # 再算优先级列表里
    for hType in priorityList:
        if hType not in calcTypeList:
        if hType not in calcTypeList or hType not in happenFunc:
            continue
        if hType not in hadCheckList:
            hadCheckList.append(hType)
@@ -1407,15 +1407,15 @@
        return True, 0, chanceDefPer
    return
def __HurtTypeHappen_Zhuxian(atkObj, defObj, happenState):
    """诛仙一击"""
    rate = PlayerControl.GetZhuXianRate(atkObj)
    if not rate:
        return
    if GameWorld.CanHappen(rate):
        return True, PlayerControl.GetZhuXianHurtPer(atkObj), 0
    return
#def __HurtTypeHappen_Zhuxian(atkObj, defObj, happenState):
#    """诛仙一击"""
#    rate = PlayerControl.GetZhuXianRate(atkObj)
#    if not rate:
#        return
#
#    if GameWorld.CanHappen(rate):
#        return True, PlayerControl.GetZhuXianHurtPer(atkObj), 0
#    return
def ChangeSkillHurtPer(atkObj, defObj, curSkill, skillPer):
@@ -2554,12 +2554,6 @@
    
    if GetIsNewGuy(tagPlayer):
        return ChConfig.Type_Relation_None, ChConfig.Def_PASysMessage_NotAttackNewGuy
    #攻守双方同一队伍,不可PK,可加增益buff
    #if curPlayerAreaType not in [ShareDefine.gatManor] and CanAlikeTeam(curPlayer, tagPlayer):
    #    #副本队友特殊判断
    #    if not PlayerCanAttackTeamerInFB(curPlayer, tagPlayer):
    #        return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_NotAttackTeam
        
    #恶意攻击的玩家默认都是敌人, 无论什么模式
    if IsMaliciousAttackPlayer(curPlayer, tagPlayer):