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