3629 【后端】邮件发放记录流向优化

hxp

2018-09-17 8a53680fa3151b32058f5d5f72cbf48351433f60

3629 【后端】邮件发放记录流向优化

 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_AddEntireCompensation.py

@@ -75,6 +75,7 @@
    goldPaper = int(gmCmdDict.get('GoldPaper', '0'))

    silver = int(gmCmdDict.get('Silver', '0')) 

    sender = gmCmdDict.get('Sender', ChConfig.Def_Mail_SenderSys)

    detail = gmCmdDict.get('Detail', "")

    

    #工具发过来的物品下标依据 'index,index,...'  不一定是从0开始并按顺序连续 =_=#

    intemIndexStrList = []

@@ -96,7 +97,7 @@


    PlayerCompensation.AddEntireItem(GUID, addItemDictList, LimitTime, 

                                     mailInfo, PlayerJob, "%s<$_$>%s<$_$>%s"%(sender, Title, Text),

                                     gold, goldPaper, silver)

                                     gold, goldPaper, silver, detail)



    #执行成功

    GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_Success, {"GUID":GUID})  


 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_AddPersonalCompensation.py

@@ -71,6 +71,7 @@
    goldPaper = int(gmCmdDict.get('GoldPaper', '0'))

    silver = int(gmCmdDict.get('Silver', '0')) 

    sender = gmCmdDict.get('Sender', ChConfig.Def_Mail_SenderSys)

    detail = gmCmdDict.get('Detail', "")

    

    #工具发过来的物品下标依据 'index,index,...'  不一定是从0开始并按顺序连续 =_=#

    intemIndexStrList = []

@@ -91,7 +92,7 @@
    #    return

    PlayerCompensation.AddPersonalItem(GUID, addItemDictList, PlayerIDList, 

                                       LimitTime, "%s<$_$>%s<$_$>%s"%(sender, Title, Text),

                                       gold, goldPaper, silver)

                                       gold, goldPaper, silver, detail=detail)

    

    #执行成功

    GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_Success)  


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

@@ -85,22 +85,23 @@
#  @param addItemList [(itemID, itemCnt, isBind), {或物品信息字典}, ...]

#  @return GUID

def SendPersonalItemMailEx(title, content, getDays, playerIDList, addItemList, 

                           gold = 0, goldPaper = 0, silver = 0, sourceType = ChConfig.Mail_Type_Default):

                           gold = 0, goldPaper = 0, silver = 0, sourceType = ChConfig.Mail_Type_Default, detail=""):

    limitTime = str(GameWorld.GetDatetimeByDiffDays(getDays))

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

    return SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, 

                                gold, goldPaper, silver, sourceType)

                                gold, goldPaper, silver, sourceType, detail=detail)

    

def SendPersonalItemMailBatch(batchMailInfoList):

    ## 批量发送邮件

    mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver = batchMailInfoList

   
    mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver, batchDetail = batchMailInfoList

    
    lenPlayerID = len(batchPlayerIDList)

    lenItem = len(batchAddItemList)

    lenParam = len(batchParamList)

    lenGold = len(batchGold)

    lenGoldPaper = len(batchGoldPaper)

    lenSilver = len(batchSilver)

    lenDetail = len(batchDetail)

    

    title = ""

    getDays = 30

@@ -113,17 +114,18 @@
        gold = batchGold[i] if lenGold == lenPlayerID else 0

        goldPaper = batchGoldPaper[i] if lenGoldPaper == lenPlayerID else 0

        silver = batchSilver[i] if lenSilver == lenPlayerID else 0

        detail = batchDetail[i] if lenDetail == lenPlayerID else ""

        content = "<MailTemplate>%s</MailTemplate>%s" % (mailTypeKey, str(paramList))

        SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver)

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

        

    return



def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0):

def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0, detail=""):

    GameWorld.DebugLog("SendMailByKey %s, playerIDList=%s, addItemList=%s, paramList=%s, gold=%s, goldPaper=%s, silver=%s" 

                       % (mailTypeKey, playerIDList, addItemList, paramList, gold, goldPaper, silver))

    title = ""

    content = "<MailTemplate>%s</MailTemplate>%s" % (mailTypeKey, json.dumps(paramList, ensure_ascii=False))

    return SendPersonalItemMailEx(title, content, 30, playerIDList, addItemList, gold, goldPaper, silver)

    return SendPersonalItemMailEx(title, content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail=detail)



#  此处货币playerIDList发放统一，如根据玩家不同而变，则应需修改

## 功能发放物品补偿/奖励邮件

@@ -131,7 +133,7 @@
#  @return GUID

