From 9c679ecc22d7c42ffedf6be43c5454378f7e2f24 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 28 二月 2022 14:14:35 +0800
Subject: [PATCH] 5358 【bt6】【主干】【yn_1.0.1】跨服PK数值报错神兵生命转换为血盾

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py   |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_807.py |    5 +++--
 2 files changed, 4 insertions(+), 3 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 2adbd59..97b8ccc 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
@@ -2496,7 +2496,7 @@
     bounceHP = hurtValue * defObj_DamageBackRate / float(ChConfig.Def_MaxRateValue)
     bounceHP  = int(bounceHP + PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(defObj, None, None, ChConfig.TriggerType_BounceHP))
     bounceHP  = int(bounceHP + PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(defObj, None, None, ChConfig.TriggerType_BounceHP))
-    if bounceHP == 0:
+    if bounceHP <= 0:
         return
     
     bounceHP = bounceHP if bounceHP < GameObj.GetHP(atkObj) else GameObj.GetHP(atkObj) - 1
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_807.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_807.py
index f7fbd0f..92057ab 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_807.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_807.py
@@ -14,6 +14,7 @@
 import GameWorld
 import SkillCommon
 import GameObj
+import ChConfig
 
 def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
     curSkill = GameWorld.GetGameData().GetSkillBySkillID(skillID)
@@ -39,8 +40,8 @@
     if hurtValue == 0:
         return False
 
-    buff.SetValue(max(buffValue - hurtValue, 0))
-    GameObj.SetBloodShiledHurt(attacker, max(hurtValue - buffValue, 0))
+    buff.SetValue(min(ChConfig.Def_UpperLimit_DWord, max(buffValue - hurtValue, 0)))
+    GameObj.SetBloodShiledHurt(attacker, min(ChConfig.Def_UpperLimit_DWord, max(hurtValue - buffValue, 0)))
     
     if buff.GetValue() == 0:
         buff.SetRemainTime(0)

--
Gitblit v1.8.0