From 853933b0eaa4419c546204e200122ed0fed2b50e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 11 Oct 2021 15:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivityAtlas/ShengXingYouLi.meta | 8 ++++++++ .../~Lua/Modules/Login/LoginPanel.lua | 17 +++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta new file mode 100644 index 0000000000..9bbc14b9a3 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e51bffc03022dd4a811ab704bbec993 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 15f08f9c60..d13a370ad6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -603,13 +603,18 @@ function this.CacheLoginData(data) for i = 1, #data.serverList do this.serverList[i] = data.serverList[i] end - table.sort(this.serverList, function(a, b) - if a.isnew == b.isnew then - return a.server_id < b.server_id - else - return a.isnew > b.isnew + --取消serverId排序,改用后端原数据,手动把isnew的数据插入到第一个 + local tempList = {} + for i = 1, #this.serverList do + if this.serverList[i].isnew > 0 then + local tempData = this.serverList[i] + for j = i, 2, -1 do + this.serverList[j] = this.serverList[j-1] + end + this.serverList[1] = tempData + break end - end) + end this.myServerList = {} for i = 1, #data.myServerList do this.myServerList[i] = data.myServerList[i]