From a7bee0151439cb423951000071a57eae5ecd2af7 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 27 八月 2018 16:20:26 +0800
Subject: [PATCH] fix:坐骑总等级任务接口修改
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
index 92de7e1..0708705 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -1593,7 +1593,7 @@
if curSkill and curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_RealmSuppress:
# 境界压制技能不对高等级境界玩家产生攻击
aRealmLV, dRealmLV = GetPVERealmLVs(atkObj, defObj, atkObjType, defObjType)
- if aRealmLV >= dRealmLV:
+ if aRealmLV <= dRealmLV:
return 0, ChConfig.Def_HurtType_Immune # 免疫
atkIsBoss = 1 if ChConfig.IsGameBoss(atkObj) else 0
@@ -1668,6 +1668,7 @@
#------- 攻击方
aMinAtk = atkObj.GetMinAtk() # 攻击方最小攻击
aMaxAtk = atkObj.GetMaxAtk() # 攻击方最大攻击
+
aIceAtk = atkObj.GetIceAtk() # 冰攻, 元素真伤, 玩家及NPC通用
aIceAtk += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AddIceAtk)
#------- 防守方
@@ -1688,6 +1689,7 @@
aDamagePer += PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AddDamagePer)
aDamagePerPVP = PlayerControl.GetDamagePerPVP(atkObj) # 外层PVP伤害加成
+ aFinalHurtPer = PlayerControl.GetFinalHurtPer(atkObj) # 最外层伤害加成
aFinalHurt = PlayerControl.GetFinalHurt(atkObj) # 最终固定伤害
# 被动增加最终伤害
aFinalHurt += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddFinalValue)
@@ -1703,9 +1705,9 @@
aSkillAtkRate += atkObj.GetSkillAtkRate()
aDamagePer = 0 # 外层伤害加成
aDamagePerPVP = 0 # 外层PVP伤害加成
+ aFinalHurtPer = 0 # 最外层伤害加成
aFinalHurt = NPCCommon.GetFinalHurt(atkObj) # 最终固定伤害
aFightPower = NPCCommon.GetSuppressFightPower(atkObj)
-
#防守方的类型
if defObjType == IPY_GameWorld.gotPlayer:
@@ -1742,7 +1744,7 @@
suppressFPFormula = hurtDist[suppressFormulaKeyFP]
suppressValueFP = eval(FormulaControl.GetCompileFormula(suppressFormulaKeyFP, suppressFPFormula))
- # 境界压制百分比, 仅限PVP
+ # 境界压制百分比
SuppressValueRealmRate = 10000 # 默认值
suppressRealm = 0
if atkObjType == IPY_GameWorld.gotPlayer and defObjType == IPY_GameWorld.gotPlayer:
@@ -1797,6 +1799,10 @@
hurtFormula = hurtDist[hurtFormulaKey]
hurtValue = int(eval(FormulaControl.GetCompileFormula(hurtFormulaKey, hurtFormula)))
+ if hurtType == ChConfig.Def_HurtType_Normal and SuppressValueRealmRate > 10000:
+ # 存在压制
+ return hurtValue, ChConfig.Def_HurtType_RealmSupress
+
return hurtValue, hurtType
--
Gitblit v1.8.0