From 984b863b8dd07447cdff707758a79ccbbb5d91b9 Mon Sep 17 00:00:00 2001
From: gaoxin <gaoxin@ljsd.com>
Date: Mon, 9 Aug 2021 14:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=BB=B4=E6=8A=A4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B=EF=BC=8C=E7=99=BB=E5=BD=95=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/Login/LoginManager.lua              | 12 ++++++++++++
 .../~Lua/Modules/Login/LoginPanel.lua                | 10 +++-------
 .../~Lua/Modules/Login/ServerListSelectPanel.lua     |  7 ++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
index b552979825..28514e2c46 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
@@ -204,5 +204,17 @@ function this:SendGetHttp(url, callback, _, _, failCB)
     end, nil, nil, failCB)
 end
 
+-- 判断服务器状态是否可进入
+function this.IsServerStateEnterable(state)
+    if not state then
+        return 
+    end
+    if state ~= ServerStateDef.Fluency 
+    and state ~= ServerStateDef.Congestion 
+    and state ~= ServerStateDef.Full then
+        return false
+    end
+    return true
+end
 
 return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index 3baf2f333b..98aa92c378 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -699,9 +699,7 @@ function this.OnLoginClick()
         return
     end
     -- 只要不是流畅，拥挤，爆满状态就不让登录
-    if LoginManager.state ~= ServerStateDef.Fluency 
-    and LoginManager.state ~= ServerStateDef.Congestion 
-    and LoginManager.state ~= ServerStateDef.Full then
+    if not LoginManager.IsServerStateEnterable(LoginManager.state) then
         local function reServerCallback(str)
             if str == nil then
                 return
@@ -713,10 +711,8 @@ function this.OnLoginClick()
                     ---selectServerPart
                     this.SetServerList(data)
                     -- 还是不可进状态则提示服务器维护中
-                    if LoginManager.state ~= ServerStateDef.Fluency 
-                    and LoginManager.state ~= ServerStateDef.Congestion 
-                    and LoginManager.state ~= ServerStateDef.Full then
-                        PopupTipPanel.ShowTip(Language[11142])
+                    if not LoginManager.IsServerStateEnterable(LoginManager.state) then
+                        PopupTipPanel.ShowTip("服务器还未开启哦，请道友稍后片刻，具体开服时间可见公告~")
                         RequestPanel.Hide()
                     else
                         -- 开始登录
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
index 207a1c974d..0ee461d04e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
@@ -72,7 +72,7 @@ function ServerListSelectPanel:SetServerList()
             serverItem:SetValue(serverInfo, index)
             serverItem:SetVisible(true)
             serverItem.cloneObj:GetComponent("Button").onClick:AddListener(function()
-                if serverInfo.state == ServerStateDef.Maintenance then
+                if not LoginManager.IsServerStateEnterable(serverInfo.state) then
                     PopupTipPanel.ShowTip(Language[11142])
                     return
                 end
@@ -125,6 +125,11 @@ end
 
 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])
+            return
+        end
         if self.context.callback then
             self.context.callback(self:GetServerIndex(serverId))
         end