From 873fd2b448fc038733d58779ac7ca12d2e4fdb80 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 30 十月 2020 16:35:58 +0800
Subject: [PATCH] 1111 【主干】【长尾】【BT】 GM工具增加直接激活称号命令;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4507.py |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4507.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4507.py
index db170f6..4ad39b0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4507.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4507.py
@@ -14,29 +14,25 @@
 import ChConfig
 import GameWorld
 import IPY_GameWorld
-import SkillCommon
+import AttackCommon
 
 def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
     if not defender:
         return False
-    if defender.GetGameObjType() != IPY_GameWorld.gotPlayer:
-        return False
 
-    curSkill = GameWorld.GetGameData().GetSkillBySkillID(skillID)
-    if not curSkill:
-        return
-    
-    buffType = SkillCommon.GetBuffType(curSkill)
-    buffTuple = SkillCommon.GetBuffManagerByBuffType(attacker, buffType)
-    #通过类型获取目标的buff管理器为空,则跳出
-    if buffTuple == ():
-        return
-    
-    buffManager = buffTuple[0]
-    buff = buffManager.FindBuff(skillID)
-    if not buff:
-        return
-    return buff.GetValue() == defender.GetID()
+    if passiveEffect.GetEffectValue(1):
+        # 第一目标
+        if AttackCommon.GetFirstDefenderID(attacker) != defender.GetID():
+            return False
+        
+    if passiveEffect.GetEffectValue(2):
+        useSkill = skillkwargs.get("useSkill", None)
+        if not useSkill:
+            return False
+        # 普通攻击有效
+        if useSkill.GetFuncType() != ChConfig.Def_SkillFuncType_NormalAttack:
+            return False
+    return True
 
 
 def GetValue(attacker, defender, passiveEffect):

--
Gitblit v1.8.0