From 2368b93efc2f2980c1acec23694c2d4ec530bf26 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 14 Sep 2020 00:43:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=B8=B8=E6=88=8F=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E6=8E=92=E7=89=88=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?qwer=E5=88=87=E6=8D=A2=E9=80=89=E9=A1=B9=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=88=92=E5=B0=94=E7=89=B9=E6=96=B9=E6=A0=BC=E7=89=B9?= =?UTF-8?q?=E6=95=88=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/languages.lua | 5 +++++ Zframework/widgetList.lua | 15 ++++++++------- parts/scenes.lua | 37 +++++++++++++++++++++++-------------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/Zframework/languages.lua b/Zframework/languages.lua index d833a1a6..0188f5f0 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -395,6 +395,7 @@ local langList={ rank="尺寸", blind="盲打", disappear="消失", + tapFX="点击动画", back="返回", }, help={ @@ -892,6 +893,7 @@ local langList={ rank="尺寸", blind="盲打", disappear="消失", + tapFX="点击动画", back="返回", }, help={ @@ -1379,6 +1381,7 @@ local langList={ rank="Size", blind="Blind", disappear="Hide", + tapFX="tap FX", back="Back", }, help={ @@ -1864,6 +1867,7 @@ local langList={ rank="←?→", blind="???", disappear="=X=", + tapFX="↓ !", back="X", }, help={ @@ -2363,6 +2367,7 @@ local langList={ rank="尺寸", blind="盲", disappear="消失", + tapFX="动画", back="返回", }, help={ diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index 63f01b14..d738846f 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -474,17 +474,18 @@ 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)if sceneTemp.state~=1 then sceneTemp.color=v end end,hide=function()return sceneTemp.state==1 end}), - newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=function()return sceneTemp.blind end,code=pressKey("b"),hide=function()return sceneTemp.state==1 end}), - newSwitch({name="slide", x=240,y=420,w=60, font=40,disp=function()return sceneTemp.slide end,code=pressKey("s"),hide=function()return sceneTemp.state==1 end}), - newSwitch({name="pathVis", x=240,y=510,w=60, font=40,disp=function()return sceneTemp.pathVis end,code=pressKey("p"),hide=function()return sceneTemp.state==1 or not sceneTemp.slide end}), - newSwitch({name="revKB", x=240,y=600,w=60, font=40,disp=function()return sceneTemp.revKB end,code=pressKey("r"),hide=function()return sceneTemp.state==1 end}), + newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=function()return sceneTemp.blind end,code=pressKey("w"), hide=function()return sceneTemp.state==1 end}), + newSwitch({name="slide", x=240,y=420,w=60, font=40,disp=function()return sceneTemp.slide end,code=pressKey("e"), hide=function()return sceneTemp.state==1 end}), + newSwitch({name="pathVis", x=240,y=510,w=60, font=40,disp=function()return sceneTemp.pathVis end,code=pressKey("r"), hide=function()return sceneTemp.state==1 or not sceneTemp.slide end}), + newSwitch({name="revKB", x=240,y=600,w=60, font=40,disp=function()return sceneTemp.revKB end,code=pressKey("t"), hide=function()return sceneTemp.state==1 end}), newButton({name="back", x=1140,y=640,w=180,h=80,color="white", font=35,code=BACK}), }, schulte_G={ newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen", font=40,code=pressKey("r"),hide=function()return sceneTemp.state==0 end}), - newSlider({name="rank", x=130,y=250,w=150,unit=3,show=false, font=40,disp=function()return sceneTemp.rank-3 end,code=function(v)sceneTemp.rank=v+3 end,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==1 end}), - newSwitch({name="disappear",x=200,y=410,w=60, font=40,disp=function()return sceneTemp.disappear end,code=pressKey("d"),hide=function()return sceneTemp.state==1 end}), + newSlider({name="rank", x=130,y=250,w=150,unit=3,show=false, font=40,disp=function()return sceneTemp.rank-3 end, code=function(v)sceneTemp.rank=v+3 end,hide=function()return sceneTemp.state>0 end}), + newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=function()return sceneTemp.blind end, code=pressKey("q"),hide=function()return sceneTemp.state==1 end}), + newSwitch({name="disappear",x=240,y=420,w=60, font=40,disp=function()return sceneTemp.disappear end, code=pressKey("w"),hide=function()return sceneTemp.state==1 end}), + newSwitch({name="tapFX", x=240,y=510,w=60, font=40,disp=function()return sceneTemp.tapFX end, code=pressKey("e"),hide=function()return sceneTemp.state==1 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 6f14eae2..f8d51fdc 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -288,28 +288,28 @@ do--p15 S.state=0 S.time=0 S.move=0 - elseif k=="c"then + elseif k=="q"then if S.state~=1 then S.color=(S.color+1)%5 end - elseif k=="r"then + elseif k=="w"then if S.state==0 then - S.revKB=not S.revKB + S.blind=not S.blind end - elseif k=="s"then + elseif k=="e"then if S.state==0 then S.slide=not S.slide if not S.slide then S.pathVis=false end end - elseif k=="p"then + elseif k=="r"then if S.state==0 and S.slide then S.pathVis=not S.pathVis end - elseif k=="b"then + elseif k=="t"then if S.state==0 then - S.blind=not S.blind + S.revKB=not S.revKB end elseif k=="escape"then SCN.back() @@ -414,7 +414,7 @@ do--p15 if S.state==2 then --Draw no-setting area gc.setColor(1,0,0,.3) - gc.rectangle("fill",15,300,285,330) + gc.rectangle("fill",15,295,285,340) gc.setColor(.9,.9,0)--win elseif S.state==1 then @@ -465,6 +465,7 @@ do--schulte_G rank=3, blind=false, disappear=false, + tapFX=true, startTime=0, time=0, @@ -506,11 +507,15 @@ do--schulte_G S.state=2 SFX.play("reach") end - sysFX.newShade(.3,.6,.8,1,320+640/R*X,40+640/R*Y,640/R,640/R) + if S.tapFX then + sysFX.newShade(.3,.6,.8,1,320+640/R*X,40+640/R*Y,640/R,640/R) + end else SFX.play("finesseError") S.error=S.error+1 - sysFX.newShade(.5,1,.4,.5,320+640/R*X,40+640/R*Y,640/R,640/R) + if S.tapFX then + sysFX.newShade(.5,1,.4,.5,320+640/R*X,40+640/R*Y,640/R,640/R) + end end end end @@ -533,15 +538,19 @@ do--schulte_G S.progress=0 end elseif key=="z"or key=="x"then - tapBoard(ms.getPosition()) - elseif key=="b"then + love.mousepressed(ms.getPosition()) + elseif key=="q"then if S.state==0 then S.blind=not S.blind end - elseif key=="d"then + elseif key=="w"then if S.state==0 then S.disappear=not S.disappear end + elseif key=="e"then + if S.state==0 then + S.tapFX=not S.tapFX + end elseif key=="3"or key=="4"or key=="5"or key=="6"then if S.state==0 then S.rank=tonumber(key) @@ -573,7 +582,7 @@ do--schulte_G if S.state==2 then --Draw no-setting area gc.setColor(1,0,0,.3) - gc.rectangle("fill",60,295,200,150) + gc.rectangle("fill",15,295,285,250) gc.setColor(.9,.9,0)--win elseif S.state==1 then