6087 【后端】【1.5.200】春节红包雨活动（成就完成修改）

xdh

2019-01-31 2a8f48212d23842a9f7acceaa16ad324e7a32738

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py

@@ -64,6 +64,7 @@
import PlayerRune

import GameFuncComm

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerSpringSale

import PyGameData



@@ -242,8 +243,14 @@
    __ResetShopItemBuyCount(curPlayer, [refreshType])

    return



def ShopItemOnCrossPKSeasonChange(curPlayer):

    ## 按跨服PK赛季重置

    refreshType = 8

    __ResetShopItemBuyCount(curPlayer, [refreshType])

    return



def __ResetShopItemBuyCount(curPlayer, onEventTypeList):

    #重置商店物品购买次数  1：周一0点刷新    2：周一5点刷新    3：每日0点刷新    4：每日5点刷新    5每月0点    6每月5点

    #重置商店物品购买次数  1：周一0点刷新    2：周一5点刷新    3：每日0点刷新    4：每日5点刷新    5每月0点    6每月5点   7每3天5点  8每赛季

    syncIndexList = []

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    for i in xrange(ipyDataMgr.GetStoreCount()):

@@ -377,7 +384,10 @@
# @param tick 时间戳

# @return 返回值真, 逻辑运行成功

def BuyItem(curPlayer, tick):



    
    if GameWorld.IsCrossServer():

        return

    
    buyItemList = IPY_GameWorld.IPY_CBuyItemList()    

    itemIndex = buyItemList.GetBuyItemIndex()

    if itemIndex < 0:

@@ -412,7 +422,7 @@
        if not state:

            GameWorld.DebugLog("限时抢购非活动中！state=%s" % (state), curPlayer.GetPlayerID())

            return

        shopTypeList = PlayerFlashSale.GetShopTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0), state)

        shopTypeList = PlayerFlashSale.GetShopTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0), state, actInfo.get(ShareDefine.ActKey_WorldLV, 0))

        if not shopTypeList:

            return

        actShopType = shopTypeList[0]

@@ -472,10 +482,10 @@
    jobItemList = ipyData.GetJobItem()

    totalItemList = []

    if itemID:

        jobItemID = __GetShopJobItem(job, itemID, jobItemList)

        jobItemID = GetShopJobItem(job, itemID, jobItemList)

        totalItemList.append([jobItemID, itemCount * clientBuyCount, isBind])

    for itemIDEx, itemCountEx, isBindEx in itemListEx:

        jobItemID = __GetShopJobItem(job, itemIDEx, jobItemList)

        jobItemID = GetShopJobItem(job, itemIDEx, jobItemList)

        totalItemList.append([jobItemID, itemCountEx * clientBuyCount, isBindEx])

    #允许价钱配置0，用来免费购买

    if not totalItemList:

@@ -592,9 +602,12 @@
    SyncShoppingResult(curPlayer, itemIndex, clientBuyCount)

    if itemIndex in IpyGameDataPY.GetFuncEvalCfg('CeremonyFireParty', 1, {}).values():

        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Fireworks, clientBuyCount)

    if itemIndex in IpyGameDataPY.GetFuncEvalCfg('NewCeremonyFireParty', 1, {}).values():

        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Fireworks, clientBuyCount)

    
    return



def __GetShopJobItem(job, itemID, jobItemList):

def GetShopJobItem(job, itemID, jobItemList):

    ## 获取商城物品对应的职业物品， 职业从1开始

    for jobItemIDList in jobItemList:

        if type(jobItemIDList) not in [list, tuple]:

@@ -636,9 +649,10 @@
    #烟花狂欢

    if itemIndex in IpyGameDataPY.GetFuncEvalCfg('CeremonyFireParty', 1, {}).values():

        return not PlayerFairyCeremony.IsCanBuyFireworks(curPlayer, itemIndex)

    
    if itemIndex in dict(IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList')):

        return not CheckSuperGiftBuy(curPlayer, itemIndex)

    if itemIndex in IpyGameDataPY.GetFuncEvalCfg('NewCeremonyFireParty', 1, {}).values():

        return not PlayerNewFairyCeremony.IsCanBuyFireworks(curPlayer, itemIndex)

#    if itemIndex in dict(IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList')):

#        return not CheckSuperGiftBuy(curPlayer, itemIndex)

    if shopNPCID == 16:#神秘限购

        startTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShopItemStartTime % itemIndex)

        curTime = int(time.time())