From 31a441bf2842217a4fb215ae25d6e836980f52d4 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 24 一月 2019 10:17:34 +0800
Subject: [PATCH] 5924 【后端】【1.5.100】诛仙Boss功能(杀人不红名)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
index e548363..926174b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -1489,9 +1489,15 @@
         
         if GameObj.GetHP(defender) <= 0:
             if hurtList[1] == IPY_GameWorld.gotPlayer:
+                if hurtList[2] == ChConfig.Def_HurtType_Zhansha:
+                    defender.SetDict(ChConfig.Def_PlayerKey_Zhansha, 1)
+                elif hurtList[2] == ChConfig.Def_HurtType_ZhognjiZhansha:
+                    defender.SetDict(ChConfig.Def_PlayerKey_Zhansha, 2)
                 # 濒死状态触发技能, 不能在GetHurtHP内部触发技能,否则会导致原技能的伤血列表异常
                 PassiveBuffEffMng.OnPassiveSkillTrigger(defender, attacker, None, ChConfig.TriggerType_WillDead, tick)
                 PassiveBuffEffMng.OnPassiveBuffTrigger(defender, attacker, None, ChConfig.TriggerType_WillDead, tick)
+                if hurtList[2] in [ChConfig.Def_HurtType_Zhansha, ChConfig.Def_HurtType_ZhognjiZhansha]:
+                    defender.SetDict(ChConfig.Def_PlayerKey_Zhansha, 0)
             continue
         
         if usePassiveSkillResult:
@@ -1507,8 +1513,9 @@
             PassiveBuffEffMng.OnPassiveSkillTrigger(defender, attacker, None, ChConfig.TriggerType_BeSuperHit, tick)
         elif hurtList[2] == ChConfig.Def_HurtType_Miss:
             PassiveBuffEffMng.OnPassiveSkillTrigger(defender, attacker, None, ChConfig.TriggerType_MissSkill, tick)
-        
-
+        elif hurtList[2] == ChConfig.Def_HurtType_LuckyHit:
+            PassiveBuffEffMng.OnPetPassiveSkillTrigger(defender, attacker, None, ChConfig.TriggerType_BeLuckyHit, tick)
+            
         if hurtList[2] in ChConfig.Def_RealAttack_Type:
             # 被攻击处理层级
             PassiveBuffEffMng.OnPassiveBuffTrigger(defender, attacker, None, ChConfig.TriggerType_Buff_BeAttackSubLayer, tick)

--
Gitblit v1.8.0