From f12bbdcbaebff76914ae6dc735941d19f8f4e87f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 25 六月 2019 02:00:11 +0800
Subject: [PATCH] 860312 印记飘字的优先级高于压制
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py | 6 +++---
1 files changed, 3 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 a445cc5..5ffddf5 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
@@ -2308,11 +2308,11 @@
hurtValue = int(eval(FormulaControl.GetCompileFormula(hurtFormulaKey, hurtFormula)))
- if hurtType == ChConfig.Def_HurtType_Normal and SuppressValueRealmRate > 10000:
+ if hurtType == ChConfig.Def_HurtType_Normal and atkSkillPerYinji > 0:
+ return hurtValue, ChConfig.Def_HurtType_Yinji
+ elif hurtType == ChConfig.Def_HurtType_Normal and SuppressValueRealmRate > 10000:
# 存在压制
return hurtValue, ChConfig.Def_HurtType_RealmSupress
- elif hurtType == ChConfig.Def_HurtType_Normal and atkSkillPerYinji > 0:
- return hurtValue, ChConfig.Def_HurtType_Yinji
return hurtValue, hurtType
--
Gitblit v1.8.0