From e47e0e1c78d9d64799fd16cdd9af1cda0405f960 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 6 Sep 2020 21:22:43 +0800 Subject: [PATCH] =?UTF-8?q?15p=E5=8F=AF=E5=85=B3=E9=97=AD=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E8=BD=A8=E8=BF=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/languages.lua | 5 +++++ Zframework/widgetList.lua | 7 ++++--- parts/scenes.lua | 13 +++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 8bb93639..2de8af54 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -380,6 +380,7 @@ local langList={ color="颜色", blind="盲打", slide="滑动操作", + pathVis="路径显示", revKB="键盘反向", back="返回", }, @@ -863,6 +864,7 @@ local langList={ color="颜色", blind="盲打", slide="滑动操作", + pathVis="路径显示", revKB="键盘反向", back="返回", }, @@ -1336,6 +1338,7 @@ local langList={ color="Color", blind="Blind", slide="Slide", + pathVis="Path show", revKB="Reverse", back="Back", }, @@ -1807,6 +1810,7 @@ local langList={ color="~~~", blind="???", slide="~_~", + pathVis="--==>", revKB="Reverse", back="X", }, @@ -2292,6 +2296,7 @@ local langList={ color="彩", blind="盲", slide="滑动", + pathVis="路径显示", revKB="键盘反向", back="返回", }, diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index b1551bc4..b312592a 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -469,9 +469,10 @@ local Widgets={ p15={ newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen", font=40,code=pressKey("space")}), newSlider({name="color", x=110,y=250,w=170,unit=4,show=false, font=30,disp=function()return sceneTemp.color end,code=function(v)sceneTemp.color=v end,hide=function()return sceneTemp.state<2 end}), - newSwitch({name="blind", x=200,y=350,w=60, font=40,disp=function()return sceneTemp.blind end,code=pressKey("b"),hide=function()return sceneTemp.state>0 end}), - newSwitch({name="slide", x=200,y=450,w=60, font=40,disp=function()return sceneTemp.slide end,code=pressKey("s"),hide=function()return sceneTemp.state>0 end}), - newSwitch({name="revKB", x=200,y=550,w=60, font=40,disp=function()return sceneTemp.revKB end,code=pressKey("r"),hide=function()return sceneTemp.state>0 end}), + newSwitch({name="blind", x=200,y=330,w=60, font=40,disp=function()return sceneTemp.blind end,code=pressKey("b"),hide=function()return sceneTemp.state>0 end}), + newSwitch({name="slide", x=200,y=420,w=60, font=40,disp=function()return sceneTemp.slide end,code=pressKey("s"),hide=function()return sceneTemp.state>0 end}), + newSwitch({name="pathVis", x=200,y=510,w=60, font=40,disp=function()return sceneTemp.pathVis end,code=pressKey("p"),hide=function()return sceneTemp.state>0 and sceneTemp.slide end}), + newSwitch({name="revKB", x=200,y=600,w=60, font=40,disp=function()return sceneTemp.revKB end,code=pressKey("r"),hide=function()return sceneTemp.state>0 end}), newButton({name="back", x=1140,y=640,w=180,h=80,color="white", font=35,code=BACK}), }, help={ diff --git a/parts/scenes.lua b/parts/scenes.lua index fcd3f212..5bb33a36 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -143,7 +143,7 @@ do--calculator end end do--minigame - function sceneInit.p15() + function sceneInit.minigame() BG.set("space") BGM.play() end @@ -163,6 +163,7 @@ do--p15 color=2, blind=false, slide=true, + pathVis=true, revKB=false, } end @@ -213,7 +214,9 @@ do--p15 local S=sceneTemp if S.state<2 then if not key then - sysFX.newRipple(.16,x,y,10) + if S.pathVis then + sysFX.newRipple(.16,x,y,10) + end x,y=int((x-320)/160)+1,int((y-40)/160)+1 end local b=S.board @@ -295,6 +298,12 @@ do--p15 if S.state==0 then S.slide=not S.slide end + elseif k=="p"then + if S.state==0 then + if S.slide then + S.pathVis=not S.pathVis + end + end elseif k=="b"then if S.state==0 then S.blind=not S.blind