From 18785583926b9cfac0c519d5f14370ce6745ea3d Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 25 Mar 2021 23:29:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E5=BE=AE=E8=B0=83=E4=B8=BB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 12 ++++++------ parts/language/lang_fr.lua | 12 ++++++------ parts/language/lang_pt.lua | 12 ++++++------ parts/language/lang_sp.lua | 12 ++++++------ parts/language/lang_symbol.lua | 12 ++++++------ parts/language/lang_zh.lua | 12 ++++++------ parts/scenes/main.lua | 28 ++++++++++++++++------------ 7 files changed, 52 insertions(+), 48 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 9e088619..97cb7c6c 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -214,15 +214,15 @@ return{ main={ offline="Single", online="Multi", - custom="Custom", - stat="Stats", - setting="Settings", qplay="Quick", - lang="言/A", - help="Help", - quit="Exit", + custom="Custom", + setting="Settings", + stat="Stats", music="Music Room", sound="SE Room", + help="Help", + lang="言/A", + quit="Exit", }, main_simple={ sprint="Sprint", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 569e08ed..dd3348fb 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -191,15 +191,15 @@ return{ main={ offline="Solo", online="Multi", - custom="Mode perso.", - stat="Statistiques", - setting="Paramètres", qplay="Partie rapide", - lang="言/A", - help="Aide", - quit="Quitter", + custom="Mode perso.", + setting="Paramètres", + stat="Statistiques", music="Salon musical", sound="Salon SE", + help="Aide", + lang="言/A", + quit="Quitter", }, mode={ mod="Mods (F1)", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 57d580d9..1d3ca40c 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -214,15 +214,15 @@ return{ main={ offline="Solo", online="Multi", - custom="Custom", - stat="Stats", - setting="Config.", qplay="Jogo R.", - lang="言/A", - help="Ajuda", - quit="Saída", + custom="Custom", + setting="Config.", + stat="Stats", music="Música", sound="SFX", + help="Ajuda", + lang="言/A", + quit="Saída", }, main_simple={ sprint="Sprint", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 3842af56..68ae90dd 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -193,15 +193,15 @@ return{ main={ -- offline="Single", -- online="Multi", - custom="Person.", - stat="Estadísticas", - setting="Opciones", qplay="P. Rápida", - lang="言/A", - help="Ayuda", - quit="Salir", + custom="Person.", + setting="Opciones", + stat="Estadísticas", music="Música", sound="Sala de SE", + help="Ayuda", + lang="言/A", + quit="Salir", }, main_simple={ sprint="Sprint", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 88d4672a..2c176d68 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -94,15 +94,15 @@ return{ main={ offline="!", online="!!!", - custom="_?!", - stat="=___", - setting="_?_", qplay="!", - lang="言/A", - help="???", - quit="X", + custom="_?!", + setting="_?_", + stat="=___", music="~~~", sound="=><=", + help="???", + lang="言/A", + quit="X", }, mode={ mod="?!?!?!(F1)", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 6e0a5be1..fd20bb1d 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -214,15 +214,15 @@ return{ main={ offline="单机游戏", online="联网游戏", - custom="自定义", - stat="统计信息", - setting="设置", qplay="快速开始", - lang="言/A", - help="帮助", - quit="退出", + custom="自定义", + setting="设置", + stat="统计信息", music="音乐室", sound="音效室", + help="帮助", + lang="言/A", + quit="退出", }, main_simple={ sprint="40行", diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index d8b3a0ee..b088f9fb 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -21,16 +21,20 @@ function scene.sceneInit() end function scene.keyDown(key) - if key=="application"then - SCN.go("dict") - elseif key=="f1"then - SCN.go("help") - elseif key=="f2"then - SCN.go("setting_game") - elseif key=="q"then + if key=="q"then loadGame(STAT.lastPlay,true) + elseif key=="p"then + SCN.go("mode") elseif key=="escape"then SCN.back() + elseif key=="application"then + SCN.go("dict") + elseif key=="f1"then + SCN.go("manual") + elseif key=="c"then + SCN.go("customGame") + elseif key=="s"then + SCN.go("setting_game") else WIDGET.keyPressed(key) end @@ -83,7 +87,7 @@ 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.newKey{name="offline", x=150,y=260,w=200,h=160,color="lRed", font=40,code=goScene"mode"}, + WIDGET.newKey{name="offline", x=150,y=260,w=200,h=160,color="lRed", font=40,code=pressKey"p"}, 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") @@ -109,14 +113,14 @@ scene.widgetList={ end 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="custom", x=370,y=440,w=200,h=160,color="white", font=40,code=pressKey"c"}, + WIDGET.newKey{name="setting", x=150,y=490,w=200,h=110,color="lOrange",font=40,code=pressKey"s"}, + WIDGET.newKey{name="stat", x=590,y=490,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}, + WIDGET.newButton{name="quit", x=795,y=660,w=170,h=80,color="dGrey", font=40,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}, } return scene \ No newline at end of file