Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
72c42eb871
|
@ -66,7 +66,7 @@ function this.Initialize()
|
||||||
else
|
else
|
||||||
local errCode = result[2]
|
local errCode = result[2]
|
||||||
if not errCode then
|
if not errCode then
|
||||||
PopupTipPanel.ShowTip("登录失败")
|
MsgPanel.ShowOne("登录失败")
|
||||||
elseif errCode == "101" then
|
elseif errCode == "101" then
|
||||||
MsgPanel.ShowOne("根据国家防沉迷相关规定,我们将不再向未成年人提供服务,敬请谅解!")
|
MsgPanel.ShowOne("根据国家防沉迷相关规定,我们将不再向未成年人提供服务,敬请谅解!")
|
||||||
end
|
end
|
||||||
|
|
|
@ -828,7 +828,7 @@ function this.OnReceiveLogin(str)
|
||||||
local json = require 'cjson'
|
local json = require 'cjson'
|
||||||
local data = json.decode(str)
|
local data = json.decode(str)
|
||||||
if data.errorCode and data.errorCode == -1 then
|
if data.errorCode and data.errorCode == -1 then
|
||||||
PopupTipPanel.ShowTip(data.reason or Language[11145])
|
MsgPanel.ShowOne(data.reason or Language[11145])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if data.uid and data.token and not LoginManager.IsLogin then
|
if data.uid and data.token and not LoginManager.IsLogin then
|
||||||
|
|
Loading…
Reference in New Issue