6087 【后端】【1.5.200】春节红包雨活动（优化成就重置逻辑）

hxp

2019-01-31 95dcd0c76164077e0035e28379cd94531ee64628

 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



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

@@ -1201,6 +1212,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



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

@@ -1595,6 +1614,10 @@
        NotifyCode(curPlayer, "CrossMap3")

        return

    

    if PlayerState.IsInPKState(curPlayer):

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

        return

    
    GY_Query_CrossRealmReg.RegisterEnterCrossServer(curPlayer, mapID)

    return



@@ -1684,6 +1707,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

    

@@ -2941,6 +2972,7 @@
    PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)

    # 绝版降临

    PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)

    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)

    # 消费VIP

#    if costVIPGold < 0:

#        costVIPGold = price

@@ -3517,6 +3549,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) # 最大防护值

@@ -3702,7 +3741,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

        

        # 杀怪

@@ -4109,6 +4148,7 @@
        PlayerFamilyTech.CalcFamilyTechAttr(curPlayer)

        PlayerEquipDecompose.RefreshEDAttr(curPlayer)

        PlayerDogz.RefreshDogzAttr(curPlayer)

        EquipZhuXian.CalcZhuXianAttr(curPlayer)

        PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)

        PlayerCoat.CalcClothesCoatSkinAttr(curPlayer)

        self.RefreshAllState(isForce=True)

@@ -4776,6 +4816,8 @@
        PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)

        # 记录开服活动数据

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

        if beforeFightPower != totalFightPower:

            CrossPlayerData.OnPlayerFightPowerChange(curPlayer)

        return

    

    def __RefreshMoveSpeed(self, allAttrListBuffs):

@@ -5733,6 +5775,8 @@
def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()

def SetCrossMapID(curPlayer, value):

    curPlayer.SetExAttr5(value, False, True)

    if not value:

        CrossPlayerData.ClearCrossSyncDataCache(curPlayer)

    return



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

@@ -6599,6 +6643,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 玩家实例

@@ -6787,6 +6843,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