8346 【恺英】【后端】协助系统（修复封魔坛协助进错线路bug）

hxp

2020-01-09 f38f1d13f83bd005eab8a101173c916d03163dc7

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

@@ -96,25 +96,46 @@
    return





def GetPlayerGoldGiftFirst(curPlayer):

def GetPlayerGoldGiftFirst(curPlayer, giftDay):

    '''领取玩家首充奖励

    @param dayIndex: 首充第几天奖励

    '''

    

    isGet = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldGiftFirstRecord)

    if isGet:

        GameWorld.DebugLog("已经领取过首充奖励！", curPlayer.GetPlayerID())

    if not giftDay:

        return

    
    openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1

    firstGoldServerDay = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldServerDay)

    if not firstGoldServerDay:

        GameWorld.DebugLog("还未充值过!firstGoldServerDay=%s" % firstGoldServerDay)

        return

    canGetMaxDay = openServerDay - firstGoldServerDay + 1

    if giftDay > canGetMaxDay:

        GameWorld.DebugLog("还未到可领取的首充天，无法领取!openServerDay=%s,firstGoldServerDay=%s,canGetMaxDay=%s < giftDay=%s" 
                           % (openServerDay, firstGoldServerDay, canGetMaxDay, giftDay))

        return

    dayIndex = giftDay - 1

    getRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldGiftFirstRecord)

    if getRecord & pow(2, dayIndex):

        GameWorld.DebugLog("已经领取过首充奖励！giftDay=%s" % giftDay, curPlayer.GetPlayerID())

        return

    

    if not curPlayer.GetChangeCoinPointTotal():

        GameWorld.DebugLog("没有充值过，无法领取首充奖励!", curPlayer.GetPlayerID())

        return

    

    firstGoldRewardDict = IpyGameDataPY.GetFuncEvalCfg("FirstGold", 1)

    ipyData = IpyGameDataPY.GetIpyGameData("FirstGold", giftDay)

    if not ipyData:

        return    
    jobItemInfoDict = ipyData.GetJobItemInfo()

    commItemList = ipyData.GetCommItemList()

    
    rewardItemList = []

    jobStr = str(curPlayer.GetJob())

    if jobStr not in firstGoldRewardDict:

        GameWorld.ErrLog("没有配置该职业对应的首充奖励!job=%s" % jobStr, curPlayer.GetPlayerID())

        return

    rewardItemList = firstGoldRewardDict[jobStr]

    if jobStr in jobItemInfoDict:

        rewardItemList += jobItemInfoDict[jobStr]

    rewardItemList += commItemList

    
    if not rewardItemList:

        return

    needSpace = len(rewardItemList)

@@ -126,17 +147,22 @@
        return

    

    # 更新已领取成功标记

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_GoldGiftFirstRecord, 1)

    updGetRecord = getRecord | pow(2, dayIndex)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_GoldGiftFirstRecord, updGetRecord)

    GameWorld.DebugLog("领取首充奖励: giftDay=%s,getRecord=%s,updGetRecord=%s, %s" % (giftDay, getRecord, updGetRecord, rewardItemList))

    

    # 给物品

    for itemID, itemCount, isBind in rewardItemList:        
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    isAuctionItem = False

    for itemID, itemCount in rewardItemList:        
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isAuctionItem, [IPY_GameWorld.rptItem])

        

    # 全服提示

    if len(rewardItemList) >= 2:

        PlayerControl.WorldNotify(0, "FirstPayReward1", [curPlayer.GetPlayerName(), rewardItemList[0][0], rewardItemList[1][0]])

        PlayerControl.WorldNotify(0, "FirstPayReward1", [curPlayer.GetPlayerName(), rewardItemList[0][0], rewardItemList[1][0], giftDay])

        
    # 记录领取事件

    DataRecordPack.DR_GoldGiftGiveItem(curPlayer, "FirstGoldGift")

    infoDict = {"GiftDay":giftDay, "ItemList":rewardItemList}

    DataRecordPack.DR_GoldGiftGiveItem(curPlayer, "FirstGoldGift", infoDict)

    

    # 通知客户端

    Sync_FirstGoldInfo(curPlayer)

