小游戏开关排版调整，使用qwer切换选项，增加舒尔特方格特效开关

2020-09-14 00:43:57 +08:00
parent 23e8739151
commit 2368b93efc
3 changed files with 36 additions and 21 deletions
--- 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={
--- 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={
--- 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