hch
2018-11-26 69603a748cf54f1a81930d1f88861d32bf006205
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -1438,13 +1438,30 @@
        curPlayer.SetDict(ChConfig.Def_PDict_PKStateTick, 0)
        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PKState, 0, False)
        #GameWorld.DebugLog("退出PK状态!", curPlayer.GetPlayerID())
        curPlayer.SetDict("StartProDTick", tick) # 开始恢复时间点
        
    bossStateTick = curPlayer.GetDictByKey(ChConfig.Def_PDict_BossStateTick)
    if bossStateTick and (tick - bossStateTick) >= validTime:
        curPlayer.SetDict(ChConfig.Def_PDict_BossStateTick, 0)
        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_BossState, 0, False)
        #GameWorld.DebugLog("退出Boss状态!", curPlayer.GetPlayerID())
    # 脱离PK战斗 X秒后按比例恢复
    if not IsInPKState(curPlayer):
        if tick - curPlayer.GetDictByKey("StartProDTick") < IpyGameDataPY.GetFuncCfg("MagicExterior", 2) * 1000:
            return
        
        if curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
            return
        # 每秒恢复
        if tick - curPlayer.GetDictByKey("restoreProDTick") < 1000:
            return
        #非PK状态恢复护盾
        PlayerControl.SetProDef(curPlayer, min(PlayerControl.GetProDef(curPlayer) + \
                    IpyGameDataPY.GetFuncCfg("MagicExterior", 3)*PlayerControl.GetMaxProDef(curPlayer)/ChConfig.Def_MaxRateValue, \
                    PlayerControl.GetMaxProDef(curPlayer)))
        curPlayer.SetDict("restoreProDTick", tick)
    return
def IsInPKState(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PDict_PKStateTick) > 0