From 3cd7442a8e053cd07f02d97cf4b0e2da796650f1 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 28 Jul 2023 15:35:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E6=9C=AA=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E5=88=9D=E5=A7=8B=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/hero/cell/attr_cell.lua | 24 ++++++++++++++++++++---- lua/app/ui/hero/hero_info_comp.lua | 4 ++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/lua/app/ui/hero/cell/attr_cell.lua b/lua/app/ui/hero/cell/attr_cell.lua index 41c8dad2..ab441cde 100644 --- a/lua/app/ui/hero/cell/attr_cell.lua +++ b/lua/app/ui/hero/cell/attr_cell.lua @@ -49,9 +49,17 @@ function AttrCell:showHp() local value = 0 if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then - value = self.heroEntity:getTotalAttrValue(self.attrName) + if self.heroEntity:isActived() then + value = self.heroEntity:getTotalAttrValue(self.attrName) + else + value = self.heroEntity:getCfgHp(self.heroEntity:getBeginLv()) + end elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then - value = self.heroEntity:getCfgHp(self.heroEntity:getLv()) + if self.heroEntity:isActived() then + value = self.heroEntity:getCfgHp(self.heroEntity:getLv()) + else + value = self.heroEntity:getCfgHp(self.heroEntity:getBeginLv()) + end elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then value = self.weaponEntity:getHp() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then @@ -72,9 +80,17 @@ function AttrCell:showAtk() local value = 0 if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then - value = self.heroEntity:getTotalAttrValue(self.attrName) + if self.heroEntity:isActived() then + value = self.heroEntity:getTotalAttrValue(self.attrName) + else + value = self.heroEntity:getCfgAtk(self.heroEntity:getBeginLv()) + end elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then - value = self.heroEntity:getCfgAtk(self.heroEntity:getLv()) + if self.heroEntity:isActived() then + value = self.heroEntity:getCfgAtk(self.heroEntity:getLv()) + else + value = self.heroEntity:getCfgAtk(self.heroEntity:getBeginLv()) + end elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then value = self.weaponEntity:getAttack() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then diff --git a/lua/app/ui/hero/hero_info_comp.lua b/lua/app/ui/hero/hero_info_comp.lua index c4ec5ed1..94e4df5a 100644 --- a/lua/app/ui/hero/hero_info_comp.lua +++ b/lua/app/ui/hero/hero_info_comp.lua @@ -171,8 +171,8 @@ function HeroInfoComp:refresh(checkLevel) end else str = I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_5) - hpStr = self.heroEntity:getHp(self.heroEntity:getBeginLv()) // DEFAULT_FACTOR - atkStr = self.heroEntity:getAtk(self.heroEntity:getBeginLv()) // DEFAULT_FACTOR + hpStr = self.heroEntity:getCfgHp(self.heroEntity:getBeginLv()) // DEFAULT_FACTOR + atkStr = self.heroEntity:getCfgAtk(self.heroEntity:getBeginLv()) // DEFAULT_FACTOR end self.txUpdesc:setText(str) self.txUpNum:setText(materials[2])