diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 3812df2e..2adc8302 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -99,13 +99,20 @@ function HeroCell:refreshRedPoint() return end - if DataManager.FormationData:heroInFormation(GConst.BattleConst.FORMATION_TYPE.STAGE, self.heroEntity:getCfgId()) and DataManager.EquipData:canUpgradeEquip(self.heroEntity:getCfgId()) then + if not self.notShowRedPoint and + DataManager.FormationData:heroInFormation(GConst.BattleConst.FORMATION_TYPE.STAGE, self.heroEntity:getCfgId()) and + DataManager.EquipData:canUpgradeEquip(self.heroEntity:getCfgId()) then self.selfNode:addRedPoint(55, -35, 0.64) else self.selfNode:removeRedPoint() end end +-- 设置是否展示红点 +function HeroCell:setShowRedPoint(show) + self.notShowRedPoint = not show +end + function HeroCell:getHeroId() if not self.heroEntity then return 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 86cd39a2..f80f7536 100644 --- a/lua/app/ui/hero/hero_info_comp.lua +++ b/lua/app/ui/hero/hero_info_comp.lua @@ -163,8 +163,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]) diff --git a/lua/app/ui/shop/cell/box_hero_cell.lua b/lua/app/ui/shop/cell/box_hero_cell.lua index f244dfda..56caf032 100644 --- a/lua/app/ui/shop/cell/box_hero_cell.lua +++ b/lua/app/ui/shop/cell/box_hero_cell.lua @@ -15,6 +15,7 @@ function BoxHeroCell:refresh(data) self.data = data local id = data.id local num = data.count + self.heroCell:setShowRedPoint(false) local heroEntity = DataManager.HeroData:getHeroById(id) if heroEntity then