整理代码，自定义序列新增光标右移10按钮

2020-09-18 23:09:34 +08:00
parent e2d06503ad
commit 0c648a8c1e
5 changed files with 107 additions and 96 deletions
--- a/Zframework/languages.lua
+++ b/Zframework/languages.lua
@@ -220,13 +220,13 @@ local langList={
 				visible="能见度",
 				freshLimit="锁延刷新限制",
 				easyFresh="普通刷新锁延",
-				fineKill="非极简即死",
+				fineKill="强制极简",
 				opponent="对手",
 				life="命数",
 				pushSpeed="上涨速度",
 				
 				norm="←基本规则",
-				seq="序列设置(Tab)→",
+				sequence="序列设置(Tab)→",
 				back="返回",
 			},
 			custom_seq={
@@ -235,6 +235,7 @@ local langList={
 				V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",
 				left="←",
 				right="→",
+				ten="+10",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -256,6 +257,7 @@ local langList={
 				delLine="消除行(L)",
 				demo="不显示×",

+				sequence="←序列设置",
 				mission="任务设置(Tab)→",
 				back="返回",
 			},
@@ -739,13 +741,13 @@ local langList={
 				visible="能见度",
 				freshLimit="锁延刷新限制",
 				easyFresh="普通刷新锁延",
-				fineKill="非极简即死",
+				fineKill="强制极简",
 				opponent="对手",
 				life="命数",
 				pushSpeed="上涨速度",
 				
 				norm="←基本规则",
-				seq="序列设置(Tab)→",
+				sequence="序列设置(Tab)→",
 				back="返回",
 			},
 			custom_seq={
@@ -754,6 +756,7 @@ local langList={
 				V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",
 				left="←",
 				right="→",
+				ten="+10",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -775,6 +778,7 @@ local langList={
 				delLine="消除行(L)",
 				demo="不显示×",

+				sequence="←序列设置",
 				mission="任务设置(Tab)→",
 				back="返回",
 			},
@@ -1071,7 +1075,7 @@ local langList={
 		finish="Finish",
 		gameover="Game Over",
 		pause="Pause",
-		pauseCount="Pauses:",
+		pauseCount="Pauses",

 		custom="Custom Game",basic="Basic",rule="Rule",field="Custom Field",mission="Mission",
 		snapLevelName={"Free pos","Snap-10","Snap-20","Snap-40","Snap-60","Snap-80"},
@@ -1254,7 +1258,7 @@ local langList={
 				pushSpeed="Garbage Speed",

 				norm="←Basic",
-				seq="SEQ. (Tab)→",
+				sequence="SEQ. (Tab)→",
 				back="Back",
 			},
 			custom_seq={
@@ -1263,6 +1267,7 @@ local langList={
 				V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",
 				left="←",
 				right="→",
+				ten="+10",
 				backsp="<X",
 				reset="R",
 				copy="Copy",
@@ -1284,6 +1289,7 @@ local langList={
 				delLine="Del Line(L)",
 				demo="Don't show ×",

+				sequence="←Sequence",
 				mission="Mission (Tab)→",
 				back="Back",
 			},
@@ -1580,7 +1586,7 @@ local langList={
 		finish="&",
 		gameover="x",
 		pause="=",
-		pauseCount="=:",
+		pauseCount="==",

 		custom="!@#$%^&*",basic="!!",rule="##",field="!@#$%^&* [##]",mission="(!)",
 		snapLevelName={"~","10","20","40","60","80"},
@@ -1761,7 +1767,7 @@ local langList={
 				pushSpeed="_↑_↑_",

 				norm="←Basic",
-				seq="Seq (Tab)→",
+				sequence="Seq (Tab)→",
 				back="X",
 			},
 			custom_seq={
@@ -1770,6 +1776,7 @@ local langList={
 				V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",
 				left="←",
 				right="→",
+				ten="+10",
 				backsp="<X",
 				reset="R",
 				copy="→__",
@@ -1791,6 +1798,7 @@ local langList={
 				delLine="==X==(L)",
 				demo="X ×",

+				sequence="←Sequence",
 				mission="Mission (Tab)→",
 				back="X",
 			},
@@ -2276,13 +2284,13 @@ local langList={
 				visible="能见度",
 				freshLimit="锁延刷新限制",
 				easyFresh="普通刷新锁延",
-				fineKill="非极简即死",
+				fineKill="强制极简",
 				opponent="对手",
 				life="命数",
 				pushSpeed="上涨速度",

 				norm="←基本规则",
-				seq="序列设置(Tab)→",
+				sequence="序列设置(Tab)→",
 				back="返回",
 			},
 			custom_seq={
@@ -2291,6 +2299,7 @@ local langList={
 				V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",
 				left="←",
 				right="→",
+				ten="+10",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -2312,6 +2321,7 @@ local langList={
 				delLine="消除行(L)",
 				demo="不显示×",

+				sequence="←序列设置",
 				mission="任务设置(Tab)→",
 				back="返回",
 			},
--- a/Zframework/widgetList.lua
+++ b/Zframework/widgetList.lua
@@ -206,7 +206,7 @@ local Widgets={
 		newSelector({name="pushSpeed",	x=1100,	y=360,w=260,color="red",	list=CUSlist.pushSpeed,	disp=CUSval("pushSpeed"),code=CUSsto("pushSpeed")}),

 		newButton({name="norm",		x=900,	y=60,	w=220,h=80,		color="lBlue",	font=30,code=swapScene("custom_norm","swipeR")}),
-		newButton({name="seq",		x=1140,	y=60,	w=220,h=80,		color="lBlue",	font=30,code=swapScene("custom_seq","swipeL")}),
+		newButton({name="sequence",		x=1140,	y=60,	w=220,h=80,		color="lBlue",	font=30,code=swapScene("custom_seq","swipeL")}),
 		newButton({name="back",		x=1140,	y=640,	w=170,h=80,		color="white",	font=40,code=BACK}),
 	},
 	custom_seq={
@@ -239,8 +239,9 @@ local Widgets={

 		newKey({name="left",		x=800,	y=440,	w=90,			color="lGreen",	font=55,code=pressKey("left")}),
 		newKey({name="right",		x=900,	y=440,	w=90,			color="lGreen",	font=55,code=pressKey("right")}),
-		newKey({name="backsp",		x=1000,	y=440,	w=90,			color="lYellow",font=50,code=pressKey("backspace")}),
-		newKey({name="reset",		x=1000,	y=540,	w=90,			color="lYellow",font=50,code=pressKey("delete")}),
+		newKey({name="ten",			x=1000,	y=440,	w=90,			color="lGreen",	font=40,code=pressKey("ten")}),
+		newKey({name="backsp",		x=1000,	y=540,	w=90,			color="lYellow",font=50,code=pressKey("backspace")}),
+		newKey({name="reset",		x=1000,	y=640,	w=90,			color="lYellow",font=50,code=pressKey("delete")}),
 		newButton({name="copy",		x=1140,	y=440,	w=170,h=80,		color="lRed",	font=40,code=pressKey("cC"),hide=function()return #preBag==0 end}),
 		newButton({name="paste",	x=1140,	y=540,	w=170,h=80,		color="lBlue",	font=40,code=pressKey("cV")}),

@@ -278,6 +279,7 @@ local Widgets={
 		newButton({name="delLine",	x=1200,		y=520,	w=120,		color="lYellow",font=20,code=pressKey("l")}),
 		newSwitch({name="demo",		x=755,		y=640,								font=30,disp=function()return sceneTemp.demo end,code=function()sceneTemp.demo=not sceneTemp.demo end}),

+		newButton({name="sequence",		x=900,		y=60,	w=220,h=80,	color="lBlue",	font=30,code=swapScene("custom_seq","swipeR")}),
 		newButton({name="mission",		x=1140,		y=60,	w=220,h=80,	color="lBlue",	font=30,code=swapScene("custom_mission","swipeL")}),
 		newButton({name="back",		x=1140,		y=640,	w=170,h=80,	color="white",	font=40,code=BACK}),
 	},
@@ -351,9 +353,7 @@ local Widgets={
 		newButton({name="touch",	x=990,	y=220,	w=320,h=80,	color="lBlue",	font=35,code=goScene("setting_touch")}),
 		newSlider({name="reTime",	x=350,	y=340,	w=300,unit=10,				font=30,disp=SETval("reTime"),	code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}),
 		newSlider({name="maxNext",	x=350,	y=440,	w=300,unit=6,				font=30,disp=SETval("maxNext"),	code=SETsto("maxNext")}),
-		newButton({name="layout",	x=460,	y=540,	w=140,h=70,color="white",	font=35,code=function()
-			SCN.go("setting_skin")
-			end}),
+		newButton({name="layout",	x=460,	y=540,	w=140,h=70,color="white",	font=35,code=goScene("setting_skin")}),
 		newSwitch({name="autoPause",x=1080,	y=320,	font=20,disp=SETval("autoPause"),	code=SETrev("autoPause")}),
 		newSwitch({name="swap",		x=1080,	y=380,	font=20,disp=SETval("swap"),		code=SETrev("swap")}),
 		newSwitch({name="fine",		x=1080,	y=440,	font=20,disp=SETval("fine"),		code=SETrev("fine")}),
--- a/main.lua
+++ b/main.lua
@@ -74,7 +74,7 @@ customEnv={
 	missionKill=false,
 	easyFresh=true,
 	visible="show",
-	target=200,
+	target=1e99,
 	freshLimit=1e99,
 	opponent=0,
 	life=0,
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -136,6 +136,7 @@ function pasteBoard(str)
 end

 function copySequence()
+	local preBag=preBag
 	local str=""

 	for i=1,#preBag do
--- a/parts/scenes.lua
+++ b/parts/scenes.lua
@@ -1289,11 +1289,19 @@ do--custom_seq
 		z=8,s=9,t=14,j=19,l=20,i=25
 	}
 	function keyDown.custom_seq(key)
-		local s=sceneTemp
-		if type(key)=="number"then
-			local C=s.cur+1
-			ins(preBag,C,key)
-			s.cur=C
+		local S=sceneTemp
+		if key=="left"then
+			S.cur=S.cur-1
+			if S.cur==-1 then
+				S.cur=#preBag
+			end
+		elseif key=="right"then
+			S.cur=S.cur+1
+			if S.cur>#preBag then
+				S.cur=0
+			end
+		elseif key=="ten"then
+			S.cur=min(S.cur+10,#preBag)
 		elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then
 			if #preBag>0 then
 				sys.setClipboardText("Techmino SEQ:"..copySequence())
@@ -1306,47 +1314,37 @@ do--custom_seq
 			if not pasteSequence(str)then
 				LOG.print(text.dataCorrupted,color.red)
 			end
+		elseif key=="backspace"then
+			if S.cur>0 then
+				rem(preBag,S.cur)
+				S.cur=S.cur-1
+			end
+		elseif key=="delete"then
+			if S.sure>20 then
+				preBag={}
+				S.cur=0
+				S.sure=0
+				SFX.play("finesseError",.7)
+			else
+				S.sure=50
+			end
+		elseif key=="tab"then
+			if kb.isDown("lshift","rshift")then
+				SCN.swapTo("custom_rule","swipeR")
+			else
+				SCN.swapTo("custom_draw","swipeL")
+			end
+		elseif key=="escape"then
+			SCN.back()
+		elseif type(key)=="number"then
+			S.cur=S.cur+1
+			ins(preBag,S.cur,key)
 		elseif #key==1 then
 			local i=(kb.isDown("lshift","lalt","rshift","ralt")and minoKey2 or minoKey)[key]
 			if i then
-				local C=s.cur+1
+				local C=S.cur+1
 				ins(preBag,C,i)
-				s.cur=C
-			end
-		else
-			if key=="left"then
-				s.cur=s.cur-1
-				if s.cur==-1 then
-					s.cur=#preBag
-				end
-			elseif key=="right"then
-				s.cur=s.cur+1
-				if s.cur>#preBag then
-					s.cur=0
-				end
-			elseif key=="backspace"then
-				local C=s.cur
-				if C>0 then
-					rem(preBag,C)
-					s.cur=C-1
-				end
-			elseif key=="tab"then
-				if kb.isDown("lshift","rshift")then
-					SCN.swapTo("custom_rule","swipeR")
-				else
-					SCN.swapTo("custom_draw","swipeL")
-				end
-			elseif key=="escape"then
-				SCN.back()
-			elseif key=="delete"then
-				if sceneTemp.sure>20 then
-					preBag={}
-					sceneTemp.cur=0
-					sceneTemp.sure=0
-					SFX.play("finesseError",.7)
-				else
-					sceneTemp.sure=50
-				end
+				S.cur=C
 			end
 		end
 	end
@@ -1360,27 +1358,28 @@ do--custom_seq
 		gc.setColor(1,1,1)
 		gc.draw(drawableText.custom,20,5)

+		--Draw frame
 		gc.setLineWidth(4)
 		gc.rectangle("line",100,110,1080,260)
-		setFont(30)
 		local bag=preBag
-		local len=#bag

+		--Draw lenth
 		setFont(40)
-		gc.print(len,120,310)
+		gc.print(#bag,120,310)

+		--Draw sequence
 		local L=TEXTURE.miniBlock
 		local lib=SKIN.libColor
 		local set=setting.skin

-		local x,y=120,136
-		local cx,cy=120,136
-		for i=1,len do
+		local x,y=120,136--Next block pos
+		local cx,cy=120,136--Cursor-center pos
+		for i=1,#bag do
 			local B=L[bag[i]]
 			gc.setColor(lib[set[bag[i]]])
 			gc.draw(B,x,y,nil,15,15,0,B:getHeight()*.5)
 			x=x+B:getWidth()*15+10
-			if x>1126 then
+			if x>1100 then
 				x,y=120,y+50
 			end
 			if i==S.cur then
@@ -1388,13 +1387,14 @@ do--custom_seq
 			end
 		end

+		--Draw cursor
 		gc.setColor(.5,1,.5,.6+.4*sin(Timer()*6.26))
 		gc.line(cx-5,cy-20,cx-5,cy+20)

 		--Confirm reset
 		if S.sure>0 then
 			gc.setColor(1,1,1,S.sure*.02)
-			gc.draw(drawableText.question,980,470)
+			gc.draw(drawableText.question,980,570)
 		end
 	end
 end
@@ -2324,13 +2324,13 @@ do--setting_sound
 	end

 	function mouseDown.setting_sound(x,y,k)
-		local s=sceneTemp
-		if x>780 and x<980 and y>470 and s.jump==0 then
-			s.jump=10
-			local t=Timer()-s.last
+		local S=sceneTemp
+		if x>780 and x<980 and y>470 and S.jump==0 then
+			S.jump=10
+			local t=Timer()-S.last
 			if t>1 then
 				VOC.play((t<1.5 or t>15)and"doubt"or rnd()<.8 and"happy"or"egg")
-				s.last=Timer()
+				S.last=Timer()
 			end
 		end
 	end
@@ -2454,72 +2454,72 @@ do--setting_key
 	end

 	function keyDown.setting_key(key)
-		local s=sceneTemp
+		local S=sceneTemp
 		if key=="escape"then
-			if s.kS then
-				s.kS=false
+			if S.kS then
+				S.kS=false
 				SFX.play("finesseError",.5)
 			else
 				SCN.back()
 			end
-		elseif s.kS then
+		elseif S.kS then
 			for y=1,20 do
 				if keyMap[1][y]==key then keyMap[1][y]=""break end
 				if keyMap[2][y]==key then keyMap[2][y]=""break end
 			end
-			keyMap[s.board][s.kb]=key
+			keyMap[S.board][S.kb]=key
 			SFX.play("reach",.5)
-			s.kS=false
+			S.kS=false
 		elseif key=="return"or key=="space"then
-			s.kS=true
+			S.kS=true
 			SFX.play("lock",.5)
 		elseif key=="up"or key=="w"then
-			if s.kb>1 then
-				s.kb=s.kb-1
+			if S.kb>1 then
+				S.kb=S.kb-1
 				SFX.play("move",.5)
 			end
 		elseif key=="down"or key=="s"then
-			if s.kb<20 then
-				s.kb=s.kb+1
+			if S.kb<20 then
+				S.kb=S.kb+1
 				SFX.play("move",.5)
 			end
 		elseif key=="left"or key=="a"or key=="right"or key=="d"then
-			s.board=3-s.board
+			S.board=3-S.board
 			SFX.play("rotate",.5)
 		end
 	end
 	function gamepadDown.setting_key(key)
-		local s=sceneTemp
+		local S=sceneTemp
 		if key=="back"then
-			if s.jS then
-				s.jS=false
+			if S.jS then
+				S.jS=false
 				SFX.play("finesseError",.5)
 			else
 				SCN.back()
 			end
-		elseif s.jS then
+		elseif S.jS then
 			for y=1,20 do
 				if keyMap[3][y]==key then keyMap[3][y]=""break end
 				if keyMap[4][y]==key then keyMap[4][y]=""break end
 			end
-			keyMap[2+s.board][s.js]=key
+			keyMap[2+S.board][S.js]=key
 			SFX.play("reach",.5)
-			s.jS=false
+			S.jS=false
 		elseif key=="start"then
-			s.jS=true
+			S.jS=true
 			SFX.play("lock",.5)
 		elseif key=="dpup"then
-			if s.js>1 then
-				s.js=s.js-1
+			if S.js>1 then
+				S.js=S.js-1
 				SFX.play("move",.5)
 			end
 		elseif key=="dpdown"then
-			if s.js<20 then
-				s.js=s.js+1
+			if S.js<20 then
+				S.js=S.js+1
 				SFX.play("move",.5)
 			end
 		elseif key=="dpleft"or key=="dpright"then
-			s.board=3-s.board
+			S.board=3-S.board
 			SFX.play("rotate",.5)
 		end
 	end