@@ -158,6 +184,7 @@
    Sync_FirstGoldInfo(curPlayer)

    

    Sync_FirstGoldTime(curPlayer)

    Sync_HistoryChargeAwardGetRecordInfo(curPlayer)

    #更新首充提示开始计时时间

    if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldRemainTime):

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTipStartTime, int(time.time()))

@@ -168,13 +195,15 @@
#  @param addGold: 充元宝数

#  @return: None

def OnPlayerChargeGold(curPlayer, addGold):

    DayChargeRedPackAward(curPlayer)

    

    # 更新今日已充值数

    dailyGoldCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DailyGoldChargeCnt)

    updDailyGoldCnt = dailyGoldCnt + addGold

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyGoldChargeCnt, updDailyGoldCnt)

    #PlayerControl.NotifyPlayerDictValue(curPlayer, ChConfig.Def_PDict_DailyGoldChargeCnt)

    
    firstGoldServerDay = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldServerDay)

    if not firstGoldServerDay:

        recordServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldServerDay, recordServerDay)

        GameWorld.DebugLog("记录首充开服天: recordServerDay=%s" % recordServerDay)

        Sync_FirstGoldInfo(curPlayer)

        
    return



def Sync_FirstGoldInfo(curPlayer):

@@ -183,6 +212,7 @@
    sendPack.Clear()

    sendPack.FirstGoldRewardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldGiftFirstRecord)

    sendPack.FirstGoldTry = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry)

    sendPack.FirstGoldServerDay = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldServerDay)

    NetPackCommon.SendFakePack(curPlayer, sendPack)

    return



@@ -263,4 +293,68 @@
        return

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyChargeState, 1)

    PlayerFamilyRedPacket.CreatRedPacketByID(curPlayer, 2)

    return





def OnGetHistoryRechargeAward(curPlayer, awardID):

    # 领取历史充值奖励

    
    ipyData = IpyGameDataPY.GetIpyGameData('HistoryRechargeAward', awardID)

    if not ipyData:

        return

    
    getRecharge = ipyData.GetRecharge()

    # 检查可否领取

    
    # 玩家充值小于领取充值

    if curPlayer.GetChangeCoinPointTotal()/100 < getRecharge:

        GameWorld.ErrLog("OnGetHistoryRechargeAward error：getRecharge=%s greater than ChangeCoinPointTotal=%s" % (getRecharge, curPlayer.GetChangeCoinPointTotal()))

        return

    awardInfo = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HistoryChargeAwardGetRecord, 0)

    awardMark = pow(2, awardID)

    if awardInfo & awardMark:

        #已领取

        GameWorld.DebugLog("已领取历史充值奖励！awardID=%s,getRecharge=%s" % (awardID, getRecharge))

        return



    job = curPlayer.GetJob()

    awardDict = ipyData.GetReward()

    if str(job) not in awardDict:

        return

    itemList = awardDict[str(job)]

    
    if not itemList:

        return

    # 检查背包

    needSpace = len(itemList)

    packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)

    if needSpace > packSpace:

        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")

        return

    
    # 给物品

    for itemInfo in itemList:

        itemID, itemCount = itemInfo[:2]

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    
    # 更新已领取成功标记

    awardMark = pow(2, awardID)



    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HistoryChargeAwardGetRecord, awardInfo | awardMark)

    # 通知客户端

    Sync_HistoryChargeAwardGetRecordInfo(curPlayer)

    
    # 记录领取事件

    DataRecordPack.SendEventPack("HistoryRechargeAward", {'awardID':awardID, 'getRecharge':getRecharge}, curPlayer)

    return





## 通知等级奖励领取记录信息

#  @param None

#  @return None

def Sync_HistoryChargeAwardGetRecordInfo(curPlayer):

    sendPack = ChPyNetSendPack.tagMCHistoryReChargeAwardRecord()

    sendPack.Clear()

    sendPack.AwardGetRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HistoryChargeAwardGetRecord, 0)

    NetPackCommon.SendFakePack(curPlayer, sendPack)

    return