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" .. severArea .. "" .. 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" .. severArea .. "" .. 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) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua index 0ee461d04e..b54d0a9e97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua @@ -73,7 +73,7 @@ function ServerListSelectPanel:SetServerList() serverItem:SetVisible(true) serverItem.cloneObj:GetComponent("Button").onClick:AddListener(function() if not LoginManager.IsServerStateEnterable(serverInfo.state) then - PopupTipPanel.ShowTip(Language[11142]) + PopupTipPanel.ShowTip("服务器还未开启哦,请道友稍后片刻,具体开服时间可见公告~") return end if self.context.callback then @@ -127,7 +127,7 @@ function ServerListSelectPanel:QuickSeverClicked(gameObject, serverId) Util.AddOnceClick(gameObject, function() local serverInfo = self:GetServerInfo(serverId) if not LoginManager.IsServerStateEnterable(serverInfo.state) then - PopupTipPanel.ShowTip(Language[11142]) + PopupTipPanel.ShowTip("服务器还未开启哦,请道友稍后片刻,具体开服时间可见公告~") return end if self.context.callback then