From f3e9d3b2a5f84cdeda24e03997f526bff3345354 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 7 Jan 2022 18:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=91=E6=B8=B8=E5=95=86=E4=BA=BA?= =?UTF-8?q?=E3=80=91=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 528a831fee..91620a0deb 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -20,23 +20,22 @@ local TypeUpdateFunc = { curData.rewards[i].otherData.needItems = configData[j].NeedItems curData.rewards[i].otherData.count = configData[j].Count curData.rewards[i].otherData.composeType = configData[j].ComposeType + curData.rewards[i].otherData.Sort = configData[j].Sort curData.rewards[i].otherData.IsShowItem = configData[j].IsShowItem == 1 and true or false curData.rewards[i].otherData.selectId = 0 end end end table.sort(dataList[ActivityTypeDef.YunYouShangRen].rewards,function (a,b) - if a.progress == 0 and b.progress > 0 then + if a.progress == 0 and b.progress > 0 then return false end if a.progress > 0 and b.progress == 0 then return true end - return a.missionId < b.missionId - -- if a.progress == b.progress then - -- else - -- return a.progress > b.progress - -- end + if (a.progress == 0 and b.progress == 0) or (a.progress > 0 and b.progress > 0) then + return a.otherData.Sort < b.otherData.Sort + end end) end, [ActivityTypeDef.ContinuityRecharge] = function ()