From 6a951e8fd758aac63fcb462723c37443a2125d01 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 3 Sep 2020 14:12:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=B0=86=EF=BC=8C=E8=BF=9B=E9=98=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/RoleInfo/RoleUpStarListPanel.lua | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 3e18e10859..59bce52478 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -67,17 +67,30 @@ function RoleUpStarListPanel:OnOpen(heroData,HeroRankupGroupData,RankupConsumeMa curHeroData = _curHeroData heroDataList = heroData this.HeroSortData(heroDataList) + local text = "" for i, v in pairs(heroDataList) do + text = "" for n,w in pairs(FormationManager.formationList) do if HeroManager.heroResolveLicence[n] then for m = 1, #w.teamHeroInfos do if v.dynamicId==w.teamHeroInfos[m].heroId then - local isFormationStr = HeroManager.GetHeroFormationStr(n) - v.isFormation = isFormationStr + local isFormationStr = HeroManager.GetHeroFormationStr2(n) + if isFormationStr ~= "" then + if not text or text == "" then + text = isFormationStr + else + text = text .. "、"..isFormationStr + end + end end end end end + if not text or text == "" then + v.isFormation = "" + else + v.isFormation = Language[12317]..text..Language[12318] + end end this.ScrollView:SetData(heroDataList, function (index, go) this.OnShowSingleCardData(go, heroDataList[index])