diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index 369ecf14..9f387019 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -188,7 +188,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6209 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -304,7 +304,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6210 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -424,7 +424,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6211 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -540,7 +540,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6212 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -650,7 +650,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6213 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -755,7 +755,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6214 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -860,7 +860,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6215 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -980,7 +980,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6216 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1127,7 +1127,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6218 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1243,7 +1243,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6219 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1359,7 +1359,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6220 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1479,7 +1479,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6221 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1599,7 +1599,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6222 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1699,7 +1699,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6223 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1815,7 +1815,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6224 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1920,7 +1920,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6225 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2040,7 +2040,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6226 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2187,7 +2187,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6228 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2292,7 +2292,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6229 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2408,7 +2408,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6230 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2519,7 +2519,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6231 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2639,7 +2639,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6232 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2744,7 +2744,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6233 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2860,7 +2860,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6234 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2980,7 +2980,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6235 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3100,7 +3100,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6236 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3247,7 +3247,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6238 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3363,7 +3363,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6239 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3479,7 +3479,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6240 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3590,7 +3590,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6241 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3706,7 +3706,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6242 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3822,7 +3822,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6243 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3938,7 +3938,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6244 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4049,7 +4049,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6245 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4169,7 +4169,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6246 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4311,7 +4311,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6248 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4416,7 +4416,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6249 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4532,7 +4532,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6250 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4648,7 +4648,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6251 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4764,7 +4764,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6252 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4864,7 +4864,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6253 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4980,7 +4980,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6254 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5085,7 +5085,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6255 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5201,7 +5201,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6256 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5348,7 +5348,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6258 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5453,7 +5453,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6259 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5558,7 +5558,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6260 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5674,7 +5674,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6261 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5784,7 +5784,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6262 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5889,7 +5889,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6263 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6005,7 +6005,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6264 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6121,7 +6121,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6265 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6237,7 +6237,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6266 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6384,7 +6384,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6268 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6500,7 +6500,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6269 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6611,7 +6611,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6270 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6727,7 +6727,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6271 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6843,7 +6843,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6272 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6943,7 +6943,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6273 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7059,7 +7059,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6274 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7170,7 +7170,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6275 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7275,7 +7275,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6276 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7433,7 +7433,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6278 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7553,7 +7553,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6279 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7669,7 +7669,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6280 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7780,7 +7780,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6281 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7885,7 +7885,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6282 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7990,7 +7990,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6283 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8114,7 +8114,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6284 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8219,7 +8219,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6285 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8335,7 +8335,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6286 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8497,7 +8497,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6288 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8602,7 +8602,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6289 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8722,7 +8722,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6290 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8832,7 +8832,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6291 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8952,7 +8952,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6292 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9068,7 +9068,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6293 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9184,7 +9184,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6294 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9300,7 +9300,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6295 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9416,7 +9416,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6296 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9578,7 +9578,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6298 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9694,7 +9694,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6299 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9814,7 +9814,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6300 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9930,7 +9930,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6301 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10050,7 +10050,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6302 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10166,7 +10166,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6303 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10286,7 +10286,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6304 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10402,7 +10402,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6305 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10518,7 +10518,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6306 + 6208 }, ["hp"]=2000000, ["atk"]=10000, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index c221884f..59b1957a 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -552,6 +552,7 @@ local LocalizationGlobalConst = RUNES_DESC_23 = "RUNES_DESC_23", RUNES_DESC_24 = "RUNES_DESC_24", RUNES_DESC_25 = "RUNES_DESC_25", + RUNES_DESC_26 = "RUNES_DESC_26", DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1", DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2", DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3", diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 7b2b9cf2..277e4b96 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -541,8 +541,8 @@ local localization_global = ["RUNES_DESC_12"] = "增伤套装", ["RUNES_DESC_13"] = "暴击套装", ["RUNES_DESC_14"] = "爆伤套装", - ["RUNES_DESC_15"] = "Lv1-2件套:{0}", - ["RUNES_DESC_16"] = "Lv2-4件套:{0}", + ["RUNES_DESC_15"] = "Lv1:2件套:{0}", + ["RUNES_DESC_16"] = "Lv2:4件套:{0}", ["RUNES_DESC_17"] = "符文每日礼包", ["RUNES_DESC_18"] = "强化材料不足", ["RUNES_DESC_19"] = "符文精华不足，洋葱头也没办法", @@ -552,6 +552,7 @@ local localization_global = ["RUNES_DESC_23"] = "无套装效果", ["RUNES_DESC_24"] = "请先激活英雄", ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文", + ["RUNES_DESC_26"] = "Lv{0}", ["DUNGEON_RUNE_DESC_1"] = "目标", ["DUNGEON_RUNE_DESC_2"] = "再次挑战", ["DUNGEON_RUNE_DESC_3"] = "通关获得", diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 9f3278a9..1f1af3fe 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -81,11 +81,17 @@ function RunesInfoComp:refresh() local curExp = DataManager.RunesData:getLevelExp() local maxExp = DataManager.RunesData:getNextLevelTotalExp() + if maxExp then + self.imgProg.value = curExp / maxExp + -- self.txProg:setText(curExp .. "/" .. maxExp) + else + self.imgProg.value = 1 + -- self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) + end self.txNum:setText(DataManager.RunesData:getMaterialCount()) self.txCost:setText(GFunc.getRewardNum(self.runesEntity:getMaterialCost())) self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_1, DataManager.RunesData:getLevel())) - self.imgProg.value = curExp / maxExp GFunc.centerImgAndTx(self.imgCost, self.txCost) self:refreshSuit() @@ -106,7 +112,10 @@ function RunesInfoComp:refreshRunes() if DataManager.RunesData:isUnlock(index) then lock:setActive(false) - imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.RunesConst.QUALITY_ICON[index]) + local qlt = self.runesEntity:getGridQuality(index) + if qlt then + imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.RunesConst.QUALITY_ICON[qlt]) + end local suit = self.runesEntity:getGridSuit(index) if suit then imgSuit:setSprite(GConst.ATLAS_PATH.HERO, "hero_rune_"..suit) diff --git a/lua/app/ui/runes/runes_suit_ui.lua b/lua/app/ui/runes/runes_suit_ui.lua index 0880155d..5d98e0a7 100644 --- a/lua/app/ui/runes/runes_suit_ui.lua +++ b/lua/app/ui/runes/runes_suit_ui.lua @@ -47,7 +47,7 @@ function RunesSuitUI:onRefresh() local attr1 = DataManager.RunesData:getSuitAttr(index, self.heroEntity:getMatchType(), 1) local attr2 = DataManager.RunesData:getSuitAttr(index, self.heroEntity:getMatchType(), 2) local level = self.runesEntity:getSuitLevel(index) - txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, level)) + txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_26, level)) local str1 = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_15, GFunc.getAttrDesc(attr1.type, attr1.num)) local str2 = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_16, GFunc.getAttrDesc(attr2.type, attr2.num)) diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index d3bfaa8d..7c288976 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -99,7 +99,7 @@ function RunesData:getNextLevelTotalExp() return cfg.cost or 0 end - return 0 + return nil end -- 获取相应铸台等级的品质概率 diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index 3cc979b6..4521be56 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -83,6 +83,15 @@ function RunesEntity:getGridAttr(index) return nil end +-- 获取格子的品质 +function RunesEntity:getGridQuality(index) + if self.grids[index] then + return self.grids[index].quality + end + + return nil +end + -- 获取格子的套装 function RunesEntity:getGridSuit(index) if self.grids[index] then