From 4a164d050b796d093e6a202cd0a4f763ae7eafb2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 26 三月 2019 14:11:47 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置(诛仙一击报错)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py |   11 +++++------
 1 files changed, 5 insertions(+), 6 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 df86aeb..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,9 +1407,8 @@
         return True, 0, chanceDefPer
     return
 
-def __HurtTypeHappen_Zhuxian(atkObj, defObj, happenState):
-    """诛仙一击"""
-    return
+#def __HurtTypeHappen_Zhuxian(atkObj, defObj, happenState):
+#    """诛仙一击"""
 #    rate = PlayerControl.GetZhuXianRate(atkObj)
 #    if not rate:
 #        return

--
Gitblit v1.8.0