From 8762e38ae88507c35ba1f9ef47541e71f880b578 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 9 Aug 2021 10:34:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90Version=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version b/Version index f00c245980..82442bda6e 160000 --- a/Version +++ b/Version @@ -1 +1 @@ -Subproject commit f00c2459808120719deb6ddd12b0aec370052fc1 +Subproject commit 82442bda6e5e3a170edec5e95e406ca873852628 From ac8927f4e65138aab40f9374dc9961d8fd6c50fa Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 9 Aug 2021 14:10:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=EF=BC=8C=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E7=9A=84=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 From c957a96983e41b1d98e8414d128c4938cf386c5a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 9 Aug 2021 14:48:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E7=8E=A9=E5=AE=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E7=8E=A9=E5=AE=B6=E4=BF=A1=E6=81=AF=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E7=A5=9E=E5=B0=86?= =?UTF-8?q?=E4=BD=A9=E6=88=B4=E5=AE=9D=E7=89=A9=E7=9A=84=E5=BC=BA=E5=8C=96?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=92=8C=E7=B2=BE=E7=82=BC=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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