5931 【后端】【1.5.100】诛仙装备开发（增加诛仙装备穿脱包）

hxp

2019-01-21 c1b3a0b95ee7e09e434389120e35cc73893b9ae4

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py

@@ -324,6 +324,10 @@
    if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:

        return

    

    crossNotifyList = []

    isCrossServer = GameWorld.IsCrossServer()

    atkServerGroupID = PlayerControl.GetPlayerServerGroupID(attacker)

    defServerGroupID = PlayerControl.GetPlayerServerGroupID(defender)

    lineID = GameWorld.GetGameWorld().GetLineID()

    # 杀人玩家有帮会

    if attacker.GetFamilyID() > 0:

@@ -338,30 +342,40 @@
        notifyCode = 'PK_pan_318691'

        paramList = [defFamilyMemberLv, defName, defMapID, atkName,defPosX, defPosY, lineID]

    

    PlayerControl.FamilyNotify(defFamilyID, notifyCode, paramList)



    if isCrossServer:

        crossNotifyList.append(PlayerControl.GetCrossFamilyNotifyInfo(defFamilyID, notifyCode, paramList))

    else:

        PlayerControl.FamilyNotify(defFamilyID, notifyCode, paramList)

    
    # 有职位被杀，全服广播

    if defFamilyMemberLv <= 0:

        return

    if defFamilyMemberLv > 0:

        defFamilyName = defender.GetFamilyName()

    

    defFamilyName = defender.GetFamilyName()



    killCnt = attacker.GetDictByKey(ChConfig.Def_PlayerKey_KillPlayerCnt % defender.GetPlayerID()) + 1

    attacker.SetDict(ChConfig.Def_PlayerKey_KillPlayerCnt % defender.GetPlayerID(), killCnt)

    #被杀重置击杀数

    defender.SetDict(ChConfig.Def_PlayerKey_KillPlayerCnt % attacker.GetPlayerID(), 0)

    
    killPlayerNotifyDict = IpyGameDataPY.GetFuncEvalCfg('FamilyKilledNotify')

    
    killKeys = sorted(killPlayerNotifyDict.keys())

    notifyKey = 0 
    for killCntKey in killKeys:

        if killCnt < killCntKey:

            break

        notifyKey = killCntKey

    if notifyKey in killPlayerNotifyDict:

        notifyMark = killPlayerNotifyDict[notifyKey]

        PlayerControl.WorldNotify(0, notifyMark, [atkName, defMapID, defFamilyName, defFamilyMemberLv, defName])

        killCnt = attacker.GetDictByKey(ChConfig.Def_PlayerKey_KillPlayerCnt % defender.GetPlayerID()) + 1

        attacker.SetDict(ChConfig.Def_PlayerKey_KillPlayerCnt % defender.GetPlayerID(), killCnt)

        #被杀重置击杀数

        defender.SetDict(ChConfig.Def_PlayerKey_KillPlayerCnt % attacker.GetPlayerID(), 0)

        
        killPlayerNotifyDict = IpyGameDataPY.GetFuncEvalCfg('FamilyKilledNotify')

        
        killKeys = sorted(killPlayerNotifyDict.keys())

        notifyKey = 0 
        for killCntKey in killKeys:

            if killCnt < killCntKey:

                break

            notifyKey = killCntKey

        if notifyKey in killPlayerNotifyDict:

            notifyMark = killPlayerNotifyDict[notifyKey]

            msgParamList = [atkName, defMapID, defFamilyName, defFamilyMemberLv, defName]

            if isCrossServer:

                crossNotifyList.append(PlayerControl.GetCrossWorldNotifyInfo(0, notifyMark, msgParamList))

                if atkServerGroupID != defServerGroupID:

                    PlayerControl.NotifyCode(attacker, notifyMark, msgParamList)

            else:

                PlayerControl.WorldNotify(0, notifyMark, msgParamList)

                
    if crossNotifyList:

        PlayerControl.CrossNotify([defServerGroupID], crossNotifyList)

        

    return



