8906 【主干】【BT2】【后端】线下单笔充值活动逻辑调整（支持三种领奖模式设定；0-向下兼容，1-匹配最高档，2-精确匹配档次）

hxp

2021-04-16 5b48407be93e85ebf82ccc8ff13e9f4c561195c4

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

@@ -109,8 +109,8 @@
    if not playerTemplateID:

        return

    

    curRechargeValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

    if not curRechargeValue:

    canAwardValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

    if not canAwardValue:

        return

    

    ipyDataList = IpyGameDataPY.GetIpyGameDataList("ActSingleRechargeAward", playerTemplateID)

@@ -124,10 +124,12 @@
    for ipyData in ipyDataList:

        awardIndex = ipyData.GetAwardIndex()

        if awardRecord & pow(2, awardIndex):

            #GameWorld.DebugLog("单笔累充已发放过奖励！awardIndex=%s" % awardIndex)

            continue

        

        singleValue = ipyData.GetSingleRechargeValue()

        if curRechargeValue < CommFunc.RMBToCoin(singleValue):

        if not canAwardValue & pow(2, awardIndex):

            #GameWorld.DebugLog("单笔累充不能领奖！awardIndex=%s" % awardIndex)

            continue

        awardRecord |= pow(2, awardIndex) 

        

@@ -142,8 +144,8 @@
        

    return



def UpdSingleRechargeValue(curPlayer, updRechargeValue, coinType):

    if updRechargeValue <= 0:

def UpdSingleRechargeValue(curPlayer, curRechargeValue, coinType):

    if curRechargeValue <= 0:

        return

    

    for actInfo in PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_SingleRecharge, {}).values():

@@ -171,16 +173,81 @@
            GameWorld.ErrLog("单笔累充充值活动数据异常!cfgID=%s,templateID=%s" % (cfgID, templateID), curPlayer.GetPlayerID())

            continue

        

        curRechargeValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

        if curRechargeValue >= updRechargeValue:

            GameWorld.DebugLog("单笔累充充值活动，未超过当前单笔累充额度，不更新! actNum=%s,curRechargeValue=%s >= updRechargeValue=%s" 
                               % (actNum, curRechargeValue, updRechargeValue), curPlayer.GetPlayerID())

        awardIpyDataList = IpyGameDataPY.GetIpyGameDataList("ActSingleRechargeAward", templateID)

        if not awardIpyDataList:

            continue

        

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SingleRechargeValue % actNum, updRechargeValue)

        canAwardChange = False

        canAwardValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

        awardRuleType = ipyData.GetAwardRuleType()

        GameWorld.DebugLog("单笔累充充值活动，actNum=%s,awardRuleType=%s,canAwardValue=%s,curRechargeValue=%s" 
                           % (actNum, awardRuleType, canAwardValue, curRechargeValue))

        # 向下兼容所有档次

        if awardRuleType == 0:

            for awardIpyData in awardIpyDataList:

                awardIndex = awardIpyData.GetAwardIndex()

                singleValue = CommFunc.RMBToCoin(awardIpyData.GetSingleRechargeValue())

                if canAwardValue & pow(2, awardIndex):

                    #GameWorld.DebugLog("    已经可领奖，不处理！awardRuleType=%s,awardIndex=%s" % (awardRuleType, awardIndex))

                    continue

                if curRechargeValue < singleValue:

                    #GameWorld.DebugLog("    未达到档次额度，不处理！awardRuleType=%s,awardIndex=%s,singleValue=%s" 
                    #                   % (awardRuleType, awardIndex, singleValue))

                    continue

                
                canAwardChange = True

                canAwardValue |= pow(2, awardIndex)

                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SingleRechargeValue % actNum, canAwardValue)

                GameWorld.DebugLog("    设置档次可领取！awardRuleType=%s,awardIndex=%s,singleValue=%s,canAwardValue=%s" 
                                   % (awardRuleType, awardIndex, singleValue, canAwardValue))

                
        # 匹配最高档次

        elif awardRuleType == 1:

            for awardIpyData in awardIpyDataList[::-1]:

                awardIndex = awardIpyData.GetAwardIndex()

                singleValue = CommFunc.RMBToCoin(awardIpyData.GetSingleRechargeValue())

                if canAwardValue & pow(2, awardIndex):

                    #GameWorld.DebugLog("    已经可领奖，不处理！awardRuleType=%s,awardIndex=%s" % (awardRuleType, awardIndex))

                    continue

                if curRechargeValue < singleValue:

                    #GameWorld.DebugLog("    未达到档次额度，不处理！awardRuleType=%s,awardIndex=%s,singleValue=%s" 
                    #                   % (awardRuleType, awardIndex, singleValue))

                    continue

                
                canAwardChange = True

                canAwardValue |= pow(2, awardIndex)

                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SingleRechargeValue % actNum, canAwardValue)

                GameWorld.DebugLog("    设置最高档次可领取！awardRuleType=%s,awardIndex=%s,singleValue=%s,canAwardValue=%s" 
                                   % (awardRuleType, awardIndex, singleValue, canAwardValue))

                break

        
        # 精确匹配对应档次

        elif awardRuleType == 2:

            for awardIpyData in awardIpyDataList:

                awardIndex = awardIpyData.GetAwardIndex()

                singleValue = CommFunc.RMBToCoin(awardIpyData.GetSingleRechargeValue())

                if curRechargeValue != singleValue:

                    #GameWorld.DebugLog("    不等于档次额度，不处理！awardRuleType=%s,awardIndex=%s,singleValue=%s" 
                    #                   % (awardRuleType, awardIndex, singleValue))

                    continue

                if canAwardValue & pow(2, awardIndex):

                    #GameWorld.DebugLog("    已经可领奖，不处理！awardRuleType=%s,awardIndex=%s" % (awardRuleType, awardIndex))

                    break

                
                canAwardChange = True

                canAwardValue |= pow(2, awardIndex)

                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SingleRechargeValue % actNum, canAwardValue)

                GameWorld.DebugLog("    设置精确档次可领取！awardRuleType=%s,awardIndex=%s,singleValue=%s,canAwardValue=%s" 
                                   % (awardRuleType, awardIndex, singleValue, canAwardValue))

                break

            
        else:

            continue

        
        if not canAwardChange:

            continue

        
        Sync_SingleRechargePlayerInfo(curPlayer, actNum)

        GameWorld.DebugLog("单笔累充充值活动更新单笔充值额度: actNum=%s,curRechargeValue=%s,updRechargeValue=%s" 
                           % (actNum, curRechargeValue, updRechargeValue), curPlayer.GetPlayerID())

        

        # 线下活动，检查发放奖励

        if ipyData.GetIsOfflineAct():

