From 3726f73d637c300a3e42ef99cab638ebea62a7c8 Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期二, 12 二月 2019 10:11:33 +0800 Subject: [PATCH] 5819 【后端】【1.6】运营活动支持对应不同的职业和世界等级(充值返利、消费返利) --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py index 7f1ddd9..fbcebed 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py @@ -84,11 +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 @@ -1213,6 +1215,11 @@ if not isDisconnect: CrossPlayerData.ClearCrossSyncDataCache(curPlayer) + + #清除地图玩家缓存 + playerID = curPlayer.GetPlayerID() + PyGameData.g_zhuXianSkillAddPerDict.pop(playerID, None) + PyGameData.g_zhuXianSkillReducePerDict.pop(playerID, None) return ##更新保存玩家在线时间 @@ -2965,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 @@ -3541,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) # 最大防护值 @@ -3726,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 # 杀怪 @@ -4133,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) @@ -6627,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 玩家实例 -- Gitblit v1.8.0