diff --git a/media/SFX/connect.ogg b/media/SFX/connect.ogg new file mode 100644 index 00000000..21fc7e9e Binary files /dev/null and b/media/SFX/connect.ogg differ diff --git a/media/SFX/connected.ogg b/media/SFX/connected.ogg new file mode 100644 index 00000000..a1caea7b Binary files /dev/null and b/media/SFX/connected.ogg differ diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 17e75b79..23aa926f 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -78,7 +78,6 @@ return{ getVersionFail="Update detection failed", oldVersion="Version $1 is now available!", needUpdate="Newer version required!", - noInternet="Not connected to the network", notFinished="Coming soon!", jsonError="JSON error", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 23ce73ac..f91f08fd 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -78,7 +78,6 @@ return{ getVersionFail="Echec d'obtention de la dernière version", oldVersion="La version $1 est disponible !", -- needUpdate="Newer version required!", - -- noInternet="Not connected to the network", -- notFinished="Coming soon!", jsonError="Erreur json", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 9e39bbbf..97174082 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -78,7 +78,6 @@ return{ getVersionFail="Falha ao detectar uma versão nova", oldVersion="Versão $1 esta disponível agora!", -- needUpdate="Newer version required!", - -- noInternet="Not connected to the network", -- notFinished="Coming soon!", jsonError="Json error", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 8341cad9..6969a303 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -78,7 +78,6 @@ return{ getVersionFail="Error al buscar nuevas versiones.", oldVersion="¡Está disponible la nueva versión $1!", needUpdate="¡Nueva versión requerida!", - -- noInternet="Not connected to the network", notFinished="Próximamente", jsonError="Error en Json", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 1667ef05..79756747 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -78,7 +78,6 @@ return{ getVersionFail="检测新版本失败", oldVersion="最新版本$1可以下载了!", needUpdate="请更新游戏!", - noInternet="还未连接到网络", notFinished="暂未完成,敬请期待!", jsonError="json错误", diff --git a/parts/net.lua b/parts/net.lua index c0e41ed2..8e1cf4e0 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -162,6 +162,18 @@ function NET.register(username,email,password) }) end end +function NET.tryLogin(ifAuto) + if NET.allow_online then + if WS.status('user')=='running'then + NET.getAccessToken() + elseif not ifAuto then + SCN.go('login') + end + else + TEXT.show(text.needUpdate,640,450,60,'flicker') + SFX.play('finesseError') + end +end function NET.pong(wsName,message) WS.send(wsName,type(message)=='string'and message or"",'pong') end @@ -296,12 +308,15 @@ function NET.updateWS_app() NET.allow_online=true if USER.authToken then NET.wsconn_user_token(USER.uid,USER.authToken) + else + SCN.go('login') end end if VERSION.code