From ee3338ee75ac2a1cc8e564994071d8200b48d34c Mon Sep 17 00:00:00 2001
From: gaoxin <gaoxin@ljsd.com>
Date: Mon, 9 Aug 2021 16:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=8D=E5=8A=A1=E5=99=A8=E3=80=91?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E6=89=93=E5=BC=80=E6=97=B6=E9=83=BD=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E8=8E=B7=E5=8F=96=E4=B8=80=E9=81=8D=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/Login/LoginPanel.lua         | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index 98aa92c378..faeafcfa70 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -145,22 +145,43 @@ function this:BindEvent()
 
     ---SelectServer
     Util.AddClick(this.changeServerBtn, function()
-        UIManager.OpenPanel(UIName.ServerListSelectPanel, {
-            serverList = this.serverList,
-            myServerList = this.myServerList,
-            lastServer = this.lastServer,
-            recommend = this.recommend,
-            callback = function(index)
-                local list = this.serverList[index]
-                PlayerManager.serverInfo = list
-                LoginManager.SocketAddress = list.ip
-                LoginManager.SocketPort = list.port
-                LoginManager.ServerId = list.server_id
-                LoginManager.state = list.state
-                --local severArea = tonumber(string.sub(list.server_id, 0, -5))
-                this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
+        local function reServerCallback(str)
+            if str == nil then
+                return
             end
-        })
+            if str ~= nil and str ~= "" then
+                MyPCall(function()
+                    local json = require 'cjson'
+                    local data = json.decode(str)
+                    -- selectServerPart
+                    this.SetServerList(data)
+                    -- 打开服务器选择界面
+                    UIManager.OpenPanel(UIName.ServerListSelectPanel, {
+                        serverList = this.serverList,
+                        myServerList = this.myServerList,
+                        lastServer = this.lastServer,
+                        recommend = this.recommend,
+                        callback = function(index)
+                            local list = this.serverList[index]
+                            PlayerManager.serverInfo = list
+                            LoginManager.SocketAddress = list.ip
+                            LoginManager.SocketPort = list.port
+                            LoginManager.ServerId = list.server_id
+                            LoginManager.state = list.state
+                            --local severArea = tonumber(string.sub(list.server_id, 0, -5))
+                            this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
+                        end
+                    })
+                end)
+            end
+        end
+        -- 判断获取服务器的id
+        if IsSDKLogin then
+            this.RequestServerList(AppConst.OpenId, reServerCallback)
+        else
+            local userId = PlayerPrefs.GetString(openIdkey, defaultOpenIdkey)
+            this.RequestServerList(userId, reServerCallback)
+        end
     end)