From 4c8eff015ef6d524576a489d765260b7bb0537e6 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Thu, 3 Aug 2023 09:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../battle/controller/battle_base_controller.lua   |  5 ++---
 lua/app/userdata/summon/summon_data.lua            | 14 ++++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua
index 7e016964..294f157d 100644
--- a/lua/app/module/battle/controller/battle_base_controller.lua
+++ b/lua/app/module/battle/controller/battle_base_controller.lua
@@ -331,7 +331,6 @@ function BattleBaseController:onLinkChange()
         elementTypeCount = elementTypeCount + count
     end
     local dmg = self:calExpectedInjury(mainElementType, elementTypeCount, dmgSkillId)
-    Logger.logHighlight(dmg)
     local defMainUnitcomp = self:getCurOtherActionUnitComp()
     if defMainUnitcomp then
         local hp = defMainUnitcomp.unitEntity:getHp()
@@ -1214,11 +1213,11 @@ end
 
 function BattleBaseController:onLinkOver()
     local hp = self.atkTeam:getMainUnit().unitEntity:getHp()
-    local hpPercent = self.atkTeam:getMainUnit().unitEntity:getMaxHp()
+    local hpPercent = self.atkTeam:getMainUnit().unitEntity:getHpPercent()
     self.battleUI:setAtkHp(hp, hpPercent)
 
     local hp = self.defTeam:getMainUnit().unitEntity:getHp()
-    local hpPercent = self.defTeam:getMainUnit().unitEntity:getMaxHp()
+    local hpPercent = self.defTeam:getMainUnit().unitEntity:getHpPercent()
     self.battleUI:setDefHp(hp, hpPercent)
 
     self.battleUI:hideAllSfxLine()
diff --git a/lua/app/userdata/summon/summon_data.lua b/lua/app/userdata/summon/summon_data.lua
index 8fbb5091..0be73e4c 100644
--- a/lua/app/userdata/summon/summon_data.lua
+++ b/lua/app/userdata/summon/summon_data.lua
@@ -82,13 +82,15 @@ function SummonData:getSummonRewardByLv(summonType, level)
         for _, reward in ipairs(rewards) do
             local find = false
             for index, rewardBase in ipairs(cfgInfo.box_lv_base) do
-                if reward.type == rewardBase.type and reward.id == rewardBase.id and reward.num > rewardBase.num then
+                if reward.type == rewardBase.type and reward.id == rewardBase.id and reward.num >= rewardBase.num then
                     local num  = reward.num - rewardBase.num
-                    table.insert(self.cacheSummonRewardByLv[level], {
-                        id = reward.id,
-                        type = reward.type,
-                        num = num
-                    })
+                    if num ~= 0 then
+                        table.insert(self.cacheSummonRewardByLv[level], {
+                            id = reward.id,
+                            type = reward.type,
+                            num = num
+                        })
+                    end
                     find = true
                     break
                 end