237 【福利内容】每日任务/每周任务/章节奖励-服务端（增加每日任务类型 6 ~ 10）

hxp

6 天以前 ba67d86ccc7dde96a4fe2bb2ae3abfbd0aacc561

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

@@ -23,13 +23,12 @@
import PlayerControl

import ItemControler

import NetPackCommon

import PlayerBossReborn

import PlayerFeastTravel

import PlayerActLunhuidian

import PlayerActYunshi

import PlayerActTask

import PlayerActivity

import ItemCommon

import PlayerHero

import PyGameData

import ChConfig



import random

@@ -79,6 +78,7 @@
            ItemControler.RecycleItem(curPlayer, costItemID, recycleItemMail)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureFreeCount % (treasureType), 0)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureCount % (treasureType), 0)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureCountEx % (treasureType), 0)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureCountToday % (treasureType), 0)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureLuck % (treasureType), 0)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureCntAward % (treasureType), 0)

@@ -241,6 +241,20 @@
        gridNumCountInfo[int(gridNumStr)] = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreasureGridCnt % (treasureType, gridNumStr))

    GameWorld.DebugLog("gridNumMaxLimitInfo=%s,gridNumCountInfo=%s" % (gridNumMaxLimitInfo, gridNumCountInfo), playerID)

    

    treasureCountEx = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreasureCountEx % (treasureType)) # 当前第x次单抽、x抽

    curIndexCount, maxIndexCount = 0, 0

    beSureCountByIndexDict = {}

    beSureCountByIndexList = ipyData.GetGridItemRateList4() # 第x次x抽必出，最多支持定制到9次

    if beSureCountByIndexList and treasureIndex < len(beSureCountByIndexList):

        beSureCountByIndexDict = beSureCountByIndexList[treasureIndex]

        maxIndexCount = min(9, max(beSureCountByIndexDict))

        curIndexCount = GameWorld.GetDataByDigitPlace(treasureCountEx, treasureIndex) + 1

    rateByIndexCount = 0 # 第x次x抽必出可产出个数

    rateByIndexCountList = []

    if curIndexCount <= maxIndexCount and curIndexCount in beSureCountByIndexDict:

        rateByIndexCountList = [[10000, beSureCountByIndexDict[curIndexCount]]]

        rateByIndexCount = 1 # 可扩展支持产出多个，暂定单次抽奖仅定制产出1个

        
    # 单抽产出优先级： 幸运物品 > 必出 > 保底 > 普通

    # 连抽没有优先级限制，只要满足条件即可产出

    getGridResult = []

@@ -276,6 +290,13 @@
        if not curRateList and ensureCount and updTreasureCount % ensureCount == 0 and ensureRateList:

            curRateList = GetRemoveLimitGridRateList(ensureRateList, gridNumCountInfo, gridNumMaxLimitInfo)

            GameWorld.DebugLog("    【满%s次数必出饼图】: %s" % (ensureCount, curRateList), playerID)

            
        # 第x次x抽必出，优先级较低

        if not curRateList and rateByIndexCountList and rateByIndexCount > 0:

            rateByIndexCount -= 1

            curRateList = rateByIndexCountList

            GameWorld.DebugLog("    【第x次x抽必出】: treasureIndex=%s,curIndexCount=%s,rateByIndexCount=%s,%s" 
                               % (treasureIndex, curIndexCount, rateByIndexCount, rateByIndexCountList), playerID)

            

        doCount = 0

        while doCount <= 50: # 限制最大次数

@@ -365,7 +386,8 @@
            GameWorld.ErrLog("寻宝格子不存在!treasureType=%s,gridNum=%s" % (treasureType, gridNum), playerID)

            return

        

        treasureResult.append([gridNum, itemID, itemCount, isBind])

        isTrans = 0 # 是否转化

        treasureResult.append([gridNum, itemID, itemCount, isTrans])

        

    # 扣消耗

    if costType == 1:

