8017 【开发】【主干】玩家退出副本或自定义场景时，如果非死亡状态则血量恢复满血状态

hxp

2019-07-17 ed212e33cd50eca6ff3b7d5f4cac7de975a1e0b7

 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py

@@ -54,6 +54,7 @@
import PlayerGeTui

import PlayerStore

import GameWorldActionControl

import GameWorldFamilyWar

import PlayerFBHelpBattle

import GMT_CTG

import PyGameData

@@ -173,6 +174,7 @@
        #守卫人皇

        PlayerFamilySWRH.OnLogin(curPlayer)

        PlayerTalk.LoginChatMi(curPlayer)

        PlayerTalk.NotifyTalkCache(curPlayer)

        PlayerGeTui.CleanNewGuyCallBackGeTui(curPlayer.GetID())

        #活动

        GameWorldActionControl.OnPlayerLogin(curPlayer)

@@ -635,6 +637,10 @@
    elif packType == IPY_GameServer.CDBPlayerRefresh_VIPLv:

        curPlayer.SetVIPLv(packValue);

#        __RefreshTeamState(curPlayer)

    
    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr5:

        PlayerControl.SetCrossMapID(curPlayer, packValue, False)

        
    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr9:

        PlayerControl.SetVIPExpireTime(curPlayer, packValue)

        

@@ -680,6 +686,7 @@
    GameWorldBoss.OnPlayerChangeMap(curPlayer)

    PlayerFamily.OnPlayerChangeMap(curPlayer, tick)

    PlayerFamilyParty.OnPlayerChangeMap(curPlayer, tick)

    GameWorldFamilyWar.OnPlayerChangeMap(curPlayer)

    return 



## 玩家切换真实地图

@@ -873,17 +880,29 @@
#{

#    tagHead        Head;

#    DWORD        MapID;

#    BYTE        FBLineID;

#    BYTE        IsAllLine;

#    BYTE        LineCount;

#    BYTE        LineIDList[LineCount];    //个数为0时代表查全部

#};

def ClinetQueryFBLinePlayerCnt(index, clientData, tick):

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    queryMapID = clientData.MapID

    fbLineID = clientData.FBLineID

    isAllLine = clientData.IsAllLine

    queryFBLineIDList = clientData.LineIDList

    playerManager = GameWorld.GetPlayerManager()

    

    sendCMD = str([queryMapID, fbLineID, isAllLine])

    if queryMapID in ChConfig.Def_CrossMapIDList:

        fbLinePlayerInfoDict = PyGameData.g_crossFBFuncLinePlayerCountInfo.get(queryMapID, {})

        if not queryFBLineIDList:

            resultInfo = [queryMapID, fbLinePlayerInfoDict]

        else:

            defaultInfo = [0] # 与本服结构相同，默认0人

            queryFBLineInfo = {}

            for lineID in queryFBLineIDList:

                queryFBLineInfo[lineID] = fbLinePlayerInfoDict.get(lineID, defaultInfo)

            resultInfo = [queryMapID, queryFBLineInfo]

        QueryFBLinePlayerCntResult(curPlayer, resultInfo)

        return

    
    sendCMD = str([queryMapID, queryFBLineIDList])

    playerManager.MapServer_QueryPlayer(curPlayer.GetPlayerID(), 0, 0, queryMapID,

                'FBLinePlayerCnt', sendCMD, len(sendCMD), curPlayer.GetRouteServerIndex())

    return