Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-08-09 16:14:35 +08:00
commit cef09d39d8
5 changed files with 23 additions and 10 deletions

View File

@ -204,5 +204,17 @@ function this:SendGetHttp(url, callback, _, _, failCB)
end, nil, nil, failCB) end, nil, nil, failCB)
end 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 return this

View File

@ -699,9 +699,7 @@ function this.OnLoginClick()
return return
end end
-- 只要不是流畅,拥挤,爆满状态就不让登录 -- 只要不是流畅,拥挤,爆满状态就不让登录
if LoginManager.state ~= ServerStateDef.Fluency if not LoginManager.IsServerStateEnterable(LoginManager.state) then
and LoginManager.state ~= ServerStateDef.Congestion
and LoginManager.state ~= ServerStateDef.Full then
local function reServerCallback(str) local function reServerCallback(str)
if str == nil then if str == nil then
return return
@ -713,10 +711,8 @@ function this.OnLoginClick()
---selectServerPart ---selectServerPart
this.SetServerList(data) this.SetServerList(data)
-- 还是不可进状态则提示服务器维护中 -- 还是不可进状态则提示服务器维护中
if LoginManager.state ~= ServerStateDef.Fluency if not LoginManager.IsServerStateEnterable(LoginManager.state) then
and LoginManager.state ~= ServerStateDef.Congestion PopupTipPanel.ShowTip("服务器还未开启哦,请道友稍后片刻,具体开服时间可见公告~")
and LoginManager.state ~= ServerStateDef.Full then
PopupTipPanel.ShowTip(Language[11142])
RequestPanel.Hide() RequestPanel.Hide()
else else
-- 开始登录 -- 开始登录

View File

@ -72,7 +72,7 @@ function ServerListSelectPanel:SetServerList()
serverItem:SetValue(serverInfo, index) serverItem:SetValue(serverInfo, index)
serverItem:SetVisible(true) serverItem:SetVisible(true)
serverItem.cloneObj:GetComponent("Button").onClick:AddListener(function() serverItem.cloneObj:GetComponent("Button").onClick:AddListener(function()
if serverInfo.state == ServerStateDef.Maintenance then if not LoginManager.IsServerStateEnterable(serverInfo.state) then
PopupTipPanel.ShowTip(Language[11142]) PopupTipPanel.ShowTip(Language[11142])
return return
end end
@ -125,6 +125,11 @@ end
function ServerListSelectPanel:QuickSeverClicked(gameObject, serverId) function ServerListSelectPanel:QuickSeverClicked(gameObject, serverId)
Util.AddOnceClick(gameObject, function() 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 if self.context.callback then
self.context.callback(self:GetServerIndex(serverId)) self.context.callback(self:GetServerIndex(serverId))
end end

View File

@ -407,7 +407,7 @@ function this.EquipInfo()
lvObj:SetActive(false) lvObj:SetActive(false)
end end
Util.AddOnceClick(btn,function() 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 end
end end

@ -1 +1 @@
Subproject commit f00c2459808120719deb6ddd12b0aec370052fc1 Subproject commit 82442bda6e5e3a170edec5e95e406ca873852628