From 749fd32ed057197bd2cb7a5a5fea95e2cffda72b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 14 Apr 2021 20:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= =?UTF-8?q?=E3=80=91=E9=80=89=E6=8B=A9=E8=8B=B1=E9=9B=84=E6=8C=89=E6=88=98?= =?UTF-8?q?=E5=8A=9B=E5=8F=91=E9=80=81=E8=8B=B1=E9=9B=84=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationEditPopup.lua | 3 +++ Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index ecd6ce6fba..6c7ab506b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -78,6 +78,9 @@ function FormationEditPopup:BindEvent() for i, v in ipairs(choosedList) do table.insert(dids,v.did) end + table.sort(dids,function (a,b) + return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower + end) if #choosedList <= maxNum and #choosedList > 0 then NetManager.TrialHeroInfoSaveRequest(dids,function(msg) PopupTipPanel.ShowTip(Language[10670]) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 9e76d7ea60..f4f8bddd22 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -518,9 +518,9 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) end end end - table.sort(d,function (a,b) - return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower - end) + -- table.sort(d,function (a,b) + -- return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower + -- end) for i, v in ipairs(d) do if MapTrialManager.selectHeroDid ~= "" then if MapTrialManager.selectHeroDid==v.heroId and v.heroHp <= 0 then