ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
@@ -464,25 +464,12 @@
    mapID = clientData.MapID
    funcLineID = clientData.FuncLineID
    prizeItemList = FBLogic.OnRefreshCustomFBPrize(curPlayer, mapID, funcLineID)
    if not prizeItemList:
        return
    PyGameData.g_customFBPrizeInfo[playerID] = [mapID, funcLineID, prizeItemList]
    PyGameData.g_customFBPrizeInfo[playerID] = prizeItemList
    prizePack = ChPyNetSendPack.tagMCCuntomFBPrizeInfo()
    prizePack.MapID = mapID
    prizePack.FuncLineID = funcLineID
    prizePack.PrizeItemList = []
    for prizeItemInfo in prizeItemList:
        itemID, itemCount, isAuctionItem, userData = ItemControler.GetItemInfo(prizeItemInfo)
        if not itemID:
            continue
        prizeItem = ChPyNetSendPack.tagMCCuntomFBPrizeItem()
        prizeItem.ItemID = itemID
        prizeItem.Count = itemCount
        prizeItem.IsAuctionItem = isAuctionItem
        prizeItem.UserData = userData
        prizeItem.UserDataLen = len(prizeItem.UserData)
        prizePack.PrizeItemList.append(prizeItem)
    prizePack.PrizeItemCount = len(prizePack.PrizeItemList)
    prizePack.PrizeItemIDList = [prizeItemInfo[0] for prizeItemInfo in prizeItemList]
    prizePack.PrizeItemCount = len(prizePack.PrizeItemIDList)
    NetPackCommon.SendFakePack(curPlayer, prizePack)
    return
@@ -498,16 +485,30 @@
def OnGiveCustomFBPrize(playerIndex, clientData, tick):
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(playerIndex)
    playerID = curPlayer.GetPlayerID()
    packMapID = clientData.MapID
    packFuncLineID = clientData.FuncLineID
    prizeInfo = PyGameData.g_customFBPrizeInfo.pop(playerID, None)
    if not prizeInfo:
        return
    mapID, funcLineID, prizeItemList = prizeInfo
    if mapID != packMapID or funcLineID != packFuncLineID:
        return
    FBLogic.OnGiveCustomFBPrizeOK(curPlayer, mapID, funcLineID)
    ItemControler.GivePlayerItemOrMail(curPlayer, prizeItemList)
    mapID = clientData.MapID
    lineID = clientData.FuncLineID
    prizeItemList = PyGameData.g_customFBPrizeInfo.pop(playerID, [])
    mailItemList = []
    jsonItemList = []
    playerItemControl = ItemControler.PlayerItemControler(curPlayer)
    for itemID, itemCount, isAuctionItem in prizeItemList:
        curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem, curPlayer=curPlayer)
        if not curItem:
            continue
        jsonItem = ItemCommon.GetJsonItem(curItem)
        jsonItemList.append(jsonItem)
        #放入玩家背包
        if not playerItemControl.PutInItem(IPY_GameWorld.rptItem, curItem):
            mailItemList.append(jsonItem)
    if mailItemList:
        PlayerControl.SendMailByKey("ItemNoPickUp", [playerID], mailItemList, [mapID])
    overDict = FBLogic.OnGiveCustomFBPrizeOK(curPlayer, mapID, lineID)
    isPass = 1
    overDict.update({FBCommon.Over_itemInfo:jsonItemList})
    FBCommon.NotifyFBOver(curPlayer, mapID, lineID, isPass, overDict)
    return