3049 【主干】【1.6】合服许愿池第一天奖励不能领取

xdh

2019-03-13 1d877dc6c7523fbc38bafa29d27d9c0c73f72eff

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py

@@ -55,7 +55,7 @@
#import PlayerFamilyTech

import PlayerFamilyRedPacket

import PlayerFBHelpBattle

import PlayerFamilyStore

#import PlayerFamilyStore

import PlayerFamilySWRH

import GameWorldProcess

import PlayerLVAward

@@ -485,10 +485,10 @@
    resultName = pack.GetResultName()                       #[queryid, 人气值， 物品ID]

    

    if callName == "SendMail":

        title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail = eval(resultName)

        title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource = eval(resultName)

        limitTime = str(GameWorld.GetDatetimeByDiffDays(getDays))

        limitTime = limitTime.split(".")[0]

        PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail)

        PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail, moneySource=moneySource)

        return

    

    if callName == "SendMailBatch":

@@ -851,6 +851,10 @@
    if callName =="AddBossRebornPoint":

        GameWorldBoss.AddBossRebornPoint(eval(resultName))

        return

    #多仙盟BOSS结束

    if callName =="AllFamilyBossOver":

        PlayerFamilyBoss.AllFamilyBossKilled()

        return

    

#---return分割线-----------------------------------------------------------------



@@ -921,12 +925,12 @@
            return

        resultName = '%s' % ret

        

    # 战盟仓库

    if callName == "FamilyStore":

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        if not curPlayer:

            return

        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)

#    # 战盟仓库

#    if callName == "FamilyStore":

#        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

#        if not curPlayer:

#            return

#        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)

    

    # 自定义商店物品

    if callName == "ShopItem":