@@ -1287,11 +1301,12 @@
                          ChConfig.Def_HurtType_LuckyHit:[False, 0, 0],

                          ChConfig.Def_HurtType_SuperHit:[False, 0, 0],

                          ChConfig.Def_HurtType_Parry:[False, 0, 0],

                          ChConfig.Def_HurtType_Zhuxian:[False, 0, 0],

                          }

    

    calcTypeList =  []

    if atkObjType == IPY_GameWorld.gotPlayer:

        calcTypeList += [ChConfig.Def_HurtType_LuckyHit, ChConfig.Def_HurtType_SuperHit]

        calcTypeList += [ChConfig.Def_HurtType_LuckyHit, ChConfig.Def_HurtType_SuperHit, ChConfig.Def_HurtType_Zhuxian]

    if defObjType == IPY_GameWorld.gotPlayer:

        calcTypeList += [ChConfig.Def_HurtType_Parry]

    # 暂时只计算玩家

@@ -1304,6 +1319,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),

                  }

    

    hadCheckList = [] # 已经处理过的伤害类型列表

@@ -1389,6 +1405,17 @@
    if GameWorld.CanHappen(ChConfig.Def_ChanceDefRate):

        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







# 改变技能伤害（效果ID1010）, 野外小怪1009替换1010伤害(2018-03-07增加精英怪)

@@ -1603,10 +1630,23 @@
    reducePer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(defObj, atkObj, None, ChConfig.TriggerType_ReduceHurtHPPer)

    hurtValue = int(hurtValue*(max(ChConfig.Def_MaxRateValue - reducePer, 0))*1.0/ChConfig.Def_MaxRateValue)

    

    
    # 终极斩杀新效果，必须和斩杀严格区分，会涉及到CD概率，已经触发其他技能等问题

    if PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_ZhongjiZhansha):

        # նɱ

        hurtType = ChConfig.Def_HurtType_ZhognjiZhansha

        hurtValue = GameObj.GetHP(defObj)

        #伤害结构体

        resultHurtType.HurtHP = hurtValue

        resultHurtType.HurtType = hurtType

        resultHurtType.RealHurtHP = hurtValue

        
        remainHP = 0 # 剩余血量



    # 斩杀，濒死等情况的处理

    if PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackKill):

    elif PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackKill):

        # նɱ

        hurtType = ChConfig.Def_HurtType_Zhansha

        hurtValue = GameObj.GetHP(defObj)

        #伤害结构体

        resultHurtType.HurtHP = hurtValue

@@ -1801,13 +1841,16 @@
    isLuckyHit, aLuckyHit, dLuckyHitReduce = hurtTypeResultDict[ChConfig.Def_HurtType_LuckyHit] # 幸运一击

    isSuperHit, aSuperHit, dSuperHitReduce = hurtTypeResultDict[ChConfig.Def_HurtType_SuperHit] # 暴击

    dDamChanceDef = hurtTypeResultDict[ChConfig.Def_HurtType_Parry][2] # 抵御, 大于0代表触发抵御效果



    isZhuxianHit, aZhuxianHurtPer, dZhuxianReducePer = hurtTypeResultDict[ChConfig.Def_HurtType_Zhuxian] # 诛仙一击

    
    if PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(defObj, atkObj, None, ChConfig.TriggerType_OneDamage):

        return 1, hurtType

    

    wReFightPower = 0

    worldLV = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)

    wLVIpyData = PlayerControl.GetPlayerLVIpyData(worldLV)

    wReFightPower = 0 if not wLVIpyData else wLVIpyData.GetReFightPower() # 当前世界等级参考战力

    if worldLV:

        wLVIpyData = PlayerControl.GetPlayerLVIpyData(worldLV)

        wReFightPower = 0 if not wLVIpyData else wLVIpyData.GetReFightPower() # 当前世界等级参考战力

    

    # 改变技能伤害

    atkSkillPer, atkSkillValue = ChangeSkillHurt(atkObj, defObj, curSkill, atkSkillPer, atkSkillValue)

@@ -2083,6 +2126,12 @@
    if objType == IPY_GameWorld.gotPlayer:

        return "P"

    

    if objType == IPY_GameWorld.gotNPC:

        if obj.GetType() == ChConfig.ntRobot:

            return "Robot"

        if obj.GetType() == ChConfig.ntHelpBattleRobot:

            return "HelpRobot"

        
    objType = obj.GetGameNPCObjType()

    if objType == IPY_GameWorld.gnotPet:

        return "Pet"