From bfac67fa87da646eaf7355a2752180c02f191206 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 21 Dec 2020 18:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BA=8F=E5=88=97ui?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E6=94=AF=E6=8C=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=841~3=E8=BF=9E=E5=9D=97=E5=92=8C=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=80=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/language/lang_en.lua       | 15 ++-----
 parts/language/lang_zh.lua       | 15 ++-----
 parts/scenes/custom_sequence.lua | 73 +++++++++++++++++---------------
 3 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index 81fd1f8e..ab78a82f 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -442,17 +442,10 @@ return{
 
 			sequence="Sequence",
 
-			Z="Z",S="S",J="J",L="L",T="T",O="O",I="I",
-			Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U",
-			V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",
-			I3="I3",C="C",I2="I2",O1="O1",
-			left="←",
-			right="→",
-			ten="→→",
-			backsp="<X",
-			reset="R",
-			copy="Copy",
-			paste="Paste",
+			Z="Z",S="S",J="J",L="L",T="T",O="O",I="I",left="←",right="→",ten="→→",backsp="<X",reset="R",
+			Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U",I3="I3",C="C",rnd="R",
+			V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",I2="I2",O1="O1",
+			copy="Copy",paste="Paste",
 		},
 		custom_mission={
 			title="Custom Game",
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index bc944d2a..cef11ddb 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -443,17 +443,10 @@ return{
 
 			sequence="序列",
 
-			Z="Z",S="S",J="J",L="L",T="T",O="O",I="I",
-			Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U",
-			V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",
-			I3="I3",C="C",I2="I2",O1="O1",
-			left="←",
-			right="→",
-			ten="→→",
-			backsp="<X",
-			reset="R",
-			copy="复制",
-			paste="粘贴",
+			Z="Z",S="S",J="J",L="L",T="T",O="O",I="I",left="←",right="→",ten="→→",backsp="<X",reset="R",
+			Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U",I3="I3",C="C",rnd="R",
+			V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5",I2="I2",O1="O1",
+			copy="复制",paste="粘贴",
 		},
 		custom_mission={
 			title="自定义游戏",
diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua
index 8e43a1bf..4765650c 100644
--- a/parts/scenes/custom_sequence.lua
+++ b/parts/scenes/custom_sequence.lua
@@ -20,10 +20,11 @@ local minoKey={
 	z=1,s=2,j=3,l=4,t=5,o=6,i=7,
 	p=10,q=11,f=12,e=13,u=15,
 	v=16,w=17,x=18,r=21,y=22,n=23,h=24,
+	["/"]=26,c=27,[","]=27,["'"]=27,["-"]=28,[";"]=28,["."]=29,
 }
 local minoKey2={
 	["1"]=8,["2"]=9,["3"]=19,["4"]=20,["5"]=14,["7"]=25,
-	z=8,s=9,t=14,j=19,l=20,i=25
+	z=8,s=9,t=14,j=19,l=20,i=25,["-"]=26,o=29,
 }
 function scene.keyDown(key)
 	if key=="left"then
@@ -194,41 +195,47 @@ scene.widgetList={
 		code=WIDGET.lnk_CUSsto("sequence")
 	},
 
-	WIDGET.newKey{name="Z",		x=100,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(1)},
-	WIDGET.newKey{name="S",		x=200,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(2)},
-	WIDGET.newKey{name="J",		x=300,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(3)},
-	WIDGET.newKey{name="L",		x=400,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(4)},
-	WIDGET.newKey{name="T",		x=500,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(5)},
-	WIDGET.newKey{name="O",		x=600,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(6)},
-	WIDGET.newKey{name="I",		x=700,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(7)},
+	WIDGET.newKey{name="Z",		x=120,y=460,w=80,font=50,code=WIDGET.lnk_pressKey(1)},
+	WIDGET.newKey{name="S",		x=200,y=460,w=80,font=50,code=WIDGET.lnk_pressKey(2)},
+	WIDGET.newKey{name="J",		x=280,y=460,w=80,font=50,code=WIDGET.lnk_pressKey(3)},
+	WIDGET.newKey{name="L",		x=360,y=460,w=80,font=50,code=WIDGET.lnk_pressKey(4)},
+	WIDGET.newKey{name="T",		x=440,y=460,w=80,font=50,code=WIDGET.lnk_pressKey(5)},
+	WIDGET.newKey{name="O",		x=520,y=460,w=80,font=50,code=WIDGET.lnk_pressKey(6)},
+	WIDGET.newKey{name="I",		x=600,y=460,w=80,font=50,code=WIDGET.lnk_pressKey(7)},
+	WIDGET.newKey{name="left",	x=680,y=460,w=80,color="lGreen",font=55,code=WIDGET.lnk_pressKey("left")},
+	WIDGET.newKey{name="right",	x=760,y=460,w=80,color="lGreen",font=55,code=WIDGET.lnk_pressKey("right")},
+	WIDGET.newKey{name="ten",	x=840,y=460,w=80,color="lGreen",font=40,code=WIDGET.lnk_pressKey("ten")},
+	WIDGET.newKey{name="backsp",x=920,y=460,w=80,color="lYellow",font=50,code=WIDGET.lnk_pressKey("backspace")},
+	WIDGET.newKey{name="reset",	x=1000,y=460,w=80,color="lYellow",font=50,code=WIDGET.lnk_pressKey("delete")},
 
-	WIDGET.newKey{name="Z5",	x=100,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(8)},
-	WIDGET.newKey{name="S5",	x=200,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(9)},
-	WIDGET.newKey{name="P",		x=300,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(10)},
-	WIDGET.newKey{name="Q",		x=400,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(11)},
-	WIDGET.newKey{name="F",		x=500,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(12)},
-	WIDGET.newKey{name="E",		x=600,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(13)},
-	WIDGET.newKey{name="T5",	x=700,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(14)},
-	WIDGET.newKey{name="U",		x=800,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(15)},
-	WIDGET.newKey{name="V",		x=900,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(16)},
-	WIDGET.newKey{name="W",		x=100,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(17)},
-	WIDGET.newKey{name="X",		x=200,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(18)},
-	WIDGET.newKey{name="J5",	x=300,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(19)},
-	WIDGET.newKey{name="L5",	x=400,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(20)},
-	WIDGET.newKey{name="R",		x=500,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(21)},
-	WIDGET.newKey{name="Y",		x=600,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(22)},
-	WIDGET.newKey{name="N",		x=700,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(23)},
-	WIDGET.newKey{name="H",		x=800,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(24)},
-	WIDGET.newKey{name="I5",	x=900,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(25)},
+	WIDGET.newKey{name="Z5",	x=120,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(8)},
+	WIDGET.newKey{name="S5",	x=200,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(9)},
+	WIDGET.newKey{name="P",		x=280,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(10)},
+	WIDGET.newKey{name="Q",		x=360,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(11)},
+	WIDGET.newKey{name="F",		x=440,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(12)},
+	WIDGET.newKey{name="E",		x=520,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(13)},
+	WIDGET.newKey{name="T5",	x=600,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(14)},
+	WIDGET.newKey{name="U",		x=680,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(15)},
+	WIDGET.newKey{name="V",		x=760,y=540,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(16)},
+	WIDGET.newKey{name="I3",	x=840,y=540,w=80,color="grey",font=50,code=WIDGET.lnk_pressKey(26)},
+	WIDGET.newKey{name="C",		x=920,y=540,w=80,color="grey",font=50,code=WIDGET.lnk_pressKey(27)},
+	WIDGET.newKey{name="rnd",	x=1000,y=540,w=80,color="red",font=50,code=WIDGET.lnk_pressKey("=")},
 
-	WIDGET.newKey{name="left",		x=800,	y=440,w=90,		color="lGreen",	font=55,code=WIDGET.lnk_pressKey("left")},
-	WIDGET.newKey{name="right",		x=900,	y=440,w=90,		color="lGreen",	font=55,code=WIDGET.lnk_pressKey("right")},
-	WIDGET.newKey{name="ten",		x=1000,	y=440,w=90,		color="lGreen",	font=40,code=WIDGET.lnk_pressKey("ten")},
-	WIDGET.newKey{name="backsp",	x=1000,	y=540,w=90,		color="lYellow",font=50,code=WIDGET.lnk_pressKey("backspace")},
-	WIDGET.newKey{name="reset",		x=1000,	y=640,w=90,		color="lYellow",font=50,code=WIDGET.lnk_pressKey("delete")},
-	WIDGET.newButton{name="copy",	x=1140,	y=440,w=170,h=80,color="lRed",	font=40,code=WIDGET.lnk_pressKey("cC"),hide=function()return #BAG==0 end},
-	WIDGET.newButton{name="paste",	x=1140,	y=540,w=170,h=80,color="lBlue",	font=40,code=WIDGET.lnk_pressKey("cV")},
+	WIDGET.newKey{name="W",		x=120,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(17)},
+	WIDGET.newKey{name="X",		x=200,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(18)},
+	WIDGET.newKey{name="J5",	x=280,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(19)},
+	WIDGET.newKey{name="L5",	x=360,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(20)},
+	WIDGET.newKey{name="R",		x=440,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(21)},
+	WIDGET.newKey{name="Y",		x=520,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(22)},
+	WIDGET.newKey{name="N",		x=600,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(23)},
+	WIDGET.newKey{name="H",		x=680,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(24)},
+	WIDGET.newKey{name="I5",	x=760,y=620,w=80,color="lGrey",font=50,code=WIDGET.lnk_pressKey(25)},
+	WIDGET.newKey{name="I2",	x=840,y=620,w=80,color="dGrey",font=50,code=WIDGET.lnk_pressKey(28)},
+	WIDGET.newKey{name="O1",	x=920,y=620,w=80,color="dGrey",font=50,code=WIDGET.lnk_pressKey(29)},
 
+
+	WIDGET.newButton{name="copy",	x=1140,	y=460,w=170,h=80,color="lRed",	font=40,code=WIDGET.lnk_pressKey("cC"),hide=function()return #BAG==0 end},
+	WIDGET.newButton{name="paste",	x=1140,	y=550,w=170,h=80,color="lBlue",	font=40,code=WIDGET.lnk_pressKey("cV")},
 	WIDGET.newButton{name="back",	x=1140,	y=640,	w=170,h=80,	font=40,code=WIDGET.lnk_BACK},
 }