From a22cc09675e56edbaec284bdf8d831a8a8a2ee2c Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 13 Mar 2021 00:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B=E5=BA=8Fte?=
 =?UTF-8?q?n=E7=9A=84=E6=89=8B=E6=84=9F=EF=BC=8C=E5=A4=96=E6=A1=86?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BC=9A=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/scenes/app_ten.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua
index e7651e09..7f95d88d 100644
--- a/parts/scenes/app_ten.lua
+++ b/parts/scenes/app_ten.lua
@@ -26,6 +26,7 @@ local tileColor={
 }
 
 local board,preview,cx,cy
+local failPos
 local startTime,time
 local maxTile,maxNew
 local state,progress
@@ -70,6 +71,7 @@ local function merge()
 		state=1
 		startTime=TIME()
 	end
+	if failPos==cy*10+cx then return end
 	local chosen=board[cy][cx]
 	local connected={{cy,cx}}
 	local count=1
@@ -113,8 +115,10 @@ local function merge()
 			)
 		end
 		fallingTimer=fast and 8 or 12
+		failPos=false
 	else
 		board[cy][cx]=chosen
+		failPos=cy*10+cx
 	end
 end
 function scene.keyDown(key)
@@ -248,7 +252,11 @@ function scene.draw()
 		rectangle("fill",15,200,285,210)
 	end
 	gc.setLineWidth(10)
-	setColor(1,1,1)
+	setColor(COLOR[
+		state==0 and"G"or
+		state==1 and(fast and"R"or"W")or
+		state==2 and"Y"
+	])
 	rectangle("line",315,35,650,650)
 
 	gc.setLineWidth(4)