From 063de09d3f0a8743abd6391aa5c6d63eea11a76f Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 16 Feb 2021 21:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=862048ui=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/language/lang_en.lua |  3 ---
 parts/language/lang_zh.lua |  3 ---
 parts/scenes/mg_2048.lua   | 21 ++++++++++-----------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index b639910c..1241d690 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -640,10 +640,7 @@ return{
 			blind="Blind",
 			tapControl="Tap control",
 
-			up="↑",down="↓",left="←",right="→",
 			skip="Skip Round",
-			replay1="P",
-			replay2="P",
 		},
 		mg_jgt={
 			reset="Reset",
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index e7ca59e5..ff8511d3 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -642,10 +642,7 @@ return{
 			blind="盲打",
 			tapControl="点击操作",
 
-			up="↑",down="↓",left="←",right="→",
 			skip="跳过回合",
-			replay1="P",
-			replay2="P",
 		},
 		mg_jgt={
 			reset="重置",
diff --git a/parts/scenes/mg_2048.lua b/parts/scenes/mg_2048.lua
index d1df9fcc..0d63e760 100644
--- a/parts/scenes/mg_2048.lua
+++ b/parts/scenes/mg_2048.lua
@@ -74,12 +74,11 @@ end
 local function newTile()
 	--Select position & generate number
 	nextPos=(nextPos+6)%16+1
-	local p=nextPos
-	while board[p]do
-		p=(p-4)%16+1
+	while board[nextPos]do
+		nextPos=(nextPos-4)%16+1
 	end
-	board[p]=nextTile
-	prevPos=p
+	board[nextPos]=nextTile
+	prevPos=nextPos
 	prevSpawnTime=0
 
 	--Fresh score
@@ -479,15 +478,15 @@ scene.widgetList={
 	WIDGET.newSwitch{name="blind",		x=240,y=300,w=60,		font=40,disp=function()return blind end,	code=pressKey"q",hide=function()return state==1 end},
 	WIDGET.newSwitch{name="tapControl",	x=240,y=370,w=60,		font=40,disp=function()return tapControl end,	code=pressKey"w",hide=function()return state==1 end},
 
-	WIDGET.newKey{name="up",			x=155,y=560-100,w=100,font=50,color="yellow",code=pressKey"up",hide=function()return tapControl end},
-	WIDGET.newKey{name="down",			x=155,y=560+100,w=100,font=50,color="yellow",code=pressKey"down",hide=function()return tapControl end},
-	WIDGET.newKey{name="left",			x=155-100,y=560,w=100,font=50,color="yellow",code=pressKey"left",hide=function()return tapControl end},
-	WIDGET.newKey{name="right",			x=155+100,y=560,w=100,font=50,color="yellow",code=pressKey"right",hide=function()return tapControl end},
+	WIDGET.newKey{name="up",			x=155,y=460,w=100,fText="↑",font=50,color="yellow",code=pressKey"up",hide=function()return tapControl end},
+	WIDGET.newKey{name="down",			x=155,y=660,w=100,fText="↓",font=50,color="yellow",code=pressKey"down",hide=function()return tapControl end},
+	WIDGET.newKey{name="left",			x=55,y=560,w=100,fText="←",font=50,color="yellow",code=pressKey"left",hide=function()return tapControl end},
+	WIDGET.newKey{name="right",			x=255,y=560,w=100,fText="→",font=50,color="yellow",code=pressKey"right",hide=function()return tapControl end},
 	WIDGET.newKey{name="skip",			x=155,y=400,w=100,font=20,color="yellow",code=pressKey"space",hide=function()return state~=1 or not skipper.cd or skipper.cd>0 end},
 	WIDGET.newKey{name="record1",		x=1100,y=390,w=220,h=50,fText="",color="grey",code=pressKey"1",hide=function()return state==2 end},
 	WIDGET.newKey{name="record2",		x=1100,y=450,w=220,h=50,fText="",color="grey",code=pressKey"2",hide=function()return state==2 end},
-	WIDGET.newKey{name="replay1",		x=1245,y=390,w=50,color="green",code=pressKey"c1",hide=function()return state==2 or #repeater.seq[1]==0 end},
-	WIDGET.newKey{name="replay2",		x=1245,y=450,w=50,color="green",code=pressKey"c2",hide=function()return state==2 or #repeater.seq[2]==0 end},
+	WIDGET.newKey{name="replay1",		x=1245,y=390,w=50,fText="!",color="green",code=pressKey"c1",hide=function()return state==2 or #repeater.seq[1]==0 end},
+	WIDGET.newKey{name="replay2",		x=1245,y=450,w=50,fText="!",color="green",code=pressKey"c2",hide=function()return state==2 or #repeater.seq[2]==0 end},
 	WIDGET.newButton{name="back",		x=1140,y=640,w=170,h=80,font=40,code=backScene},
 }