@@ -388,34 +410,42 @@
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureLuck % (treasureType), updLuck)

    for gridNum, updCount in gridNumCountInfo.items():

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureGridCnt % (treasureType, gridNum), updCount)

    if curIndexCount <= maxIndexCount:

        treasureCountEx = GameWorld.ChangeDataByDigitPlace(treasureCountEx, treasureIndex, curIndexCount)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureCountEx % (treasureType), treasureCountEx)

        GameWorld.DebugLog("更新第x次x抽次数: treasureIndex=%s,curIndexCount=%s,maxIndexCount=%s,treasureCountEx=%s" % (treasureIndex, curIndexCount, maxIndexCount, treasureCountEx))

        

    addScoreType = setIpyData.GetAwardMoneyType() # 额外奖励货币类型

    addScore = setIpyData.GetAwardMoneyValue() # 单次奖励货币数

    if addScoreType and addScore:

        PlayerControl.GiveMoney(curPlayer, addScoreType, addScore * treasureCount)

        

    if treasureType == TreasureType_Rune:

        PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_RuneTreasure, treasureCount)

        PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_RuneTreasure, treasureCount)

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureRune, treasureCount)

    elif treasureType == TreasureType_Jipin:

        PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_Treasure, treasureCount)

        PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_Treasure, treasureCount)

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJipin, treasureCount)

    elif treasureType == TreasureType_Jueshi:

        PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_JSTreasure, treasureCount)

        PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_JSTreasure, treasureCount)

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJueshi, treasureCount)

    elif treasureType == TreasureType_Gubao:

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureGubao, treasureCount)

    if treasureType in [TreasureType_HeroComm, TreasureType_HeroHigh, TreasureType_HeroScore]:

        PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_HeroCall, treasureCount)

    #if treasureType == TreasureType_Rune:

    #    PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_RuneTreasure, treasureCount)

    #    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_RuneTreasure, treasureCount)

    #    PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureRune, treasureCount)

    #elif treasureType == TreasureType_Jipin:

    #    PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_Treasure, treasureCount)

    #    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_Treasure, treasureCount)

    #    PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJipin, treasureCount)

    #elif treasureType == TreasureType_Jueshi:

    #    PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_JSTreasure, treasureCount)

    #    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_JSTreasure, treasureCount)

    #    PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJueshi, treasureCount)

    #elif treasureType == TreasureType_Gubao:

    #    PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureGubao, treasureCount)

        

    PlayerActLunhuidian.AddLunhuidianValue(curPlayer, PlayerActLunhuidian.AwardType_Treasure, treasureType, treasureCount)

    

    # 给物品

    mailItemList = []

    itemControl = ItemControler.PlayerItemControler(curPlayer)

    for gridNum, itemID, itemCount, isBind in treasureResult:

        itemObj = ItemControler.GetOutPutItemObj(itemID, itemCount, False, curPlayer=curPlayer)

    for tResult in treasureResult:

        gridNum, itemID, itemCount = tResult[:3]

        PyGameData.g_transItemSign = 0

        itemObj = ItemControler.GetOutPutItemObj(itemID, itemCount, isBind, curPlayer=curPlayer)

        mailItemDict = ItemCommon.GetMailItemDict(itemObj)

        

        if int(gridNum) in notifyGridNumList and notifyKey:

@@ -425,11 +455,15 @@
            mailItemList.append(mailItemDict)

            itemObj.Clear()

            

        # 检查物品转化

        if PyGameData.g_transItemSign:

            tResult[3] = 1 # 有转化物品时设置转化标记

            
    if mailItemList:

        PlayerControl.SendMailByKey("HappyXBUnEnough", [playerID], mailItemList)

        

    GameWorld.DebugLog("寻宝成功: treasureType=%s,updTreasureCount=%s(%s),updLuck=%s,addScoreType=%s,addScore=%s,gridNumCountInfo=%s" 
                       % (treasureType, updTreasureCount, updTreasureCountToday, updLuck, addScoreType, addScore, gridNumCountInfo), playerID)

    GameWorld.DebugLog("寻宝成功: treasureType=%s,updTreasureCount=%s(%s),updLuck=%s,addScoreType=%s,addScore=%s,gridNumCountInfo=%s,treasureCountEx=%s" 
                       % (treasureType, updTreasureCount, updTreasureCountToday, updLuck, addScoreType, addScore, gridNumCountInfo, treasureCountEx), playerID)

    GameWorld.DebugLog("    treasureResult=%s" % (treasureResult), playerID)

    GameWorld.DebugLog("    mailItemList=%s" % (mailItemList), playerID)