From 7ba0084c23ecab5fbe53e0b8e3ee089047945a70 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Sat, 20 Apr 2019 17:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=80=E9=87=8F=E8=B4=9F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/Modules/Battle/Logic/RoleLogic.lua | 2 +- .../java/com/ljsd/jieling/handler/map/MapLogic.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/luafight/Modules/Battle/Logic/RoleLogic.lua b/luafight/Modules/Battle/Logic/RoleLogic.lua index d5077ca04..5144afe37 100644 --- a/luafight/Modules/Battle/Logic/RoleLogic.lua +++ b/luafight/Modules/Battle/Logic/RoleLogic.lua @@ -59,7 +59,7 @@ function RoleLogic:Init(uid, data) Passivity[id](self, args) end - self.isDead = self:GetRoleData(RoleDataName.Hp) == 0 + self.isDead = self:GetRoleData(RoleDataName.Hp) <= 0 self.Auto = true self.IsDebug = false self.enable = true diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 405d6ca5e..9fee6a68b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -836,7 +836,11 @@ public class MapLogic { int[] checkResult = CheckFight.getInstance().checkFight(seed, getFightData, getOptionData); List remainHp = new ArrayList<>(5); for (int i = 1; i < checkResult.length; i++) { - remainHp.add(checkResult[i]); + if (checkResult[i] <= 0) { + remainHp.add(0); + } else { + remainHp.add(checkResult[i]); + } } //校验结果码 1:胜利 int resultCode = checkResult[0]; @@ -1037,7 +1041,11 @@ public class MapLogic { List remainHp = new ArrayList<>(5); for (int i = 1; i < checkResult.length; i++) { - remainHp.add(checkResult[i]); + if (checkResult[i] <= 0) { + remainHp.add(0); + } else { + remainHp.add(checkResult[i]); + } } //校验结果码 1:胜利 int resultCode = checkResult[0];