@@ -227,12 +294,12 @@
        GameWorld.DebugLog("找不到该单笔累充活动档位索引奖励!actNum=%s,templateID=%s,awardIndex=%s" % (actNum, templateID, awardIndex), playerID)

        return

    

    singleValue = CommFunc.RMBToCoin(awardIpyData.GetSingleRechargeValue())

    curRechargeValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

    singleValue = awardIpyData.GetSingleRechargeValue()

    canAwardValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

    

    if curRechargeValue < singleValue:

        GameWorld.DebugLog("所需单笔充值额度不足，无法领取! templateID=%s,awardIndex=%s,singleValue=(%s) > curRechargeValue(%s)" 
                           % (templateID, awardIndex, singleValue, curRechargeValue), playerID)

    if not canAwardValue & pow(2, awardIndex):

        GameWorld.DebugLog("该档次奖励无法领取! templateID=%s,awardIndex=%s,singleValue=%s,canAwardValue%s" 
                           % (templateID, awardIndex, singleValue, canAwardValue), playerID)

        return

    

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

@@ -278,7 +345,7 @@
    

    playerActInfo = ChPyNetSendPack.tagMCActSingleRechargePlayerInfo()

    playerActInfo.ActNum = actNum

    playerActInfo.HightestSingleRecharge = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

    playerActInfo.CanAwardValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeValue % actNum)

    playerActInfo.AwardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SingleRechargeAward % actNum)

    NetPackCommon.SendFakePack(curPlayer, playerActInfo)

    return

@@ -315,6 +382,7 @@
    clientPack.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    clientPack.IsDayReset = ipyData.GetIsDayReset()

    clientPack.LimitLV = ipyData.GetLVLimit()

    clientPack.AwardRuleType = ipyData.GetAwardRuleType()

    clientPack.AwardInfo = []

    

    ipyDataList = IpyGameDataPY.GetIpyGameDataList("ActSingleRechargeAward", templateID)