4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服，回来后归属不会清，boss不会回血

hxp

2019-07-08 02a9f1326fd99fc60ee14c70bb55d714803607f0

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

@@ -29,7 +29,6 @@
#---------------------------------------------------------------------

import GameWorld

import IPY_GameServer

import MergeBroadcast

import IpyGameDataPY

import CrossRealmMsg

import ShareDefine

@@ -53,36 +52,43 @@
    curPlayer.NotifyCode(msgMark, __GetNotifyCodeList(msgParamList))

    return



def NotifyCodeToClientServer(serverGroupID, playerID, msgMark, msgParamList=[]):

    dataMsg = {"Type":"Player", "ID":playerID, "Mark":msgMark, "Param":msgParamList}

    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, dataMsg, [serverGroupID])

def CrossNotifyCode(serverGroupID, playerID, msgMark, msgParamList=[]):

    crossNotifyList = [{"Type":ShareDefine.CrossNotify_Player, "Params":[playerID, msgMark, msgParamList]}]

    CrossNotify([serverGroupID], crossNotifyList)

    return



def CrossServerMsg_Notify(notifyInfoDict):

    notifyType = notifyInfoDict["Type"]

    notifyID = notifyInfoDict["ID"]

    if notifyType == "Player":

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(notifyID)

        if not curPlayer:

            return

        NotifyCode(curPlayer, notifyInfoDict["Mark"], notifyInfoDict["Param"])

def GetCrossWorldNotifyInfo(country, msgMark, msgParamList=[]):

    return {"Type":ShareDefine.CrossNotify_World, "Params":[country, msgMark, msgParamList]}



def GetCrossFamilyNotifyInfo(familyID, msgMark, msgParamList=[]):

    return {"Type":ShareDefine.CrossNotify_Family, "Params":[familyID, msgMark, msgParamList]}



def CrossNotify(serverGroupIDList, crossNotifyList):

    ''' 跨服广播信息提示，支持同步多条，同时也建议多条一起同步

    @param serverGroupIDList: 需要同步到的目标服务器组ID列表

    @param crossNotifyList: 信息提示列表，通过 GetCrossWorldNotifyInfo GetCrossFamilyNotifyInfo 函数获得返回值添加到列表

    '''

    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, crossNotifyList, serverGroupIDList)

    return



## 跨服世界广播

#  @param country 提示的国家

#  @param msgMark 提示信息Mark

#  @param msgParamList 信息参数列表

#  @param mergeMinOSD 该提示针对跨服子服有效的最小开服天, >=0时有限制

#  @param mergeMaxOSD 该提示针对跨服子服有效的最大开服天, >=0时有限制

#  @param mergeMapInfo 该提示所属的跨服活动地图信息, 主要用于不同子服对应所跨的活动地图ID

#  @remarks 
def MergeWorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[], isMapNotify=0):

    # 非地图同步的广播才进行全服广播

    if not isMapNotify:

        GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))

    notifyDict = {"country":country, "msgMark":msgMark, "msgParamList":msgParamList, "lineID":lineID, 
                  "mergeMinOSD":mergeMinOSD, "mergeMaxOSD":mergeMaxOSD, "mergeMapInfo":mergeMapInfo}

    MergeBroadcast.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)

def CrossServerMsg_Notify(crossNotifyList):

    GameWorld.DebugLog("收到跨服同步的广播提示内容: count=%s" % len(crossNotifyList))

    for notifyInfo in crossNotifyList:

        if "Type" not in notifyInfo or "Params" not in notifyInfo:

            continue

        notifyType = notifyInfo["Type"]

        params = notifyInfo["Params"]

        if notifyType == ShareDefine.CrossNotify_World:

            country, msgMark, msgParamList = params

            WorldNotify(country, msgMark, msgParamList)

        elif notifyType == ShareDefine.CrossNotify_Family:

            familyID, msgMark, msgParamList = params

            FamilyNotify(familyID, msgMark, msgParamList)

        elif notifyType == ShareDefine.CrossNotify_Player:

            playerID, msgMark, msgParamList = params

            curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)

            if curPlayer:

                NotifyCode(curPlayer, msgMark, msgParamList)

    return

    

## 世界广播

@@ -92,10 +98,7 @@
#  @return 无返回值

#  @remarks 

def WorldNotify(country, msgMark, msgParamList=[]):

    if GameWorld.IsMergeServer():

        MergeWorldNotify(country, msgMark, msgParamList)

    else:

        GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))

    GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))

    return



#---------------------------------------------------------------------

@@ -188,23 +191,6 @@




#------------------------------------------------------------------------------ 

## 设置玩家跨服预赛排位

#  @param curPlayer: 玩家实例

#  @param value: 威望值

#  @return: 
def SetMergeWarRank(curPlayer, value):

    return





## 获取玩家跨服预赛排位

#  @param curPlayer: 玩家实例

#  @return: 威望值

def GetMergeWarRank(curPlayer):

    return 0



## 职业阶数

def GetJobRank(curPlayer): return curPlayer.GetExAttr1()

def SetJobRank(curPlayer, jobRank): return curPlayer.SetExAttr1(jobRank)



##VIP到期时间

def GetVIPExpireTime(curPlayer): return curPlayer.GetExAttr9()

@@ -243,6 +229,10 @@
    return 

def GetLeaveFamilyTime(curPlayer):return curPlayer.GetExAttr12()



## 玩家所属服务器组ID

def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()

def SetPlayerServerGroupID(curPlayer, groupID): return curPlayer.SetExAttr13(groupID)



## 是否脱机挂机状态

def GetIsTJG(curPlayer):

    if curPlayer.GetDictByKey(ChConfig.Def_OnlineType):

@@ -266,20 +256,6 @@


#------------------------------------------------------------------------------ 





## 设置新手指导员天数

#  @param curPlayer: 玩家实例

#  @param day: 天数

#  @return: 
def SetFreshmanGuiderDay(curPlayer, day):

    curPlayer.SetDict(ChConfig.Def_PlayerKey_FreshmanGuiderDay, day) 
    return



## 获取新手指导员天数

#  @param curPlayer: 玩家实例

#  @return: 天数

def GetFreshmanGuiderDay(curPlayer):

    return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_FreshmanGuiderDay)



## 增加成就完成进度

#  @param curPlayer

@@ -307,14 +283,12 @@
    SetMapServerPlayerAttrValue(curPlayer, "SetVsRoomId", roomID)

    return



## 跨服状态: 0-非跨服状态，1-跨服状态

def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()

def SetCrossRealmState(curPlayer, value):

    ''' 设置玩家跨服状态

    @param isExitCrossRealm: 非跨服状态时是否通知前端退出跨服服务器

    '''

## 跨服状态所在地图ID: 0-非跨服状态，非0-跨服状态对应的地图ID

def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()

def SetCrossMapID(curPlayer, value, isNotifyMapServer=True):

    curPlayer.SetExAttr5(value)

    SetMapServerPlayerAttrValue(curPlayer, "SetExAttr5", value)

    if isNotifyMapServer:

        SetMapServerPlayerAttrValue(curPlayer, "SetExAttr5", value)

    return



def SetMapServerPlayerAttrValue(curPlayer, attrName, value, exData=[]):