hxp
2018-12-26 669ad215fec240afaf92be612f2b0077731c8e0f
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -42,9 +42,7 @@
import GameWorldActionTeHui
import PlayerXMZZ
import GameWorldShopItem
import MergeChildMsg
import PlayerTruck
import PlayerMergeEvent
import HighLadder
import EventReport
import MergePlayer
@@ -126,21 +124,12 @@
        # 通知广播信息
        GMCommon.SendBroadCastToClient(curPlayer)
    
        # 在非跨服服务器上线时,在跨服PK赛期间如果roomID不为0则重置
        #if not GameWorld.IsMergeServer() and GameWorldMergePK.IsMergePKMatchOpen() \
        #    and curPlayer.GetVsRoomId() != 0:
        #    PlayerControl.SetVsRoomId(curPlayer, 0)
        PlayerTruck.SyncPlayerTruckStartTime(curPlayer)
        #通知玩家交易所挂单情况
        PlayerBourse.OnPlayerLogin(curPlayer)
        #上线广播
        __CheckWorldNotifyOnLogin(curPlayer, tick)
        #上线奖励处理
        #PlayerMergeEvent.MergeEventOnPlayerLogin(curPlayer)
        #MergePlayer.OnPlayerLogin(curPlayer)
        
        #仙盟红包
        PlayerFamilyRedPacket.OnPlayerLogin(curPlayer)
@@ -187,7 +176,7 @@
#  @return None
def __CheckWorldNotifyOnLogin(curPlayer, tick):
    # 跨服服务器不广播
    if GameWorld.IsMergeServer():
    if GameWorld.IsCrossServer():
        return
    
    limitLV = IpyGameDataPY.GetFuncCfg("BillBoardPlayerLoginNotify", 2) # 最低等级限制
@@ -261,31 +250,6 @@
    diff_Time = loginTime - logoffTime
    #天数 * 24小时 * 60 分钟 + 秒
    return diff_Time.days * 24 * 60 * 60 + diff_Time.seconds
## 统计客户端跨服赛激活时间
#  @param index 玩家索引
#  @return None
def SendMergeWarOpen(curPlayer):
    # 发送跨服赛服务器信息
    mapConfig = GameConfig.GetConfig()
    mergeServerIP = mapConfig.get("MergeServerIP")
    mergeServerPort = mapConfig.get("MergeServerPort")
    if not mergeServerIP:
        return
    mergeServerInfo = ChPyNetSendPack.tagMergeServerInfo()
    mergeServerInfo.ServerIPLen = len(mergeServerIP)
    mergeServerInfo.ServerIP = mergeServerIP
    mergeServerInfo.Port = mergeServerPort
    mergeServerInfo.IsMergeServer = GameWorld.IsMergeServer()
    NetPackCommon.SendFakePack(curPlayer, mergeServerInfo)
    return
## 跨服赛通知奖励
#  @param curPlayer: 玩家实例
#  @return: None
def MSGetReward(curPlayer):
    #PlayerCanGetReward.SynClient_CanGetRewardList(curPlayer)
    return
## 运营登陆信息处理
#  @param curPlayer