diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 60b9d0c1..4ccd24e3 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -7,6 +7,7 @@ function RunesInfoComp:init() local uiMap = self:getUIMap() self.btnHelp = uiMap["runes_info.btn_help"] self.imgProg = uiMap["runes_info.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txProg = uiMap["runes_info.prog.tx_prog"] self.txLevel = uiMap["runes_info.level.tx_level"] self.btnSuit = uiMap["runes_info.btn_suit"] self.txSuit = uiMap["runes_info.btn_suit.tx_suit"] @@ -86,10 +87,10 @@ function RunesInfoComp:refresh() local maxExp = DataManager.RunesData:getNextLevelTotalExp() if maxExp then self.imgProg.value = curExp / maxExp - -- self.txProg:setText(curExp .. "/" .. maxExp) + self.txProg:setText(curExp .. "/" .. maxExp) else self.imgProg.value = 1 - -- self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) + self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) end if DataManager.RunesData:canAutoMake() then diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index caba2d9f..55fd2317 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -567,9 +567,11 @@ function HeroEntity:getTotalBaseAtk() result = result + equipEntity:getBaseAttack() end end - -- Logger.logHighlight(logStr) + -- logStr = logStr .. "\nSKIN:" .. DataManager.SkinData:getBaseAttack(self) result = result + DataManager.SkinData:getBaseAttack(self) + -- logStr = logStr .. "\nRUNES:" .. self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME, true) result = result + self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME, true) + -- Logger.logHighlight(logStr) return result end diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index dfb27aa5..8c68430d 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -200,11 +200,11 @@ function RunesData:getSuitName(index) elseif index == 2 then return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_11) elseif index == 3 then - return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_12) - elseif index == 4 then - return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_13) - elseif index == 5 then return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_14) + elseif index == 4 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_12) + elseif index == 5 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_13) end return nil diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index 4521be56..51c46801 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -125,7 +125,7 @@ end -- 获取已有的套装id map function RunesEntity:getSuitIds() local typeCount = {} - for i = 1, GConst.RunesConst.MAX_SUITS_COUNT do + for i = 1, GConst.RunesConst.MAX_ATTR_GRID_COUNT do local t = self:getGridSuit(i) if t then local temp = table.find(typeCount, function(value) return value.id == t end) @@ -195,7 +195,7 @@ function RunesEntity:getAttrValue(attrType, isBase) return result elseif not isBase and attrType == GConst.MATCH_ATTACK_NAME[self:getHeroEntity():getMatchType()] then result = self:getAttrValue(GConst.MATCH_ATTACK_NAME[self:getHeroEntity():getMatchType()], true) - result = result + self:getHeroEntity():getTotalBaseAtk() * self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME) // DEFAULT_FACTOR + result = result + self:getHeroEntity():getTotalBaseAtk() * self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME[self:getHeroEntity():getMatchType()]) // DEFAULT_FACTOR return result elseif not isBase and (attrType == GConst.MATCH_NORMAL_HURTP_NAME[self:getHeroEntity():getMatchType()] or attrType == GConst.MATCH_SKILL_HURTP_NAME[self:getHeroEntity():getMatchType()]) then result = self:getAttrValue(attrType, true)