From 320a417a53a57a9cb7d7759f430afe5f6e6399a6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 29 一月 2019 16:28:30 +0800
Subject: [PATCH] 6087 【后端】【1.5.200】春节红包雨活动(额度特效增加红包类型参数)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 17a6cb5..0ded4d2 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) # 最大防护值
@@ -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)

--
Gitblit v1.8.0