From 33b3a3ca2a65f9988417d387a78e63378f824302 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 30 五月 2019 18:13:20 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 重击回血

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py         |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py |    7 ++++---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py                        |    5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
index 0c84837..8a03c63 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -1645,7 +1645,6 @@
         return 
     
     attacker.SetDict(ChConfig.Def_PlayerKey_FirstDefender, defObj.GetID())
-    
     return
 
 # 清除第一目标
@@ -2504,7 +2503,6 @@
 
     if atkObj.GetGameObjType() != IPY_GameWorld.gotPlayer:
         return
-    
     hurtValue, hurtType = resultHurtType.RealHurtHP, resultHurtType.HurtType, 
     if not hurtValue:
         return
@@ -2531,9 +2529,12 @@
     atkBackHPPer = PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_Buff_SuckBloodPer)
     atkBackHPPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_Buff_SuckBloodPer)
     
+    
     if hurtType == ChConfig.Def_HurtType_SuperHit:
         atkBackHPPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_SuperHitSuckBloodPer)
-        
+    elif hurtType == ChConfig.Def_HurtType_ThumpHit:    
+        atkBackHPPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_ThumpHitSuckBloodPer)
+
     atkBackHP += int(hurtValue * atkBackHPPer*1.0 / ChConfig.Def_MaxRateValue)
         
     suckHP += atkBackHP
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 6b11711..143b7d8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4498,8 +4498,9 @@
 TriggerType_BurnDisappear,    # 灼烧消失触发 81
 TriggerType_SkillValue,    # 增加技能伤害固定值 82
 TriggerType_HitSuccess,        # 命中成功率 83
-TriggerType_AddHP,        # 回血 84
-) = range(1, 85)
+TriggerType_AddHP,        # 技能回血 84
+TriggerType_ThumpHitSuckBloodPer,   # 重击百分比吸血, 85
+) = range(1, 86)
 
 
 #不可以佩戴翅膀的地图
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 e6062ad..0bdbec4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -388,7 +388,7 @@
              4100:ChConfig.TriggerType_AttackOver,  # 攻击(对敌技能)后被动技能被触发 4
              4101:ChConfig.TriggerType_AttackAddSkillPer,  # 所有攻击伤害(SkillPer)增加,含普攻,计算时 5
              4102:ChConfig.TriggerType_SkillValue,  # 增加技能伤害固定值 82
-             4103:ChConfig.TriggerType_Buff_SuckBloodPer,   # 攻击 百分比吸血
+             4103:ChConfig.TriggerType_ThumpHitSuckBloodPer,   # 攻击 百分比吸血
              4104:ChConfig.TriggerType_HitSuccess,  # 命中成功率 83
              4106:ChConfig.TriggerType_AddHP,   # 回血 84
              }

--
Gitblit v1.8.0