diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 180cd3f3f7..68c00b4a63 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -326,9 +326,9 @@ function this.SingleHeroDataShow(_go,_heroData) end) Util.AddOnceClick(formationMask, function() - if LengthOfTable(heroData.formationList) ~= 0 then + if LengthOfTable(hheroData.isFormations) ~= 0 then local text = "" - for key, value in pairs(heroData.formationList) do + for key, value in pairs(heroData.isFormations) do text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318] end PopupTipPanel.ShowTip(text) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 5aa33eed5e..9fe4966e8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2963,17 +2963,10 @@ function this.ByReplaceHeroGetAllHeros() for k,v in ipairs(sortHeroList) do local isFormations = {} for n, w in ipairs(v.formationList) do - if w ~= 1301 and w ~= 401 then local isFormationStr = HeroManager.GetHeroFormationStr(w) if isFormationStr and isFormationStr ~= "" then table.insert(isFormations, w) - if v.isFormation and v.isFormation ~= "" then - v.isFormation = v.isFormation .. "、".. isFormationStr - else - v.isFormation = isFormationStr - end end - end end v.isFormations = isFormations end