From f25bdb2d170cb5d6d2cf3b2dcb1def4ce8b066e6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 21:17:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E7=BD=AE=E6=8D=A2?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A3=80=E6=B5=8B=E7=BC=96=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua | 4 ++-- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) 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..83b1b58c2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2967,11 +2967,6 @@ function this.ByReplaceHeroGetAllHeros() 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 From f2f3b7726028f6739b487335c86ef519eb13bf65 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 21:29:03 +0800 Subject: [PATCH 2/2] biandui update --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 83b1b58c2e..9fe4966e8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2963,12 +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) end - end end v.isFormations = isFormations end