diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua index b1060f0d2b..5fa1a682c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua @@ -373,7 +373,7 @@ function FaLingSingleShowPopup:OnShow() local curStar = 0 for i = 1, #lvList do if lvList[i].ShowSkill and #lvList[i].ShowSkill > 0 and tonumber(lvList[i].ShowSkill[1]) ~= nil then - LogError("lvList[i].id======" .. lvList[i].ShowSkill[3]) + --LogError("lvList[i].id======" .. lvList[i].ShowSkill[3]) local skillData = {} skillData.id = lvList[i].ShowSkill[3] skillData.state = 0 @@ -390,6 +390,7 @@ function FaLingSingleShowPopup:OnShow() end skillData.des = skillData.des .. "(" .. ProfessionType[lvList[i].ShowSkill[2]] .. Language[12121] .. ")" elseif type == 2 then + --LogError("vvvvvv:"..tostring(skillData.id).."/"..tostring(skillData.state).."/"..tostring(self.equipData.staticId).."/"..tostring(self.curHeroData.heroConfig.Id)) --LogError("lv=========="..lv.." lvList[i].Level=="..lvList[i].Level.." self.curHeroData.staticId=="..self.curHeroData.staticId.." lvList[i].ShowSkill[2]=="..lvList[i].ShowSkill[2]) if lv >= lvList[i].Level and self.curHeroData and self.curHeroData.heroConfig.Id == lvList[i].ShowSkill[2] then skillData.state = 1 @@ -397,6 +398,7 @@ function FaLingSingleShowPopup:OnShow() skillData.des = skillData.des .. "(" .. GetLanguageStrById(heroConfig[lvList[i].ShowSkill[2]].ReadingName) .. Language[12122] .. ")" end + table.insert(skillList, skillData) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua index 732483ca58..b2641f02b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua @@ -218,11 +218,10 @@ function FaLingStrongPopup:OnShow() local lvList = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.EquipTalismana, "TalismanaId", self.equipData.staticId) - local skillList = {} for i = 1, #lvList do if lvList[i].ShowSkill and #lvList[i].ShowSkill > 0 and tonumber(lvList[i].ShowSkill[1]) ~= nil then - LogError("lvList[i].id======" .. lvList[i].ShowSkill[3]) + --LogError("lvList[i].id======" .. lvList[i].ShowSkill[3]) local skillData = {} skillData.id = lvList[i].ShowSkill[3] skillData.state = 0 @@ -239,12 +238,15 @@ function FaLingStrongPopup:OnShow() end skillData.des = skillData.des .. "(" .. ProfessionType[lvList[i].ShowSkill[2]] .. Language[12121] .. ")" elseif type == 2 then - if lv >= lvList[i].Level and self.curHeroData and self.curHeroData.staticId == lvList[i].ShowSkill[2] then + --LogError("sssss:"..tostring(skillData.id).."/"..tostring(skillData.state).."/"..tostring(self.equipData.staticId).."/"..tostring(self.curHeroData.staticId)) + --if lv >= lvList[i].Level and self.curHeroData and self.curHeroData.staticId == lvList[i].ShowSkill[2] then + if lv >= lvList[i].Level and self.curHeroData and self.curHeroData.heroConfig.Id == lvList[i].ShowSkill[2] then skillData.state = 1 end skillData.des = skillData.des .. "(" .. GetLanguageStrById(heroConfig[lvList[i].ShowSkill[2]].ReadingName) .. Language[12122] .. ")" end + table.insert(skillList, skillData) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua index 6bea1ab94a..ae9396469c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua @@ -122,10 +122,9 @@ function this.SetScrollPre(root, data) local mask = Util.GetGameObject(root, "mask") if type == 1 then info.text = Language[11002] .." ".. - wishData.Level .." ".. Language[12267] .." ".. wishData.Weight / 100 .. "%" .. - Language[12268].." " .. wishData.MythWeight / 100 .. "%" + wishData.Level .." ".. Language[12267] else - info.text = Language[11002].." " .. wishData.Level .. Language[12269].." " .. wishData.Weight / 100 .. "%" + info.text = Language[11002].." " .. wishData.Level .. Language[12267] end if not itemList[root] then