From fb4cdd5b8029f67c4857347a3eda8d7252e051e9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 26 三月 2019 20:18:36 +0800
Subject: [PATCH] 6374 新版无绑玉，原先绑玉再仙玉的扣法改成 扣仙玉
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 c491fef..863f851 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
@@ -1320,7 +1320,7 @@
ChConfig.Def_HurtType_LuckyHit:lambda aObj, dObj, hState:__HurtTypeHappen_LuckyHit(aObj, dObj, hState),
ChConfig.Def_HurtType_SuperHit:lambda aObj, dObj, hState:__HurtTypeHappen_SuperHit(aObj, dObj, hState),
ChConfig.Def_HurtType_Parry:lambda aObj, dObj, hState:__HurtTypeHappen_Parry(aObj, dObj, hState),
- ChConfig.Def_HurtType_Zhuxian:lambda aObj, dObj, hState:__HurtTypeHappen_Zhuxian(aObj, dObj, hState),
+ #ChConfig.Def_HurtType_Zhuxian:lambda aObj, dObj, hState:__HurtTypeHappen_Zhuxian(aObj, dObj, hState),
}
hadCheckList = [] # 已经处理过的伤害类型列表
@@ -1328,7 +1328,7 @@
for mutexHurtTypeList in mutexList:
curMHHappen = False # 当前互斥列表是否有触发的
for hType in mutexHurtTypeList:
- if hType not in calcTypeList:
+ if hType not in calcTypeList or hType not in happenFunc:
continue
if hType in hadCheckList:
continue
@@ -1344,7 +1344,7 @@
# 再算优先级列表里
for hType in priorityList:
- if hType not in calcTypeList:
+ if hType not in calcTypeList or hType not in happenFunc:
continue
if hType not in hadCheckList:
hadCheckList.append(hType)
@@ -1407,15 +1407,15 @@
return True, 0, chanceDefPer
return
-def __HurtTypeHappen_Zhuxian(atkObj, defObj, happenState):
- """诛仙一击"""
- rate = PlayerControl.GetZhuXianRate(atkObj)
- if not rate:
- return
-
- if GameWorld.CanHappen(rate):
- return True, PlayerControl.GetZhuXianHurtPer(atkObj), 0
- return
+#def __HurtTypeHappen_Zhuxian(atkObj, defObj, happenState):
+# """诛仙一击"""
+# rate = PlayerControl.GetZhuXianRate(atkObj)
+# if not rate:
+# return
+#
+# if GameWorld.CanHappen(rate):
+# return True, PlayerControl.GetZhuXianHurtPer(atkObj), 0
+# return
def ChangeSkillHurtPer(atkObj, defObj, curSkill, skillPer):
--
Gitblit v1.8.0