From 381d537a4ec2ce4ffb7582dd3f3577877097b50d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 29 Jul 2021 11:44:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E3=80=91=E9=99=A4?= =?UTF-8?q?=E6=B5=81=E7=95=85=EF=BC=8C=E6=8B=A5=E6=8C=A4=E5=92=8C=E7=88=86?= =?UTF-8?q?=E6=BB=A1=E5=A4=96=E7=9A=84=E5=85=B6=E4=BB=96=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=B8=8D=E5=8F=AF=E8=BF=9B=E5=85=A5=E6=B8=B8?= =?UTF-8?q?=E6=88=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 9 +++++---- .../~Lua/Modules/Login/LoginPanel.lua | 11 ++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 64524da525..ee3d599e1b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1725,10 +1725,11 @@ GLOBAL_CHAT_TYPE = { PUBLIC_CHAT_MAX_NUM = 50 ServerStateDef = { - Maintenance = 1, - Fluency = 2, - Full = 3, - Congestion = 4--拥挤,服务器不存在此状态 + UnSee = 0, -- 不可见 + Maintenance = 1, -- 维护 + Fluency = 2, -- 流畅 + Congestion = 3, -- 拥挤 + Full = 4, -- 爆满 } BindPhoneState = { diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 69de8805a8..af60bcf647 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -692,7 +692,10 @@ function this.OnLoginClick() PopupTipPanel.ShowTip("为了保证您的个人隐私和隐私安全,请详细阅读并同意用户协议及隐私政策") return end - if LoginManager.state == 0 or LoginManager.state == 1 then + -- 只要不是流畅,拥挤,爆满状态就不让登录 + if LoginManager.state ~= ServerStateDef.Fluency + and LoginManager.state ~= ServerStateDef.Congestion + and LoginManager.state ~= ServerStateDef.Full then local function reServerCallback(str) if str == nil then return @@ -703,8 +706,10 @@ function this.OnLoginClick() local data = json.decode(str) ---selectServerPart this.SetServerList(data) - -- 还是不可进状态则请求 - if LoginManager.state == 0 or LoginManager.state == 1 then + -- 还是不可进状态则提示服务器维护中 + if LoginManager.state ~= ServerStateDef.Fluency + and LoginManager.state ~= ServerStateDef.Congestion + and LoginManager.state ~= ServerStateDef.Full then PopupTipPanel.ShowTip(Language[11142]) RequestPanel.Hide() else