2838 【1.4.100】【1.5】跨服PK玩家掉线重连后没有完整登录导致结算异常，顺便屏蔽了世界等级为0时计算伤血取不到等级信息的错误日志;

hxp

2019-01-07 6051aa1b52eb838c1e2c026a1791b7c9bd38c5e0

2838 【1.4.100】【1.5】跨服PK玩家掉线重连后没有完整登录导致结算异常，顺便屏蔽了世界等级为0时计算伤血取不到等级信息的错误日志;

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

@@ -1806,9 +1806,11 @@
    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)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.py

@@ -296,14 +296,21 @@
        playerInfoList = []

        for playerID in [playerIDA, playerIDB]:

            player = copyMapPlayerManager.FindPlayerByID(playerID)

            # 还是离线时间的，走掉线逻辑，越晚掉线的赢；需要加这个逻辑主要是因为当玩家没有触发完整登录流程导致玩家在线但是没有触发DoEnter

            playerLeaveTick = gameFB.GetGameFBDictByKey(GameFBDict_PlayerLeaveTick % playerID)

            if playerLeaveTick:

                pvpDamage, sortTick, curHP, curMaxHP = 0, 0, 0, 0

                playerInfoList.append([pvpDamage, sortTick, curHP, curMaxHP, playerLeaveTick, playerID, player])

                GameWorld.Log("PK超时: playerLeaveTick=%s" % (playerLeaveTick), playerID)

                continue

            pvpDamage = gameFB.GetPlayerGameFBDictByKey(playerID, FBPDict_PVPDamage)

            pvpDamTick = gameFB.GetPlayerGameFBDictByKey(playerID, FBPDict_PVPDamUpdTick)

            sortTick = tick - pvpDamTick

            curHP = 0 if not player else player.GetHP()

            curMaxHP = 0 if not player else player.GetMaxHP()

            playerInfoList.append([pvpDamage, sortTick, curHP, curMaxHP, playerID, player])

            GameWorld.Log("PK超时: pvpDamge=%s,pvpDamTick=%s,tick=%s,sortTick=%s,HP=%s/%s" 
                          % (pvpDamage, pvpDamTick, tick, sortTick, curHP, curMaxHP), playerID)

            playerInfoList.append([pvpDamage, sortTick, curHP, curMaxHP, playerLeaveTick, playerID, player])

            GameWorld.Log("PK超时: pvpDamge=%s,pvpDamTick=%s,tick=%s,sortTick=%s,HP=%s/%s,playerLeaveTick=%s" 
                          % (pvpDamage, pvpDamTick, tick, sortTick, curHP, curMaxHP, playerLeaveTick), playerID)

            

        playerInfoList.sort(reverse=True)

        GameWorld.Log("PK超时, 进入结算!playerInfoList=%s" % str(playerInfoList))