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])