6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（邮件拍品处理，拍品奖励配置格式优化）

hxp

2019-03-11 09daae185e5a4005076419f98d896f991e39335e

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

@@ -76,6 +76,7 @@
import PyGameData

import PlayerMagicWeapon

import GameLogic_SealDemon

import GameLogic_ZhuXianBoss

import PlayerTJG

import PlayerVip

import PlayerRefineStove

@@ -83,10 +84,13 @@
import PlayerCostRebate

import GY_Query_CrossRealmReg

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerCrossRealmPK

import FunctionNPCCommon

import CrossRealmPlayer

import CrossPlayerData

import ChNetSendPack

import EquipZhuXian

import PlayerCoat

import PlayerState

import QuestCommon

@@ -233,15 +237,22 @@
#  @param mergeMapInfo 该提示所属的跨服活动地图信息, 主要用于不同子服对应所跨的活动地图ID

#  @return 无返回值

def WorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[]):

    # 如果是跨服服务器，则广播子服

    if GameWorld.IsCrossServer():

        sendMsg = str([country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo])

        GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'MergeWorldNotify',

                                                                  sendMsg, len(sendMsg))

        FBNotify(msgMark, msgParamList) # 跨服中的全服广播只在地图中做广播即可，防止不同跨服分区的地图会相互看到广播，体验不好

    else:

        GameWorld.GetPlayerManager().BroadcastCountry_NotifyCode(country, 0, msgMark,

                                                        __GetNotifyCodeList(msgParamList), lineID)

    GameWorld.GetPlayerManager().BroadcastCountry_NotifyCode(country, 0, msgMark, __GetNotifyCodeList(msgParamList), lineID)

    return



def GetCrossWorldNotifyInfo(country, msgMark, msgParamList=[]):

    return {"Type":ShareDefine.CrossNotify_World, "Params":[country, msgMark, msgParamList]}



def GetCrossFamilyNotifyInfo(familyID, msgMark, msgParamList=[]):

    return {"Type":ShareDefine.CrossNotify_Family, "Params":[familyID, msgMark, msgParamList]}



def CrossNotify(serverGroupIDList, crossNotifyList):

    ''' 跨服广播信息提示，支持同步多条，同时也建议多条一起同步

    @param serverGroupIDList: 需要同步到的目标服务器组ID列表

    @param crossNotifyList: 信息提示列表，通过 GetCrossWorldNotifyInfo GetCrossFamilyNotifyInfo 函数获得返回值添加到列表

    '''

    sendMsg = str([serverGroupIDList, crossNotifyList])

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "CrossNotify", sendMsg, len(sendMsg))

    return



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

@@ -314,7 +325,7 @@
    return



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

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

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

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

    @param mailTypeKey: 邮件模板key

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

