From 639dbcac8076857c56f219b9b51ce27e0f2d8d0f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 9 Aug 2021 16:13:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E3=80=91=E9=80=89=E6=8B=A9=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=97=B6?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Login/ServerListSelectPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 8e43418825c1d69687546ee22a664ef107598d82 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 9 Aug 2021 16:32:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E3=80=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=80=89=E6=8B=A9=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=AF=8F=E6=AC=A1=E6=89=93=E5=BC=80=E6=97=B6=E9=83=BD?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96=E4=B8=80=E9=81=8D=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=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" .. 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)