ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.py
@@ -24,6 +24,7 @@
import SkillCommon
import FBCommon
import ChConfig
import GameObj
(
@@ -306,8 +307,8 @@
            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()
            curHP = 0 if not player else GameObj.GetHP(player)
            curMaxHP = 0 if not player else GameObj.GetMaxHP(player)
            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)
@@ -409,7 +410,7 @@
        playerID = player.GetPlayerID()
        gameFB.SetPlayerGameFBDict(playerID, FBPDict_RoundNum, nextRoundNum)
        
        if player.GetPlayerAction() == IPY_GameWorld.paDie or player.GetHP() <= 0:
        if player.GetPlayerAction() == IPY_GameWorld.paDie or GameObj.GetHP(player) <= 0:
            GameWorld.DebugLog("复活玩家...", player.GetPlayerID())
            ChPlayer.PlayerRebornByType(player, ChConfig.rebornType_System, tick, isAddSuperBuff=False)
            __ResetPlayerState(gameFB, player, playerID)
@@ -522,8 +523,8 @@
    if not resetAttr:
        return
    
    if player.GetHP() != player.GetMaxHP():
        player.SetHP(player.GetMaxHP())
    if GameObj.GetHP(player) != GameObj.GetMaxHP(player):
        GameObj.SetHP(player, GameObj.GetMaxHP(player))
        
    if PlayerControl.GetProDef(player) != PlayerControl.GetMaxProDef(player):
        PlayerControl.SetProDef(player, PlayerControl.GetMaxProDef(player))