@@ -324,14 +335,15 @@
    @param batchGoldPaper: [batchGoldPaper, batchGoldPaper, ...]

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

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

    @param moneySource: 货币来源

    '''

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

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

    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, detail=""):

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

    '''

    @param detail: 记录邮件流向用

    '''

@@ -339,13 +351,13 @@
        mailTypeKey = ShareDefine.DefaultLackSpaceMailType

    

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

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

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

    return



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

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

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

#  @return

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

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

    if not playerIDList:

        return

    

@@ -370,24 +382,26 @@
        if len(mailItem) != 3:

            continue

        

        itemID, itemCnt, isBind = mailItem

        itemID, itemCnt, isAuctionItem = mailItem

        

        if ItemControler.GetAppointItemRealID(itemID):

            # 定制物品转化为物品信息字典

            appointItemObj = ItemControler.GetItemByData(ItemControler.GetAppointItemDictData(itemID, isBind))

            appointItemObj = ItemControler.GetItemByData(ItemControler.GetAppointItemDictData(itemID, isAuctionItem))

            if not appointItemObj:

                GameWorld.ErrLog("邮件定制物品转化失败！itemID, itemCnt, isBind" % (itemID, itemCnt, isBind))

                GameWorld.ErrLog("邮件定制物品转化失败！itemID, itemCnt, isAuctionItem" % (itemID, itemCnt, isAuctionItem))

                continue

            combineItemList.append(ItemCommon.GetMailItemDict(appointItemObj))

            appointItemObj.Clear()

        elif isAuctionItem:

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

        else:

            key = (itemID, isBind)

            key = (itemID, isAuctionItem)

            itemCountDict[key] = itemCountDict.get(key, 0) + itemCnt

            

    for key, itemCnt in itemCountDict.items():

        itemID, isBind = key

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

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

        itemID, isAuctionItem = key

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

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

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

    return True



@@ -517,6 +531,14 @@
        if GameWorld.GetMap().GetMapID() not in IpyGameDataPY.GetFuncEvalCfg('DungeonDeliver', 1):

            NotifyCode(curPlayer, "Carry_lhs_844170") 

            return False

        
    if not GameWorld.IsCrossServer() and GetCrossMapID(curPlayer):

        NotifyCode(curPlayer, "CrossMap10") 
        return False

    
    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):

        GameWorld.Log("客户端自定义场景下无法传送!", curPlayer.GetPlayerID())

        return False

    

    return True



@@ -1197,6 +1219,14 @@
    PyGameData.g_needRefreshMapServerState = True # 有玩家离开地图设置需要刷新

    

    PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick)

    
    if not isDisconnect:

        CrossPlayerData.ClearCrossSyncDataCache(curPlayer)

        
    #清除地图玩家缓存

    playerID = curPlayer.GetPlayerID()

    PyGameData.g_zhuXianSkillAddPerDict.pop(playerID, None)

    PyGameData.g_zhuXianSkillReducePerDict.pop(playerID, None)

    return



##更新保存玩家在线时间

@@ -1575,7 +1605,7 @@
        GameWorld.DebugLog("跨服服务器不允许该操作!")

        return

    

    if GetCrossRealmState(curPlayer):

    if GetCrossMapID(curPlayer):

        GameWorld.ErrLog("玩家当前为跨服状态，不允许再次请求进入跨服!", curPlayer.GetPlayerID())

        return

    

@@ -1584,9 +1614,15 @@
        return

    

    if curPlayer.GetHP() <= 0:

        NotifyCode(curPlayer, "CrossMap4")

        return

    

    if PlayerCrossRealmPK.GetIsCrossPKMatching(curPlayer):

        NotifyCode(curPlayer, "CrossMap3")

        return

    
    if PlayerState.IsInPKState(curPlayer):

        NotifyCode(curPlayer, "SingleEnterPK", [mapID])

        return

    

    GY_Query_CrossRealmReg.RegisterEnterCrossServer(curPlayer, mapID)

@@ -1678,6 +1714,14 @@
            else:

                bossID = GameLogic_SealDemon.CurFBLineBOSSID(lineID)

                extendParamList = [bossID]

        elif mapID == ChConfig.Def_FBMapID_ZhuXianBoss:

            bossID = GameLogic_ZhuXianBoss.CurFBLineBOSSID(lineID)

            extendParamList = [bossID, -1]

            enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % ChConfig.Def_FBMapID_ZhuXianBoss)

            if enterCnt >= FBCommon.GetEnterFBMaxCnt(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss):

                if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhuXianBossHelpCnt):

                    extendParamList = [bossID, curPlayer.GetFamilyID()]

            
        SendToGameServerEnterFB(curPlayer, mapID, lineID, tick, extendParamList)

        return

    

@@ -1748,6 +1792,12 @@
            NotifyCode(curPlayer, "CrossMatching8", [mapID])            

        return ShareDefine.EntFBAskRet_CrossPKMatching

    

    ## 跨服地图中

    if GetCrossMapID(curPlayer) and mapID not in ChConfig.Def_CrossMapIDList:

        if isNotify:

            NotifyCode(curPlayer, "CrossMap5", [mapID])

        return ShareDefine.EntFBAskRet_InCrossMap

    
    #===============================================================================================

    # # 这里不做状态限制，由前端处理，因为策划要根据界面来处理，同一传送功能有可能在不同界面

    # # PK状态检查

@@ -1773,6 +1823,12 @@
        if isNotify:

            NotifyCode(curPlayer, "Carry_lhs_697674")

        return ShareDefine.EntFBAskRet_Sit

    
    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):

        if isNotify:

            NotifyCode(curPlayer, "Carry_lhs_697674")

        GameWorld.Log("客户端自定义场景下无法进入副本!", curPlayer.GetPlayerID())

        return ShareDefine.EntFBAskRet_Other

    

    if playerAction in ChConfig.Def_Player_Cannot_TransState:

        #Carry_lhs_697674：您当前所处的状态不能进行传送!

@@ -2929,6 +2985,7 @@
    PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)

    # 绝版降临

    PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)

    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)

    # 消费VIP

#    if costVIPGold < 0:

#        costVIPGold = price

@@ -3505,6 +3562,13 @@
        FinalHurtReduce = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_FinalHurtReduce) # 最终固定伤害减少

        DamagePerPVP = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_DamagePerPVP) * fpParam.GetCftDamagePerPVP() # 伤害输出计算百分比PVP

        DamagePerPVPReduce = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_DamagePerPVPReduce) * fpParam.GetCftDamagePerPVPReduce() # 伤害输出计算百分比PVP减少

        JobAHurtAddPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobAHurtAddPer) * fpParam.GetCftJobAHurtAddPer() # 对目标战士伤害加成

        JobBHurtAddPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobBHurtAddPer) * fpParam.GetCftJobBHurtAddPer() # 对目标法师伤害加成

        JobCHurtAddPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobCHurtAddPer) * fpParam.GetCftJobCHurtAddPer() # 对目标弓箭伤害加成

        JobAAtkReducePer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobAAtkReducePer) * fpParam.GetCftJobAAtkReducePer() # 战士攻击伤害减免

        JobBAtkReducePer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobBAtkReducePer) * fpParam.GetCftJobBAtkReducePer() # 法师攻击伤害减免

        JobCAtkReducePer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobCAtkReducePer) * fpParam.GetCftJobCAtkReducePer() # 弓箭攻击伤害减免

        
        ComboRate = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_ComboRate) # 连击几率

        ComboDamPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_ComboDamPer) # 连击伤害

        #MaxProDef = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_MaxProDef) # 最大防护值

@@ -3690,7 +3754,7 @@
        # 检查最大等级

        if curLV >= maxLV and curTotalExp >= maxLVExpStore:

            self.__NotifyExpFull(curPlayer, "GeRen_admin_825676")

            GameWorld.DebugLog("经验已满！已满级！curLV=%s" % (curLV), curPlayer.GetPlayerID())

            #GameWorld.DebugLog("经验已满！已满级！curLV=%s" % (curLV), curPlayer.GetPlayerID())

            return 0, expViewType

        

        # 杀怪

@@ -3942,7 +4006,7 @@
            # 记录开服活动冲级数据

            OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())

            #神秘限购

            FunctionNPCCommon.MysticalShopOpen(curPlayer, befLV, aftLV)

            FunctionNPCCommon.MysticalLimitShopOpen(curPlayer, befLV, aftLV)

        #不需要做升级任务, 设置玩家经验

        SetPlayerTotalExp(curPlayer, curTotalExp) 

        return

@@ -4097,6 +4161,7 @@
        PlayerFamilyTech.CalcFamilyTechAttr(curPlayer)

        PlayerEquipDecompose.RefreshEDAttr(curPlayer)

        PlayerDogz.RefreshDogzAttr(curPlayer)

        EquipZhuXian.CalcZhuXianAttr(curPlayer)

        PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)

        PlayerCoat.CalcClothesCoatSkinAttr(curPlayer)

        self.RefreshAllState(isForce=True)

@@ -4764,6 +4829,8 @@
        PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)

        # 记录开服活动数据

        OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_FightPower, totalFightPower)

        if beforeFightPower != totalFightPower:

            CrossPlayerData.OnPlayerFightPowerChange(curPlayer)

        return

    

    def __RefreshMoveSpeed(self, allAttrListBuffs):

@@ -5692,7 +5759,6 @@
# ֪ͨGsmeServer; 

# SendGameServerRefreshState(int inputType, int inputValue)



# SetExAttr15 ~ 18 对应神兵类型等级，场景特效用



# 禁言 通知gameServer

def SetGMForbidenTalk(curPlayer, value):

@@ -5717,11 +5783,12 @@
def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID, False, False)

def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3()



## 跨服状态: 0-非跨服状态，1-跨服状态

def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()

def SetCrossRealmState(curPlayer, value):

    NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_CrossMapID, value)

    curPlayer.SetExAttr5(1 if value else 0, False, True)

## 跨服状态所在地图ID: 0-非跨服状态，非0-跨服状态对应的地图ID

def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()

def SetCrossMapID(curPlayer, value):

    curPlayer.SetExAttr5(value, False, True)

    if not value:

        CrossPlayerData.ClearCrossSyncDataCache(curPlayer)

    return



## 铜钱点, 支持铜钱超20亿

@@ -5762,6 +5829,12 @@
        curPlayer.SetExAttr13(serverGroupID, False, True)

        GameWorld.DebugLog("更新玩家所属服务器组ID: serverGroupID=%s" % serverGroupID)

    return



##影响外观的3部位索引记录 123456789  123:武器格子索引 456：副手  789：衣服

def GetFaceEquipIndexList(curPlayer):

    attr15 = curPlayer.GetExAttr15()

    return [attr15%1000, attr15/1000%1000, attr15/1000000]

def SetFaceEquipIndex(curPlayer, value): return curPlayer.SetExAttr15(value)



##获得玩家威望值

def GetPrestige(curPlayer): return 0

@@ -6588,6 +6661,18 @@
def GetFuncDef(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CopyFuncAttr % (ChConfig.TYPE_Calc_AttrDEF - 1))

def SetFuncDef(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_CopyFuncAttr % (ChConfig.TYPE_Calc_AttrDEF - 1), value)



#---诛仙一击概率---

def GetZhuXianRate(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ZhuxianRate)

def SetZhuXianRate(curPlayer, value): 
    curPlayer.SetDict(ChConfig.Def_PlayerKey_ZhuxianRate, value)

    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ZhuxianRate, value, False) 


#---诛仙一击伤害百分比---

def GetZhuXianHurtPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ZhuxianHurtPer)

def SetZhuXianHurtPer(curPlayer, value): 
    curPlayer.SetDict(ChConfig.Def_PlayerKey_ZhuxianHurtPer, value)

    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ZhuxianHurtPer, value, False)





## 增加天梯竞技场积分

#  @param curPlayer 玩家实例

@@ -6776,6 +6861,13 @@
#-------------------------------------------------------------------------------

## 设置玩家字典值, 存库

def NomalDictSetProperty(curPlayer, key, value, dType=0):

    if CrossPlayerData.IsNeedProcessCrossPlayer(curPlayer) and key not in \

        [ChConfig.Def_PDict_FightPower_Total, ChConfig.Def_PlayerKey_CrossRegisterMap]:

        playerID = curPlayer.GetPlayerID()

        changeDict = PyGameData.g_crossPlayerDictChangeInfo.get(playerID, {})

        changeDict[(key, dType)] = value

        PyGameData.g_crossPlayerDictChangeInfo[playerID] = changeDict

        
    if value == 0:

        curPlayer.NomalDictDelProperty(key, dType)

        return