6459 【后端】【2.0】缥缈仙域开发单（查询副本功能线路人数信息逻辑修改，支持查询妖王地图）

hxp

2019-04-22 c939b30761259159d62bdc92320375310b3bb010

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

@@ -352,6 +352,18 @@
    SendMail("", content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource)

    return



def SendCrossMail(serverGroupID, mailTypeKey, playerIDList, addItemList, paramList=[]):

    ## 发送跨服邮件

    if not serverGroupID:

        return

    dataMsg = {"MailTypeKey":mailTypeKey, "Player":playerIDList}

    if addItemList:

        dataMsg["Item"] = CombineMailItem(addItemList)

    if paramList:

        dataMsg["Param"] = paramList

    GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_SendMail, dataMsg, [serverGroupID])

    return



## 功能发放物品补偿/奖励邮件

#  @param addItemList [(itemID, itemCnt, 是否拍品), {或物品信息字典}, ...]

#  @return

@@ -370,6 +382,13 @@
    if GameWorld.IsCrossServer():

        return

    

    combineItemList = CombineMailItem(addItemList)

    cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail, moneySource]

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMail", '%s' % (cmdList), len(str(cmdList)))

    return True



def CombineMailItem(addItemList):

    ## 合并邮件物品

    itemCountDict = {}

    combineItemList = [] # 合并后的物品列表

    for mailItem in addItemList:

@@ -399,9 +418,7 @@
    for key, itemCnt in itemCountDict.items():

        itemID, isAuctionItem = key

        combineItemList.append((itemID, itemCnt, isAuctionItem))

    cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail, moneySource]

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMail", '%s' % (cmdList), len(str(cmdList)))

    return True

    return combineItemList



## 构建系统提示参数列表

#  @param msgParamList 信息参数列表

@@ -778,8 +795,8 @@
        return

    

    #副本中不打断

    if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:

        return

    #if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:

    #    return

    

    tagObj = curPlayer.GetActionObj()

    

@@ -799,10 +816,14 @@
        #GameWorld.Log("BreakPlayerCollect ->没有这个NPC", curPlayer.GetPlayerID())

        return

    

    if curNPC.GetNPCID() not in ReadChConfig.GetEvalChConfig('BreakPlayerCollectNPCIDList'):

    npcID = curNPC.GetNPCID()

    collectNPCIpyData = IpyGameDataPY.GetIpyGameDataNotLog("CollectNPC", npcID)

    if not collectNPCIpyData:

        return

    

    GameWorld.DebugLog('    采集被打断 采集物NPCID=%s' % curNPC.GetNPCID())

    if not collectNPCIpyData.GetCanBreakCollect():

        return

    
    #取消采集状态

    ChangePlayerAction(curPlayer, IPY_GameWorld.paNull)

    

@@ -1592,6 +1613,18 @@
    if mapID not in ChConfig.Def_CrossMapIDList:

        return

    

    tick = GameWorld.GetGameWorld().GetTick()

    lastRequestTick = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_RequestEnterCrossServerTick)

    if lastRequestTick and tick - lastRequestTick < 5000:

        GameWorld.DebugLog("    请求进入跨服CD中!", playerID)

        NotifyCode(curPlayer, "RequestEnterCrossServerCD")

        return

    
    crossRegisterMap = curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_CrossRegisterMap)

    if crossRegisterMap:

        GameWorld.ErrLog("跨服已经在上传数据，不重复提交!crossRegisterMap=%s,mapID=%s" % (crossRegisterMap, mapID), playerID)

        return

    
    if GameWorld.IsCrossServer():

        GameWorld.DebugLog("跨服服务器不允许该操作!")

        return

@@ -1626,15 +1659,11 @@
        if ret != ShareDefine.EntFBAskRet_OK:

            return

        

    tick = GameWorld.GetGameWorld().GetTick()

    for mapIDList in ChConfig.Def_FB_MapID.values():

        if mapID not in mapIDList:

            continue

        if not FBLogic.OnEnterFBEvent(curPlayer, mapID, lineID, tick):

            GameWorld.DebugLog("    OnEnterFBEvent False!", curPlayer.GetPlayerID())

            NotifyCode(curPlayer, "SingleEnterDefaul")

            return

        break

    
        
    # 需要动态分布线路的地图，发送到跨服服务器进行分配

    if mapID in ChConfig.Def_CrossDynamicLineMap:

        extendInfo = {}

@@ -1648,9 +1677,11 @@
        if extendInfo:

            msgDict.update(extendInfo)

        GameWorld.SendMsgToCrossServer(ShareDefine.ClientServerMsg_EnterFB, msgDict)

        return

    
    GY_Query_CrossRealmReg.RegisterEnterCrossServer(curPlayer, mapID, lineID=lineID)

    else:

        isSend = GY_Query_CrossRealmReg.RegisterEnterCrossServer(curPlayer, mapID, lineID=lineID)

        if not isSend:

            return

    curPlayer.SetDict(ChConfig.Def_PlayerKey_RequestEnterCrossServerTick, tick)

    return



##玩家进入副本