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 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 785eaad311..d8e7e35d2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -407,7 +407,7 @@ function this.EquipInfo() lvObj:SetActive(false) end Util.AddOnceClick(btn,function() - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,0, data.idDyn,data.id, 0, 0) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,0, data.idDyn,data.id, data.lv, data.refineLv) end) end end diff --git a/Version b/Version index f00c245980..82442bda6e 160000 --- a/Version +++ b/Version @@ -1 +1 @@ -Subproject commit f00c2459808120719deb6ddd12b0aec370052fc1 +Subproject commit 82442bda6e5e3a170edec5e95e406ca873852628