From 9a739f5ef7dc235d8effd1b46ebe9bf747ab8e36 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 17 五月 2019 23:56:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4503.py |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4503.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4503.py
index 60eddc4..7a5f7b6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4503.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4503.py
@@ -1,33 +1,32 @@
 #!/usr/bin/python
 # -*- coding: GBK -*-
 #
-# @todo: buff中攻击目标处于XX状态提高增加伤害
+##@package
+#
+# @todo: buff中攻击处于xx状态目标触发技能
 #
 # @author: Alee
-# @date 2018-1-30 下午05:11:45
+# @date 2019-5-7 下午09:17:25
 # @version 1.0
 #
 # @note: 
 #
 #---------------------------------------------------------------------
 
-import ChConfig
 import GameWorld
 import GameObj
 
 def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
-    if not defender:
-        return False
-    
-    if not passiveEffect.GetEffectValue(1):
-        # 不配置状态的情况
-        return True
-    
-    if GameObj.GetPyPlayerState(defender, passiveEffect.GetEffectValue(1)):
-        #GameWorld.DebugLog("状态触发----%s"%effect.GetEffectValue(1))
-        return True
-    return False
+    if passiveEffect.GetEffectValue(0):
+        if not GameObj.GetPyPlayerState(defender, passiveEffect.GetEffectValue(0)):
+            #GameWorld.DebugLog("状态触发----%s"%effect.GetEffectValue(1))
+            return False
+    return True
 
 
-def GetValue(attacker, defender, passiveEffect):
-    return passiveEffect.GetEffectValue(0)
+def GetSkillData(passiveEffect):
+    skillID = passiveEffect.GetEffectValue(1)
+    return GameWorld.GetGameData().GetSkillBySkillID(skillID)
+
+
+

--
Gitblit v1.8.0