541 【幻境阁】新增称号加成效果-服务端（修复称号无属性时特殊效果也会无效的bug；）

hxp

6 天以前 ee23480a49debf8542eb1e6328f7e31be06005fd

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

@@ -41,15 +41,12 @@
import NetPackCommon

import IpyGameDataPY

import ShareDefine

import PlayerFlashGiftbag

import PlayerDailyGiftbag

import PlayerGoldGift

import PlayerActTotalRecharge

import PlayerActManyDayRecharge

import PlayerActSingleRecharge

import PlayerActGrowupBuy

import PlayerActHeroAppear

import PlayerGoldInvest

import PlayerActTurntable

import PlayerZhanling

import PlayerGoldRush

import PlayerLLMJ

@@ -173,7 +170,6 @@
    ## 充值相关过天

    

    #在重置之前需要处理的

    PlayerActGrowupBuy.DoUpdateGrowupBuyStateOnDay(curPlayer) # 成长必买

    

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TodayCTGCoinTotal, 0)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CTGRealToday, 0)

@@ -485,13 +481,6 @@
            return

        moneyType, addGold, prizeGold, giveItemList, ctgIpyData = ctgResultInfo

        

    elif ipyData.GetGiftbagID():

        giftbagID = ipyData.GetGiftbagID()

        if 100 <= giftbagID < 199:

            if not PlayerDailyGiftbag.OnPlayerOrderDailyGiftbag(curPlayer, giftbagID, addDRDict):

                return

        elif not PlayerFlashGiftbag.OnPlayerOrderGiftbag(curPlayer, [ipyData.GetGiftbagID()], addDRDict):

            return

    else:

        #用于支付其他的商品，待扩展...

        DataRecordPack.DR_CTGError(curPlayer, "The orderInfo is useless!", addDRDict)

@@ -524,13 +513,6 @@
    

    addDRDict.update({"recordID":recordID})

    

    # 成长必买类型

    if ipyData.GetPayType() == PayType_GrowupBuy:

        canBuy, errInfo = PlayerActGrowupBuy.CheckGrowupBuyState(curPlayer, recordID)

        if not canBuy:

            DataRecordPack.DR_CTGError(curPlayer, errInfo, addDRDict)

            return

        
    totalBuyCountLimit = ipyData.GetTotalBuyCount()

    totalBuyCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CTGGoodsBuyCount % recordID)

    if totalBuyCountLimit:

@@ -580,6 +562,7 @@
    giveItemList = []

    giveItemList += GetCTGGiveItemList(ipyData)

    giveItemList += selectItemList

    giveItemList += PlayerActHeroAppear.GetCTGActItemList(curPlayer, recordID) # 武将登场

    

    #payType = ipyData.GetPayType()

    moneyType = ipyData.GetMoneyType() # 获得货币类型

@@ -664,27 +647,9 @@
        return []

    

    gainItemList = ipyData.GetGainItemList()

    actWorldLVGainItemInfo = ipyData.GetActWorldLVGainItemInfo()

    giveItemList = []

    # 活动世界等级对应物品信息，如果有对应活动支持 且 该配置有配，则默认走该配置，否则使用常规的默认物品配置

    payTypeActNameDict = {PayType_GrowupBuy:ShareDefine.OperationActionName_GrowupBuy,

                          
                          # ... 有新增的活动需要支持，则在此新增配置上即可，后面取物品的逻辑都是一样的

                          }

    if actWorldLVGainItemInfo and ipyData.GetPayType() in payTypeActNameDict:

        actName = payTypeActNameDict[ipyData.GetPayType()]

        actInfo = PyGameData.g_operationActionDict.get(actName, {}) # 注：相关状态在前置逻辑已经判断过，这里不再判断

        actWorldLV = actInfo.get(ShareDefine.ActKey_WorldLV, 0)

        actWorldLVList = [int(strWorldLV) for strWorldLV in actWorldLVGainItemInfo.keys()]

        actWorldLVList.sort() # 使用 int 的值排，否则可能引起排序错误

        for worldLV in actWorldLVList:

            if actWorldLV <= worldLV:

                giveItemList = actWorldLVGainItemInfo[str(worldLV)]

                break

        if not giveItemList:

            giveItemList = actWorldLVGainItemInfo[str(actWorldLVList[-1])] # 没有匹配到的话默认取最后一个等级配置

    else:

        giveItemList = gainItemList

    #actWorldLVGainItemInfo = ipyData.GetActWorldLVGainItemInfo()

    #giveItemList = []

    giveItemList = gainItemList

    return giveItemList



def __OnCTGReal(curPlayer, orderCoin):

@@ -813,7 +778,6 @@
    #累积充值X元

    PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin, coinType)

    PlayerActSingleRecharge.UpdSingleRechargeValue(curPlayer, orderCoin, coinType) # 单笔累充

    PlayerActTurntable.OnPlayerRecharge(curPlayer, orderCoin, coinType) # 转盘

    #投资

    if ctgIpyData:

        ctgID = ctgIpyData.GetRecordID()