ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
@@ -29,7 +29,6 @@
#---------------------------------------------------------------------
import GameWorld
import IPY_GameServer
import MergeBroadcast
import IpyGameDataPY
import CrossRealmMsg
import ShareDefine
@@ -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
    
## 世界广播
@@ -230,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):