From c28a467529af5f361e537dce91c8c9c65bd73aab Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 30 Aug 2020 00:34:51 +0800 Subject: [PATCH] =?UTF-8?q?15p=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/languages.lua | 5 +++++ Zframework/widgetList.lua | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 51dd899f..b15b0cd4 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -202,6 +202,7 @@ local langList={ reset="重新开始", color="颜色", hide="盲", + quit="退出", }, main={ play="开始", @@ -678,6 +679,7 @@ local langList={ reset="重新开始", color="颜色", hide="盲", + quit="退出", }, main={ play="开始", @@ -1144,6 +1146,7 @@ local langList={ reset="Reset", color="Color", hide="Blind", + quit="Back", }, main={ play="Play", @@ -1608,6 +1611,7 @@ local langList={ reset="Reset", color="Color", hide="Blind", + quit="X", }, main={ play="!!!", @@ -2086,6 +2090,7 @@ local langList={ reset="Reset", color="彩", hide="瞎", + quit="退出", }, main={ play="开始", diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index 8d45da13..03622c8e 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -119,9 +119,10 @@ local Widgets={ newButton({name="play", x=640,y=600,w=180,h=90, color="lGreen", font=40,code=pressKey("space"),hide=function()return not sceneTemp.pass end}), }, p15={ - newButton({name="reset", x=160,y=100,w=180,h=100,color="white", font=40,code=pressKey("space")}), - newSwitch({name="color", x=200,y=240,w=60, color="white", font=40,disp=function()return sceneTemp.color end,code=pressKey("c"),hide=function()return sceneTemp.state>0 end}), - newSwitch({name="hide", x=200,y=340,w=60, color="white", font=40,disp=function()return sceneTemp.blind end,code=pressKey("h"),hide=function()return sceneTemp.state>0 end}), + newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen", font=40,code=pressKey("space")}), + newSwitch({name="color", x=200,y=240,w=60, font=40,disp=function()return sceneTemp.color end,code=pressKey("c"),hide=function()return sceneTemp.state>0 end}), + newSwitch({name="hide", x=200,y=340,w=60, font=40,disp=function()return sceneTemp.blind end,code=pressKey("h"),hide=function()return sceneTemp.state>0 end}), + newButton({name="back", x=1100,y=100,w=100, color="white", font=40,code=BACK}), }, main={ newButton({name="play", x=150,y=280,w=200,h=160,color="lRed", font=55,code=function()SCN.go("mode")end}),