#  @remarks addItemList支持append字典

def SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList,

                         gold = 0, goldPaper = 0, silver = 0, sourceType = ChConfig.Mail_Type_Default):

                         gold = 0, goldPaper = 0, silver = 0, sourceType = ChConfig.Mail_Type_Default, detail=""):

    if not playerIDList:

        return ""

    

@@ -169,7 +171,7 @@
        GUID = str(uuid.uuid1())

        AddPersonalItem(GUID, addItemDictList[startIndex:startIndex + perMailItemCnt], playerIDList, 

                                           limitTime, "%s<$_$>%s<$_$>%s" % (ChConfig.Def_Mail_SenderSys, title, content),

                                           gold, goldPaper, silver)

                                           gold, goldPaper, silver, sourceType, detail)

    return GUID



## 发送纯文字个人补偿

@@ -326,7 +328,7 @@
#  @param addItemDictList, LimitTime, mailInfo, PlayerJob,  Text 

#  @return None

def AddEntireItem(GUID, addItemDictList, LimitTime, mailInfo, PlayerJob, Text,

                  gold = 0, goldPaper = 0, silver = 0):

                  gold = 0, goldPaper = 0, silver = 0, detail=""):

    '''

    @param mailInfo: GetEntireCompensationInfo 的返回值, 目前暂存字段 PlayerLV 中

    '''

@@ -345,7 +347,7 @@
                                                             PlayerJob, Text, gold, goldPaper, silver)

    checkState, limitLVType, limitLV = ParseEntireCompensationInfo(mailInfo)

    addDict = {"LimitTime":LimitTime, "LimitLV":limitLV, "LimitLVType":limitLVType, "CheckState":checkState, "PlayerJob":PlayerJob, "Text":Text, 

               "Gold":gold, "GoldPaper":goldPaper, "Silver":silver, "ItemList":addItemDictList}

               "Gold":gold, "GoldPaper":goldPaper, "Silver":silver, "ItemList":addItemDictList, "Detail":detail}

    #添加流向

    eventName = "Add" if checkState == CheckState_OK else "AddToCheck"

    DataRecordPack.DR_EntireCompensation(GUID, eventName, addDict)

@@ -413,7 +415,7 @@
#  @param addItemDict, PlayerIDList, LimitTime, Text 

#  @return None

def AddPersonalItem(GUID, addItemDictList, PlayerIDList, LimitTime, Text, 

                    gold = 0, goldPaper = 0, silver = 0, sourceType = ChConfig.Mail_Type_Default):

                    gold = 0, goldPaper = 0, silver = 0, sourceType = ChConfig.Mail_Type_Default, detail=""):

    if GameWorld.IsMergeServer():

        return

    GameWorld.DebugLog("Compensation### AddPersonalItem GUID:%s ItemDict:\n%s "%(GUID, addItemDictList))

@@ -449,7 +451,7 @@
    

    #添加流向

    addDict = {"LimitTime":LimitTime, "Text":Text, "Gold":gold, "GoldPaper":goldPaper, "Silver":silver, 

               "ItemListLen":len(addItemDictList)}

               "ItemListLen":len(addItemDictList), "Detail":detail}

    DataRecordPack.DR_AddPersonalCompensation(PlayerIDList, GUID, addItemDictList, addDict)

    return




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

@@ -413,14 +413,14 @@
    callName = pack.GetCallName()

    resultName = pack.GetResultName()                       #[queryid, 人气值， 物品ID]

    

    if callName == 'SendMail':

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

    if callName == "SendMail":

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

        limitTime = str(GameWorld.GetDatetimeByDiffDays(getDays))

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

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

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

        return

    

    if callName == 'SendMailBatch':

    if callName == "SendMailBatch":

        PlayerCompensation.SendPersonalItemMailBatch(eval(resultName))

        return

    


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py

@@ -275,7 +275,7 @@
    npcHisHurtPlayerList.sort(cmp=CmpFamilyOwnerBossHurtSort)

    

    # 归属仙盟前x名玩家额外奖励，算历史伤血

    batchPlayerIDList, batchAddItemList, batchParamList = [], [], []

    batchPlayerIDList, batchAddItemList, batchParamList, batchDetailList = [], [], [], []

    ownerFamilyPlayerOrderAwardDict = IpyGameDataPY.GetFuncEvalCfg("FairyGrabBoss", 1, {})

    curNPCPlayerOrderAwardDict = ownerFamilyPlayerOrderAwardDict.get(bossID, {})

    maxOrder = max(curNPCPlayerOrderAwardDict) if curNPCPlayerOrderAwardDict else 0

