From 513348958cdc18509260ac8ccaad8b96b6798733 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 21 Sep 2020 23:20:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BB=BB=E5=8A=A1id?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/languages.lua  | 55 +++++++++++++++++++++------------------
 Zframework/widgetList.lua | 20 +++++++-------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/Zframework/languages.lua b/Zframework/languages.lua
index d234e900..ee93422e 100644
--- a/Zframework/languages.lua
+++ b/Zframework/languages.lua
@@ -227,7 +227,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",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -254,14 +254,15 @@ local langList={
 				back="返回",
 			},
 			custom_mission={
+				_1="1",_2="2",_3="3",_4="4",
+				any1="any1",any2="any2",any3="any3",any4="any4",
+				PC="PC",
 				Z1="Z1",S1="S1",J1="J1",L1="L1",T1="T1",O1="O1",I1="I1",
 				Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2",
 				Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3",
-				any1="any1",any2="any2",any3="any3",any4="any4",
-				PC="PC",O4="O4",I4="I4",
-				_1="1",_2="2",_3="3",_4="4",
+				O4="O4",I4="I4",
 				left="←",right="→",
-				ten="+10",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -744,7 +745,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",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -771,14 +772,15 @@ local langList={
 				back="返回",
 			},
 			custom_mission={
+				_1="1",_2="2",_3="3",_4="4",
+				any1="any1",any2="any2",any3="any3",any4="any4",
+				PC="PC",
 				Z1="Z1",S1="S1",J1="J1",L1="L1",T1="T1",O1="O1",I1="I1",
 				Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2",
 				Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3",
-				any1="any1",any2="any2",any3="any3",any4="any4",
-				PC="PC",O4="O4",I4="I4",
-				_1="1",_2="2",_3="3",_4="4",
+				O4="O4",I4="I4",
 				left="←",right="→",
-				ten="+10",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -1251,7 +1253,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",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="Copy",
@@ -1278,14 +1280,15 @@ local langList={
 				back="Back",
 			},
 			custom_mission={
+				_1="1",_2="2",_3="3",_4="4",
+				any1="any1",any2="any2",any3="any3",any4="any4",
+				PC="PC",
 				Z1="Z1",S1="S1",J1="J1",L1="L1",T1="T1",O1="O1",I1="I1",
 				Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2",
 				Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3",
-				any1="any1",any2="any2",any3="any3",any4="any4",
-				PC="PC",O4="O4",I4="I4",
-				_1="1",_2="2",_3="3",_4="4",
+				O4="O4",I4="I4",
 				left="←",right="→",
-				ten="+10",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="Copy",
@@ -1754,7 +1757,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",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="→__",
@@ -1781,14 +1784,15 @@ local langList={
 				back="X",
 			},
 			custom_mission={
+				_1="1",_2="2",_3="3",_4="4",
+				any1="any1",any2="any2",any3="any3",any4="any4",
+				PC="PC",
 				Z1="Z1",S1="S1",J1="J1",L1="L1",T1="T1",O1="O1",I1="I1",
 				Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2",
 				Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3",
-				any1="any1",any2="any2",any3="any3",any4="any4",
-				PC="PC",O4="O4",I4="I4",
-				_1="1",_2="2",_3="3",_4="4",
+				O4="O4",I4="I4",
 				left="←",right="→",
-				ten="+10",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="Copy",
@@ -2269,7 +2273,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",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="复制",
@@ -2296,14 +2300,15 @@ local langList={
 				back="返回",
 			},
 			custom_mission={
+				_1="1",_2="2",_3="3",_4="4",
+				any1="any1",any2="any2",any3="any3",any4="any4",
+				PC="PC",
 				Z1="Z1",S1="S1",J1="J1",L1="L1",T1="T1",O1="O1",I1="I1",
 				Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2",
 				Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3",
-				any1="any1",any2="any2",any3="any3",any4="any4",
-				PC="PC",O4="O4",I4="I4",
-				_1="1",_2="2",_3="3",_4="4",
+				O4="O4",I4="I4",
 				left="←",right="→",
-				ten="+10",
+				ten="→→",
 				backsp="<X",
 				reset="R",
 				copy="复制",
diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua
index e0a66756..da4389fe 100644
--- a/Zframework/widgetList.lua
+++ b/Zframework/widgetList.lua
@@ -290,6 +290,16 @@ local Widgets={
 		newButton({name="back",		x=1140,		y=640,	w=170,h=80,	color="white",	font=40,code=BACK}),
 	},
 	custom_mission={
+		newKey({name="_1",			x=800,	y=540,	w=90,			color="white",	font=50,code=pressKey(01)}),
+		newKey({name="_2",			x=900,	y=540,	w=90,			color="white",	font=50,code=pressKey(02)}),
+		newKey({name="_3",			x=800,	y=640,	w=90,			color="white",	font=50,code=pressKey(03)}),
+		newKey({name="_4",			x=900,	y=640,	w=90,			color="white",	font=50,code=pressKey(04)}),
+		newKey({name="any1",		x=100,	y=640,	w=90,			color="white",	font=30,code=pressKey(05)}),
+		newKey({name="any2",		x=200,	y=640,	w=90,			color="white",	font=30,code=pressKey(06)}),
+		newKey({name="any3",		x=300,	y=640,	w=90,			color="white",	font=30,code=pressKey(07)}),
+		newKey({name="any4",		x=400,	y=640,	w=90,			color="white",	font=30,code=pressKey(08)}),
+		newKey({name="PC",			x=500,	y=640,	w=90,			color="white",	font=50,code=pressKey(09)}),
+
 		newKey({name="Z1",			x=100,	y=340,	w=90,			color="white",	font=50,code=pressKey(11)}),
 		newKey({name="S1",			x=200,	y=340,	w=90,			color="white",	font=50,code=pressKey(21)}),
 		newKey({name="J1",			x=300,	y=340,	w=90,			color="white",	font=50,code=pressKey(31)}),
@@ -314,19 +324,9 @@ local Widgets={
 		newKey({name="O3",			x=600,	y=540,	w=90,			color="white",	font=50,code=pressKey(63)}),
 		newKey({name="I3",			x=700,	y=540,	w=90,			color="white",	font=50,code=pressKey(73)}),
 
-		newKey({name="any1",		x=100,	y=640,	w=90,			color="white",	font=30,code=pressKey(91)}),
-		newKey({name="any2",		x=200,	y=640,	w=90,			color="white",	font=30,code=pressKey(92)}),
-		newKey({name="any3",		x=300,	y=640,	w=90,			color="white",	font=30,code=pressKey(93)}),
-		newKey({name="any4",		x=400,	y=640,	w=90,			color="white",	font=30,code=pressKey(94)}),
-		newKey({name="PC",			x=500,	y=640,	w=90,			color="white",	font=50,code=pressKey(99)}),
 		newKey({name="O4",			x=600,	y=640,	w=90,			color="white",	font=50,code=pressKey(64)}),
 		newKey({name="I4",			x=700,	y=640,	w=90,			color="white",	font=50,code=pressKey(74)}),
 
-		newKey({name="_1",			x=800,	y=540,	w=90,			color="white",	font=50,code=pressKey(1)}),
-		newKey({name="_2",			x=900,	y=540,	w=90,			color="white",	font=50,code=pressKey(2)}),
-		newKey({name="_3",			x=800,	y=640,	w=90,			color="white",	font=50,code=pressKey(3)}),
-		newKey({name="_4",			x=900,	y=640,	w=90,			color="white",	font=50,code=pressKey(4)}),
-
 		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="ten",			x=1000,	y=440,	w=90,			color="lGreen",	font=40,code=pressKey("ten")}),