2198 【主干】仙盟盟主5天没上线，盟主没有主动传位

xdh

2018-10-25 6366979426fccd97c0cb0bd384ada3a8b9843a24

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

@@ -62,9 +62,9 @@
import PlayerActivity

import PlayerTeHui

import FBCommon

import HighLadderTube

import PlayerBindJadeWheel

import BossHurtMng

import PlayerAction

import PlayerWishingWell

import PlayerAttrFruit

import PlayerSuccess

import PlayerDienstgrad

@@ -102,12 +102,13 @@
import PlayerTJG

import GameLogic_XMZZ

import GameLogic_SealDemon

import GameLogic_Dogz

import PlayerFlashSale

import PlayerFlashGiftbag

import PlayerCostRebate

import PlayerSpringSale

import PlayerFairyCeremony

import ChNetSendPack

import FamilyRobBoss

import PyGameData

import PlayerCoin

import PlayerGeTui

@@ -237,6 +238,7 @@
    curPlayer.SetDict(ChConfig.Def_PlayerKey_LoadMapIsLogin, 1)

    #通知时间

    Sync_PyServerDataTimeToClient(curPlayer)

    Sync_OpenServerDay(curPlayer)

    #通知玩家基本信息

    curPlayer.Sync_ClientPlayerLogin()

    

@@ -489,7 +491,8 @@
    PlayerSpringSale.OnPlayerLogin(curPlayer)

    #限时礼包

    PlayerFlashGiftbag.OnPlayerLogin(curPlayer)

    
    #限时抢购

    PlayerFlashSale.OnPlayerLogin(curPlayer)

#    # 消费VIP

#    PlayerCostVIP.CostVIPOnLogin(curPlayer, tick)

#    

@@ -537,11 +540,14 @@
    SyncPackDownloadAward(curPlayer)

    # 登录触发功能开启（老号处理）

    GameFuncComm.DoFuncOpenLogic(curPlayer)

   # 神兽

    # 神兽

    PlayerDogz.OnPlayerLogin(curPlayer)

   # 神兽副本

    GameLogic_Dogz.SyncNPCRefreshTime(curPlayer.GetID())



    # 骑宠

    FamilyRobBoss.OnPlayerLogin(curPlayer)

    # 绑玉转盘

    PlayerBindJadeWheel.OnLogin(curPlayer)

    # 许愿池

    PlayerWishingWell.OnLogin(curPlayer)

    # 上线查询一次充值订单

    curPlayer.SendDBQueryRecharge()

    

@@ -550,7 +556,10 @@
    tjgTime = PlayerTJG.GetTJGTime(curPlayer)

    if tjgTime:

        curPlayer.SendGameServerRefreshState(IPY_GameWorld.CDBPlayerRefresh_HappyPoint, tjgTime)

    
        
    # 如果被禁言的，上线同步前端

    if curPlayer.GetGMForbidenTalk():

        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, curPlayer.GetGMForbidenTalk(), False)

    return





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

    #校验客户端时间

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

        curPlayer.Sync_ClientTick()

        return

    

    #移动点检查

@@ -3479,8 +3489,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 +3679,7 @@
    rebornTime = GetRebronTime(curPlayer, playerRebornType)    

    #冷却时间到了

    if not CanRebornByTimeOver(curPlayer, rebornTime):

        PlayerControl.NotifyCode(curPlayer, 'RebornCD')

        return False

    

    isFBReborn = False

@@ -4375,16 +4392,6 @@
        PlayerControl.NotifyCode(curPlayer, "04BBF813-7A30-47A8-927DE1ACCC4F378E")

        return



#===============================================================================

#    isFreedomTransBuff = SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID)

#    if not PlayerControl.IsPlayerInFight(curPlayer):

# 
#        if (transportType == ChConfig.Def_Transport_Type_BigMap) or (not isFreedomTransBuff):

#            #传送支付处理

# 
#            if not PayForTransport(curPlayer, transportType, isAutoBuy):

#                return

#===============================================================================

    #是任务传送，VIP等级不够，且传送符不足，不处理

    if transportType == ChConfig.Def_Transport_Type_Mission and \

       not TransportVipLvRestrict(curPlayer, transportType) and \

@@ -4486,12 +4493,6 @@
#  @param transportType 传送类型

#  @return 是否vip等级限制

def TransportVipLvRestrict(curPlayer, transportType):

    
    #大地图标记传送不能体验无限飞buff功能

    if transportType != ChConfig.Def_Transport_Type_BigMap:

        if SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID):

            #有无限飞buff

            return True

    return PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_FreeTransport)





@@ -4981,6 +4982,10 @@
    # 领取分包下载奖励

    elif rewardType == ChConfig.Def_RewardType_DownLoad:

        GetDownloadAward(curPlayer, dataEx)

    # 领取许愿池奖励

    elif rewardType == ChConfig.Def_RewardType_WishingWell:

        PlayerWishingWell.DoGetWishingAward(curPlayer)

    
#

#    # 充值豪礼奖励

#    elif rewardType == ShareDefine.Def_RewardType_GoldGift:

@@ -5267,7 +5272,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





@@ -5315,6 +5320,29 @@
    NetPackCommon.SendFakePack(curPlayer, serverDateTime)

    return



## 通知开服天数

#  @param curPlayer: 玩家实例

#  @return: None

def Sync_OpenServerDay(curPlayer):

    serverTime = GameWorld.GetCurrentTime()

    if not serverTime:

        return

    gw = GameWorld.GetGameWorld()

    packData = ChPyNetSendPack.tagOpenServerDay()

    packData.Clear()

    packData.Day = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)

    packData.IsMixServer = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_IsMixServer)

    packData.MixDay = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay)

    packData.OpenWeekday = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_OpenServerWeekday)

    packData.NowYear = serverTime.year

    packData.NowMonth = serverTime.month

    packData.NowDay = serverTime.day

    packData.NowHour = serverTime.hour

    packData.NowMinute = serverTime.minute

    packData.NowSecond = serverTime.second

    packData.NowMicSecond = serverTime.microsecond

    NetPackCommon.SendFakePack(curPlayer, packData)

    return



#===============================================================================

# //B4 09 玩家移动 # tagCMPyMove

@@ -5408,6 +5436,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)

@@ -5508,4 +5537,17 @@
    sendPack.Clear()

    sendPack.Record = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DownloadAwardState)

    NetPackCommon.SendFakePack(curPlayer, sendPack)

    return
    return



def NotifyPlayerMove(curPlayer, posX, posY, npcID=0):

    '''通知前端向某个点移动

                这里前端可能需要针对某次移动做额外处理，比如移动到某个点后需要自动战斗等

                所以这里只做通知前端可以向某个点移动，最终移动由前端发起

    '''

    sendPack = ChPyNetSendPack.tagMCNotifyPlayerMove()

    sendPack.Clear()

    sendPack.PosX = posX

    sendPack.PosY = posY

    sendPack.NPCID = npcID

    NetPackCommon.SendFakePack(curPlayer, sendPack)

    return