From b90a0925f8f5f12c7c78878e2583ea8d3e609b28 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 21 五月 2019 21:07:31 +0800
Subject: [PATCH] 6895 子 【2.0】套装优化 / 【后端】【2.0】增加套装技能

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py             |    1 +
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4023.py |   12 +++++++++++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4539.py  |   24 ++++++++++++++++++++++++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4039.py |    2 +-
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4539.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4539.py
new file mode 100644
index 0000000..c52d508
--- /dev/null
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4539.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+# -*- coding: GBK -*-
+#
+##@package
+#
+# @todo: buff中攻击附加生命上限XX%值的技能伤害固定值
+#
+# @author: Alee
+# @date 2019-5-21 下午09:03:22
+# @version 1.0
+#
+# @note: 
+#
+#---------------------------------------------------------------------
+
+import ChConfig
+import GameObj
+
+def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
+    return True
+
+
+def GetValue(attacker, defender, passiveEffect):
+    return GameObj.GetMaxHP(attacker) *passiveEffect.GetEffectValue(0)/ChConfig.Def_MaxRateValue
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4023.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4023.py
index d426335..ce05ae0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4023.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4023.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: GBK -*-
 #
-# @todo: 被攻击后触发被动技能, 附加条件 血量低于XX百分比
+# @todo: 被攻击后触发被动技能, 附加条件 血量低于XX百分比, 附加被攻击次数判定
 #
 # @author: Alee
 # @date 2018-1-9 下午09:39:37
@@ -23,4 +23,14 @@
         if GameObj.GetHP(attacker)*ChConfig.Def_MaxRateValue/GameObj.GetMaxHP(attacker) >= effect.GetEffectValue(1):
             return False
         
+    if effect.GetEffectValue(2):
+        # 攻击次数判定
+        attackCnt = curSkill.GetProficiency()
+        curSkill.SetProficiency(attackCnt + 1)
+        
+        if attackCnt + 1 >= effect.GetEffectValue(2):
+            curSkill.SetProficiency(0)
+        else:
+            return False
+        
     return GameWorld.CanHappen(effect.GetEffectValue(0))
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4039.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4039.py
index c57e6d1..4b4c6a3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4039.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4039.py
@@ -22,7 +22,7 @@
     # 外层有CD拦着,CD中不计数
     curSkill.SetProficiency(attackCnt + 1)
     
-    if attackCnt + 1 > effect.GetEffectValue(0):
+    if attackCnt + 1 >= effect.GetEffectValue(0):
         curSkill.SetProficiency(0)
         return True
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
index b280e55..502bd9c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -446,6 +446,7 @@
              4536:ChConfig.TriggerType_AddBuffOver, 
              4537:ChConfig.TriggerType_BurnPer, # 灼烧伤害百分比 80
              4538:ChConfig.TriggerType_SkillValue,  # 增加技能伤害固定值 82
+             4539:ChConfig.TriggerType_SkillValue,  # 增加技能伤害固定值 82
              
              803:ChConfig.TriggerType_BloodShield,  # 血盾
              806:ChConfig.TriggerType_BloodShield,  # 血盾

--
Gitblit v1.8.0