From 86c45e39f6da0e1ced5fec44b0d9eeb642f9c3f8 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 25 Mar 2021 22:01:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=8F=9C=E5=8D=95ui=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 1 + parts/language/lang_fr.lua | 1 + parts/language/lang_pt.lua | 1 + parts/language/lang_sp.lua | 1 + parts/language/lang_zh.lua | 1 + parts/scenes/main.lua | 37 ++++++++++++++++++++----------------- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 1ae5d367..9e088619 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -72,6 +72,7 @@ return{ getNoticeFail="Failed fetching announcements...", getVersionFail="Update detection failed", oldVersion="Version $1 is now available!", + notFinished="Coming soon!", httpCode="HTTP status code", jsonError="JSON error", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 6f0f3027..569e08ed 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -73,6 +73,7 @@ return{ getNoticeFail="Echec de l'obtention de la notice", getVersionFail="Echec d'obtention de la dernière version", oldVersion="La version $1 est disponible !", + -- notFinished="Coming soon!", httpCode="Code de statut Http", jsonError="Erreur json", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 935e52c5..57d580d9 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -72,6 +72,7 @@ return{ getNoticeFail="Não conseguiu ter anúncios", getVersionFail="Falha ao detectar uma versão nova", oldVersion="Versão $1 esta disponível agora!", + -- notFinished="Coming soon!", -- httpCode="Http status code", jsonError="Json error", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 1c8bc135..3842af56 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -73,6 +73,7 @@ return{ getNoticeFail="Error al buscar novedades.", getVersionFail="Error al buscar nuevas versiones.", oldVersion="¡Está disponible la nueva versión $1!", + -- notFinished="Coming soon!", -- httpCode="Http status code", -- jsonError="Json error", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index a6b3b45d..6e0a5be1 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -72,6 +72,7 @@ return{ getNoticeFail="拉取公告失败", getVersionFail="检测新版本失败", oldVersion="最新版本$1可以下载了!", + notFinished="暂未完成,敬请期待!", httpCode="Http码", jsonError="json错误", diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 242f5442..d8b3a0ee 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -61,8 +61,8 @@ function scene.draw() --Quick play setFont(30) local L=text.modes[STAT.lastPlay] - gc.print(L[1],700,210) - gc.print(L[2],700,250) + gc.print(L[1],700,250) + gc.print(L[2],700,290) --Tip gc.push("transform") @@ -81,11 +81,14 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="system", x=610,y=50,fText=SYSTEM,color="white",font=30,align="L"}, - WIDGET.newText{name="version", x=610,y=90,fText=VERSION_NAME,color="white",font=30,align="L"}, - WIDGET.newButton{name="offline",x=150,y=220,w=200,h=140,color="lRed", font=40,code=goScene"mode"}, - WIDGET.newButton{name="online", x=370,y=220,w=200,h=140,color="lCyan", font=40,code=function() - if LOGIN then + WIDGET.newText{name="system", x=610,y=50,fText=SYSTEM, color="white",font=30,align="L"}, + WIDGET.newText{name="version", x=610,y=90,fText=VERSION_NAME, color="white",font=30,align="L"}, + WIDGET.newKey{name="offline", x=150,y=260,w=200,h=160,color="lRed", font=40,code=goScene"mode"}, + WIDGET.newKey{name="online", x=370,y=260,w=200,h=160,color="lCyan", font=40,code=function() + if not LATEST_VERSION then + TEXT.show(text.notFinished,370,380,60,"flicker") + SFX.play("finesseError") + elseif LOGIN then --[[TODO if USER.accessToken then WS.send("app",JSON.encode{ @@ -104,16 +107,16 @@ scene.widgetList={ else SCN.go("login") end - end,hide=function()return not LATEST_VERSION end}, - WIDGET.newButton{name="qplay", x=590,y=220,w=200,h=140,color="lBlue", font=40,code=pressKey"q"}, - WIDGET.newButton{name="setting",x=150,y=380,w=200,h=140,color="lOrange",font=40,code=goScene"setting_game"}, - WIDGET.newButton{name="stat", x=370,y=380,w=200,h=140,color="lGreen", font=40,code=goScene"stat"}, - WIDGET.newButton{name="custom", x=590,y=380,w=200,h=140,color="white", font=40,code=goScene"customGame"}, - WIDGET.newButton{name="lang", x=150,y=515,w=200,h=90,color="lYellow", font=40,code=goScene"lang"}, - WIDGET.newButton{name="help", x=370,y=515,w=200,h=90,color="dGreen", font=40,code=goScene"help"}, - WIDGET.newButton{name="quit", x=590,y=515,w=200,h=90,color="grey", font=40,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}, - WIDGET.newKey{name="music", x=150,y=610,w=200,h=60,color="red", code=goScene"music"}, - WIDGET.newKey{name="sound", x=590,y=610,w=200,h=60,color="grape", code=goScene"sound"}, + end}, + WIDGET.newKey{name="qplay", x=590,y=260,w=200,h=160,color="lBlue", font=40,code=pressKey"q"}, + WIDGET.newKey{name="setting", x=150,y=480,w=200,h=110,color="lOrange",font=40,code=goScene"setting_game"}, + WIDGET.newKey{name="custom", x=370,y=455,w=200,h=160,color="white", font=40,code=goScene"customGame"}, + WIDGET.newKey{name="stat", x=590,y=480,w=200,h=110,color="lGreen", font=40,code=goScene"stat"}, + WIDGET.newKey{name="music", x=150,y=600,w=200,h=60,color="red", code=goScene"music"}, + WIDGET.newKey{name="sound", x=370,y=600,w=200,h=60,color="grape", code=goScene"sound"}, + WIDGET.newKey{name="help", x=590,y=600,w=200,h=60,color="blue", code=goScene"help"}, + WIDGET.newButton{name="lang", x=795,y=560,w=170,h=80,color="white", font=40,code=goScene"lang"}, + WIDGET.newButton{name="quit", x=795,y=660,w=170,h=80,color="grey", font=40,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}, } return scene \ No newline at end of file