xdh
2018-09-14 01e033a79a5ce63e298015d0783560a77ccffea9
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -108,6 +108,7 @@
import PlayerSpringSale
import PlayerFairyCeremony
import ChNetSendPack
import FamilyRobBoss
import PyGameData
import PlayerCoin
import PlayerGeTui
@@ -537,11 +538,13 @@
    SyncPackDownloadAward(curPlayer)
    # 登录触发功能开启(老号处理)
    GameFuncComm.DoFuncOpenLogic(curPlayer)
   # 神兽
    # 神兽
    PlayerDogz.OnPlayerLogin(curPlayer)
   # 神兽副本
    # 神兽副本
    GameLogic_Dogz.SyncNPCRefreshTime(curPlayer.GetID())
    # 骑宠
    FamilyRobBoss.OnPlayerLogin(curPlayer)
    # 上线查询一次充值订单
    curPlayer.SendDBQueryRecharge()
    
@@ -1846,6 +1849,7 @@
    curMap = GameWorld.GetMap()
    #校验客户端时间
    if not PlayerControl.PlayerMoveCheckClientWorldTick(curPlayer, clientWorldTick, client_StartX, client_StartY):
        curPlayer.Sync_ClientTick()
        return
    
    #移动点检查
@@ -3479,8 +3483,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 +3673,7 @@
    rebornTime = GetRebronTime(curPlayer, playerRebornType)    
    #冷却时间到了
    if not CanRebornByTimeOver(curPlayer, rebornTime):
        PlayerControl.NotifyCode(curPlayer, 'RebornCD')
        return False
    
    isFBReborn = False
@@ -5267,7 +5278,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 +5419,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)