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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 fef5ce4..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
@@ -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)

--
Gitblit v1.8.0