自定义场地布局修改

2020-11-04 23:42:37 +08:00
parent 2f975686cb
commit 3b9d30be76
6 changed files with 45 additions and 38 deletions
--- a/LANG/lang_en.lua
+++ b/LANG/lang_en.lua
@@ -358,17 +358,19 @@ return{
 			b17="[  ]",
 			any="Erase",
 			space="×",
+
+			pushLine="Add Line(K)",
+			delLine="Del Line(L)",
+
 			copy="Copy",
 			paste="Paste",
 			clear="Clear",
+			demo="Don't Show ×",

 			newPage="New Page(N)",
 			delPage="Del Page(M)",
 			prevPage="Prev Page",
 			nextPage="Next Page",
-			pushLine="Add Line(K)",
-			delLine="Del Line(L)",
-			demo="Don't Show ×",
 		},
 		custom_sequence={
 			title="Custom Game",
--- a/LANG/lang_fr.lua
+++ b/LANG/lang_fr.lua
@@ -283,7 +283,7 @@ return{
 		},
 		setting_touchSwitch={
 			b1=	"Déplacement vers la gauche :",b2="Déplacement vers la droite:",
-			b3="Rotation vers la droite :",	b4="Rotation vers la gauche :",
+			b3="Rotation vers la droite :",b4="Rotation vers la gauche :",
 			b5=	"180° :",b6="Chute instantanée :",b7="Chute rapide :",b8="Réserve :",
 			b9=	"Fonction :",b10="Redémarrer :",
 			b11="Déplacement instantané vers la gauche :",b12="Déplacement instantané vers la droite :",
@@ -357,20 +357,21 @@ return{
 			title="Mode personnalisé",
 			subTitle="Matrice",

-			b12="[  ]",
+			b17="[  ]",
 			any="Effacer",
 			space="×",
+			pushLine="Ajouter ligne (K)",
+			delLine="Supprimer ligne (L)",
+
 			copy="Copier",
 			paste="Coller",
 			clear="Nettoyer",
+			demo="Masquer les ×",

 			-- newPage="New Page(N)",
 			-- delPage="Del Page(M)",
 			-- prevPage="Prev Page",
 			-- nextPage="Next Page",
-			pushLine="Ajouter ligne (K)",
-			delLine="Supprimer ligne (L)",
-			demo="Masquer les ×",
 		},
 		custom_sequence={
 			title="Mode personnalisée",
--- a/LANG/lang_sp.lua
+++ b/LANG/lang_sp.lua
@@ -282,11 +282,11 @@ return{
 			size="Tamaño",
 		},
 		setting_touchSwitch={
-			b1=	"Mover Izq.:",	b2="Mover Der.:",		b3="Rotar Der.:",	b4="Rotar Izq.:",
-			b5=	"Rotar 180°:",b6="Caída Inst.:",		b7="Caída Ráp.:",			b8="Reserva:",
-			b9=	"Función:",	b10="Reiniciar:",b11="Izq. Instant.:",		b12="Der. Instant.:",
-			b13="Sonic Drop:",b14="Abajo 1:",b15="Abajo 4:",	b16="Abajo 10:",
-			b17="Soltar a Izq.:",b18="Soltar a Der.:",b19="Zangi a Izq.:",	b20="Zangi a Der.:",
+			b1=	"Mover Izq.:",b2="Mover Der.:",b3="Rotar Der.:",b4="Rotar Izq.:",
+			b5=	"Rotar 180°:",b6="Caída Inst.:",b7="Caída Ráp.:",b8="Reserva:",
+			b9=	"Función:",b10="Reiniciar:",b11="Izq. Instant.:",b12="Der. Instant.:",
+			b13="Sonic Drop:",b14="Abajo 1:",b15="Abajo 4:",b16="Abajo 10:",
+			b17="Soltar a Izq.:",b18="Soltar a Der.:",b19="Zangi a Izq.:",b20="Zangi a Der.:",
 			norm="Normal",
 			pro="Profesional",
 			hide="Mostrar Tec. Virtual",
@@ -356,20 +356,21 @@ return{

 			subTitle="Tablero",

-			b12="[  ]",
+			b17="[  ]",
 			any="Borrar",
 			space="×",
+			pushLine="Añadir Línea (K)",
+			delLine="Borrar Línea (L)",
+
 			copy="Copiar",
 			paste="Pegar",
 			clear="Limpiar",
+			demo="No Mostrar X",

 			-- newPage="New Page(N)",
 			-- delPage="Del Page(M)",
 			-- prevPage="Prev Page",
 			-- nextPage="Next Page",
-			pushLine="Añadir Línea (K)",
-			delLine="Borrar Línea (L)",
-			demo="No Mostrar X",
 		},
 		custom_sequence={
 			title="Juego Personalizado",
--- a/LANG/lang_symbol.lua
+++ b/LANG/lang_symbol.lua
@@ -310,17 +310,18 @@ return{
 			b17="[  ]",
 			any="_",
 			space="×",
+			pushLine="↑↑↑↑↑(K)",
+			delLine="==X==(L)",
+
 			copy="→__",
 			paste="__→",
 			clear="XXX",
+			demo="X ×",

 			newPage="+[_](N)",
 			delPage="x[_](M)",
 			prevPage="←[_]",
 			nextPage="[_]→",
-			pushLine="↑↑↑↑↑(K)",
-			delLine="==X==(L)",
-			demo="X ×",
 		},
 		custom_sequence={
 			title="!@#$%^&*",
--- a/LANG/lang_zh.lua
+++ b/LANG/lang_zh.lua
@@ -360,17 +360,18 @@ return{
 			b17="[  ]",
 			any="不定",
 			space="×",
+			pushLine="增加一行(K)",
+			delLine="消除行(L)",
+
 			copy="复制",
 			paste="粘贴",
 			clear="清除",
+			demo="不显示×",

 			newPage="新页面(N)",
 			delPage="删除页面(M)",
 			prevPage="上一页面",
 			nextPage="下一页面",
-			pushLine="增加一行(K)",
-			delLine="消除行(L)",
-			demo="不显示×",
 		},
 		custom_sequence={
 			title="自定义游戏",
--- a/parts/scenes/custom_field.lua
+++ b/parts/scenes/custom_field.lua
@@ -193,21 +193,21 @@ function Pnt.custom_field()

 	--Draw page
 	setFont(55)
-	mStr(S.page,100,510)
+	mStr(S.page,100,530)
 	mStr(#FIELD,100,600)
-	gc.rectangle("fill",50,590,100,6)
+	gc.rectangle("fill",50,600,100,6)

 	--Draw pen color
 	local pen=S.pen
 	if pen>0 then
 		gc.setLineWidth(13)
 		gc.setColor(SKIN.libColor[pen])
-		gc.rectangle("line",545,495,70,70)
+		gc.rectangle("line",565,495,70,70)
 	elseif pen==-1 then
 		gc.setLineWidth(5)
 		gc.setColor(.9,.9,.9)
-		gc.line(555,505,605,555)
-		gc.line(555,555,605,505)
+		gc.line(575,505,625,555)
+		gc.line(575,555,625,505)
 	end

 	--Confirm reset
@@ -264,17 +264,18 @@ WIDGET.init("custom_field",{

 	WIDGET.newButton({name="any",		x=600,	y=400,w=120,color="lGrey",	font=40,code=setPen(0)}),
 	WIDGET.newButton({name="space",		x=730,	y=400,w=120,color="grey",	font=65,code=setPen(-1)}),
-	WIDGET.newButton({name="copy",		x=905,	y=400,w=120,color="lRed",	font=35,code=WIDGET.lnk.pressKey("cC")}),
-	WIDGET.newButton({name="paste",		x=1035,	y=400,w=120,color="lBlue",	font=35,code=WIDGET.lnk.pressKey("cV")}),
-	WIDGET.newButton({name="clear",		x=1165,	y=400,w=120,color="white",	font=40,code=WIDGET.lnk.pressKey("delete")}),
+	WIDGET.newButton({name="pushLine",	x=990,	y=400,w=120,h=120,color="lYellow",font=20,code=WIDGET.lnk.pressKey("k")}),
+	WIDGET.newButton({name="delLine",	x=1120,	y=400,w=120,h=120,color="lYellow",font=20,code=WIDGET.lnk.pressKey("l")}),

-	WIDGET.newButton({name="newPage",	x=680,	y=530,w=90,h=90,color="sky",font=15,code=WIDGET.lnk.pressKey("n")}),
-	WIDGET.newButton({name="delPage",	x=780,	y=530,w=90,h=90,color="lRed",font=15,code=WIDGET.lnk.pressKey("m")}),
-	WIDGET.newButton({name="prevPage",	x=880,	y=530,w=90,h=90,color="lGreen",font=15,code=WIDGET.lnk.pressKey("sTab"),hide=WIDGET.lnk.STPeq("page",1)}),
-	WIDGET.newButton({name="nextPage",	x=980,	y=530,w=90,h=90,color="lGreen",font=15,code=WIDGET.lnk.pressKey("tab"),hide=function()return sceneTemp.page==#FIELD end}),
-	WIDGET.newButton({name="pushLine",	x=1080,	y=530,w=90,h=90,color="lYellow",font=20,code=WIDGET.lnk.pressKey("k")}),
-	WIDGET.newButton({name="delLine",	x=1180,	y=530,w=90,h=90,color="lYellow",font=20,code=WIDGET.lnk.pressKey("l")}),
-	WIDGET.newSwitch({name="demo",		x=755,	y=640,	disp=WIDGET.lnk.STPval("demo"),code=WIDGET.lnk.STPrev("demo")}),
+	WIDGET.newButton({name="copy",		x=730,	y=530,w=120,color="lRed",	font=35,code=WIDGET.lnk.pressKey("cC")}),
+	WIDGET.newButton({name="paste",		x=860,	y=530,w=120,color="lBlue",	font=35,code=WIDGET.lnk.pressKey("cV")}),
+	WIDGET.newButton({name="clear",		x=990,	y=530,w=120,color="white",	font=40,code=WIDGET.lnk.pressKey("delete")}),
+	WIDGET.newSwitch({name="demo",		x=755,	y=640,disp=WIDGET.lnk.STPval("demo"),code=WIDGET.lnk.STPrev("demo")}),
+
+	WIDGET.newButton({name="newPage",	x=100,	y=110,w=160,h=110,color="sky",font=20,code=WIDGET.lnk.pressKey("n")}),
+	WIDGET.newButton({name="delPage",	x=100,	y=230,w=160,h=110,color="lRed",font=20,code=WIDGET.lnk.pressKey("m")}),
+	WIDGET.newButton({name="prevPage",	x=100,	y=350,w=160,h=110,color="lGreen",font=20,code=WIDGET.lnk.pressKey("sTab"),hide=WIDGET.lnk.STPeq("page",1)}),
+	WIDGET.newButton({name="nextPage",	x=100,	y=470,w=160,h=110,color="lGreen",font=20,code=WIDGET.lnk.pressKey("tab"),hide=function()return sceneTemp.page==#FIELD end}),

 	WIDGET.newButton({name="back",		x=1140,	y=640,	w=170,h=80,font=40,code=WIDGET.lnk.BACK}),
 })