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,9 +52,9 @@
    curPlayer.NotifyCode(msgMark, __GetNotifyCodeList(msgParamList))
    return
def NotifyCodeToClientServer(serverGroupID, playerID, msgMark, msgParamList=[]):
def NotifyCodeToClientServer(serverGroupIDList, playerID, msgMark, msgParamList=[]):
    dataMsg = {"Type":"Player", "ID":playerID, "Mark":msgMark, "Param":msgParamList}
    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, dataMsg, [serverGroupID])
    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, dataMsg, serverGroupIDList)
    return
def CrossServerMsg_Notify(notifyInfoDict):
@@ -82,7 +81,7 @@
        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)
    #.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)
    return
    
## 世界广播
@@ -92,7 +91,7 @@
#  @return 无返回值
#  @remarks 
def WorldNotify(country, msgMark, msgParamList=[]):
    if GameWorld.IsMergeServer():
    if GameWorld.IsCrossServer():
        MergeWorldNotify(country, msgMark, msgParamList)
    else:
        GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
@@ -188,19 +187,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()
@@ -243,6 +229,9 @@
    return 
def GetLeaveFamilyTime(curPlayer):return curPlayer.GetExAttr12()
## 玩家所属服务器组ID
def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()
## 是否脱机挂机状态
def GetIsTJG(curPlayer):
    if curPlayer.GetDictByKey(ChConfig.Def_OnlineType):