@@ -290,12 +290,13 @@
        batchPlayerIDList.append([hurtPlayer.objID])

        batchAddItemList.append(awardItemList)

        batchParamList.append([bossID, curOrder])

        batchDetailList.append({"BossID":bossID, "Order":curOrder})

        orderPlayerNameList.append(hurtPlayer.name)

        GameWorld.Log("    归属仙盟第%s名额外奖励: %s" % (curOrder, awardItemList))

        if curOrder >= maxOrder:

            break

    if batchPlayerIDList:

        PlayerControl.SendMailBatch("FairyGrabBoss2", batchPlayerIDList, batchAddItemList, batchParamList)

        PlayerControl.SendMailBatch("FairyGrabBoss2", batchPlayerIDList, batchAddItemList, batchParamList, batchDetail=batchDetailList)

        orderPlayerName = ShareDefine.Def_Space.join(orderPlayerNameList)

        PlayerControl.WorldNotify(0, "FairyGrabBossRank", [orderPlayerName, bossID])

        

@@ -314,7 +315,7 @@
            continue

        joinAwardPlayerIDList += familyPlayerIDList

    if joinAwardPlayerIDList:

        PlayerControl.SendMailByKey("FairyGrabBoss1", joinAwardPlayerIDList, curNPCJoinFamilyAwardList, [bossID, joinAwardNeedHurtHPPer])

        PlayerControl.SendMailByKey("FairyGrabBoss1", joinAwardPlayerIDList, curNPCJoinFamilyAwardList, [bossID, joinAwardNeedHurtHPPer], detail={"BossID":bossID})

        

    # 同步最终结果给所有参与过的玩家

    hurtPack = __GetFamilyOwnerBossHurtPack(hurtMgr, key, objID, bossID, 0)


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

@@ -308,34 +308,38 @@
    return



#---------------------------------------------------------------------

def SendMailBatch(mailTypeKey, batchPlayerIDList, batchAddItemList=[], batchParamList=[], batchGold=[], batchGoldPaper=[], batchSilver=[]):

def SendMailBatch(mailTypeKey, batchPlayerIDList, batchAddItemList=[], batchParamList=[], batchGold=[], batchGoldPaper=[], batchSilver=[], batchDetail=[]):

    '''批量发送邮件, 用于瞬间需要发送多封（大量）邮件的，比如一些公共副本活动等结算时

    @param mailTypeKey: 邮件模板key

    @param batchPlayerIDList: [playerIDList, playerIDList, ...]

    @param batchAddItemList: [addItemList, addItemList, ...]

    @param batchParamList: [paramList, paramList, ...]

    @param batchGold: [batchGold, batchGold, ...]

    @param batchGold: [batchGoldPaper, batchGoldPaper, ...]

    @param batchGold: [batchSilver, batchSilver, ...]

    @param batchGoldPaper: [batchGoldPaper, batchGoldPaper, ...]

    @param batchSilver: [batchSilver, batchSilver, ...]

    @param batchDetail: [记录邮件流向用, ...]

    '''

    msgInfo = str([mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver])

    msgInfo = str([mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver, batchDetail])

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMailBatch", msgInfo, len(msgInfo))

    GameWorld.Log("SendMailBatch %s, batchPlayerIDList=%s, batchAddItemList=%s, batchParamList=%s, batchGold=%s, batchGoldPaper=%s, batchSilver=%s" 

                  % (mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver))

    return



def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0):

def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0, detail=""):

    '''

    @param detail: 记录邮件流向用

    '''

    if not mailTypeKey:

        mailTypeKey = ShareDefine.DefaultLackSpaceMailType

    

    content = "<MailTemplate>%s</MailTemplate>%s" % (mailTypeKey, json.dumps(paramList, ensure_ascii=False))

    SendMail("", content, 30, playerIDList, addItemList, gold, goldPaper, silver)

    SendMail("", content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail)

    return



## 功能发放物品补偿/奖励邮件

#  @param addItemList [(itemID, itemCnt, isBind), {或物品信息字典}, ...]

#  @return

def SendMail(title, content, getDays, playerIDList, addItemList, gold=0, goldPaper=0, silver=0):

def SendMail(title, content, getDays, playerIDList, addItemList, gold=0, goldPaper=0, silver=0, detail=""):

    if not playerIDList:

        return

    

@@ -377,7 +381,7 @@
    for key, itemCnt in itemCountDict.items():

        itemID, isBind = key

        combineItemList.append((itemID, itemCnt, isBind))

    cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver]

    cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail]

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMail", '%s' % (cmdList), len(str(cmdList)))

    return True