fix:3007 开服特惠开启邮件

xdh

2018-09-06 cd39bbdbebdadbb19d860296f9846d864b16c2f6

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py

@@ -1846,6 +1846,7 @@
    curMap = GameWorld.GetMap()

    #校验客户端时间

    if not PlayerControl.PlayerMoveCheckClientWorldTick(curPlayer, clientWorldTick, client_StartX, client_StartY):

        curPlayer.Sync_ClientTick()

        return

    

    #移动点检查

@@ -3479,8 +3480,14 @@
        return

    

    mapID = curPlayer.GetMapID()

    
    activityLineID = 0 # 活动线, 默认1线

    activityMapLineDict = IpyGameDataPY.GetFuncEvalCfg("MapLine", 2, {})

    if mapID in activityMapLineDict:

        activityLineID = max(0, activityMapLineDict[mapID] - 1)

        
    mapLineDict = IpyGameDataPY.GetFuncEvalCfg("MapLine", 1)

    if mapID in mapLineDict and changLineID >= mapLineDict[mapID]:

    if changLineID != activityLineID and mapID in mapLineDict and changLineID >= mapLineDict[mapID]:

        GameWorld.ErrLog("该地图没有开放此线路，无法手动切换！mapID=%s,changLineID=%s,maxLine=%s" 

                         % (mapID, changLineID, mapLineDict[mapID]), curPlayer.GetID())

        return

@@ -3663,6 +3670,7 @@
    rebornTime = GetRebronTime(curPlayer, playerRebornType)    

    #冷却时间到了

    if not CanRebornByTimeOver(curPlayer, rebornTime):

        PlayerControl.NotifyCode(curPlayer, 'RebornCD')

        return False

    

    isFBReborn = False

@@ -5267,7 +5275,7 @@
        # 请求GameServer目标地图NPC信息

        sendMsg = "%s" % str([tagMapID, tagLineID, npcIDList])

        curPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_NPCCnt, 0,

                                 'NPCCntInfo', sendMsg, len(sendMsg))

                                 'NPCCnt', sendMsg, len(sendMsg))

    return





@@ -5408,6 +5416,7 @@


    #校验客户端时间

    if not PlayerControl.PlayerMoveCheckClientWorldTick(curPlayer, sendPack_WorldTick, sendPack_SeverPosX, sendPack_SeverPosY):

        curPlayer.Sync_ClientTick()

        return False



    dist = GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), sendPack_SeverPosX, sendPack_SeverPosY)