Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hxp

2019-02-13 215a4edca77b43f1a60cf43c07049eb0a133d43a

 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



@@ -199,7 +200,7 @@
            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftHasOpen, 1)

            

    

    
    SyncMysticalShopInfo(curPlayer)

    SyncShopItemTodayBuyCount(curPlayer)

    SyncSuperGiftInfo(curPlayer)

    return

@@ -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()):

@@ -280,6 +287,49 @@
        syncIndexList.append(shopItem.GetID())

    if syncIndexList:

        SyncShopItemTodayBuyCount(curPlayer, syncIndexList, True)

    return



def MysticalShopOpen(curPlayer, befLV, aftLV):

    ##神秘限购开启

    ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('Store', {'ShopType':16}, True)

    if not ipyDataList:

        return

    curTime = int(time.time())

    syncGoodsList = []

    for ipyData in ipyDataList:

        limitLV = ipyData.GetLimitLV()

        if befLV < limitLV and aftLV >= limitLV:

            goodsID = ipyData.GetID()

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ShopItemStartTime % goodsID, curTime)

            syncGoodsList.append(goodsID)

            GameWorld.DebugLog('神秘限购商品%s 开卖'%goodsID, curPlayer.GetID())

    if syncGoodsList:

        SyncMysticalShopInfo(curPlayer)

    return



def SyncMysticalShopInfo(curPlayer):

    ##神秘限购通知

    packData = ChPyNetSendPack.tagMCMysticalShopTimeInfo()

    packData.ShopTimeList = []

    ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('Store', {'ShopType':16}, True)

    curTime = int(time.time())

    for ipyData in ipyDataList:

        goodsID = ipyData.GetID()

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

        if not startTime:

            continue

        if curTime - startTime >= ipyData.GetLimitValue():

            #超时的重置

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ShopItemStartTime % goodsID, 0)

        else:

            goodsTime = ChPyNetSendPack.tagMCMysticalShopTime()

            goodsTime.GoodsID = goodsID

            goodsTime.StartTime = startTime

            packData.ShopTimeList.append(goodsTime)

    if not packData.ShopTimeList:

        return

    packData.Count = len(packData.ShopTimeList)

    NetPackCommon.SendFakePack(curPlayer, packData)

    return



## 回购物品

@@ -334,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:

@@ -355,7 +408,7 @@
        if not state:

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

            return

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

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

        if not shopTypeList:

            return

        actShopType = shopTypeList[-1] if state > len(shopTypeList) else shopTypeList[state - 1]

@@ -369,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]

@@ -429,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:

@@ -549,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]:

@@ -593,9 +649,15 @@
    #烟花狂欢

    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())

        return not startTime or curTime - startTime >= limitValue

        
#    

#    limitPlusDict = {shopItem.GetLimitPlusType1():shopItem.GetLimitPlusValue1(),

#                     shopItem.GetLimitPlusType2():shopItem.GetLimitPlusValue2(),