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

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4005.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4005.py
index f4e59a8..f157c7f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4005.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4005.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: GBK -*-
 #
-# @todo: 增加所有攻击伤害 含普攻
+# @todo: 增加所有攻击伤害 含普攻 附加血量判断 --(PVP)主角生命值低于30%时,所有技能伤害再增加60%
 #
 # @author: Alee
 # @date 2018-1-9 下午09:39:37
@@ -18,8 +18,15 @@
 
 
 def CheckCanHappen(attacker, defender, effect, curSkill):
+    # 未配置不验证血量百分比
+    hpPer = effect.GetEffectValue(2)
+    if hpPer:
+        if GameObj.GetHP(attacker)*ChConfig.Def_MaxRateValue/GameObj.GetMaxHP(attacker) >= hpPer:
+            return False
+        
+    
     return GameWorld.CanHappen(effect.GetEffectValue(1))
     
 
 def GetValue(attacker, defender, effect):
-    return float(effect.GetEffectValue(0))/ChConfig.Def_MaxRateValue
+    return effect.GetEffectValue(0)

--
Gitblit v1.8.0