整理代码，自定义序列新增光标右移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")}),