Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-03-08 b861524d105d9c36b11da974bca768d11642999d

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

@@ -73,6 +73,7 @@
import CrossRealmPK

import ChPyNetSendPack

import NetPackCommon

import AuctionHouse



import time

import datetime

@@ -484,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":

@@ -780,6 +781,16 @@
        PlayerBourse.OnGivePlayerBourseGainsResult(curPlayer, eval(resultName))

        return

    

    # 拍卖行

    if callName == "AuctionHouse":

        curPlayer = None

        if srcPlayerID:

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

            if not curPlayer:

                return

        AuctionHouse.MapServer_AuctionHouseLogic(curPlayer, eval(resultName), tick)

        return

    
    if callName == "TeamMemFuncData":

        PlayerTeam.MapServer_TeamMemFuncData(srcPlayerID, eval(resultName))

        return