From 43fb2fc76e8aa36d42fa2083ea7b1f8c527104b4 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 30 Oct 2020 22:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A9=AC=E6=8B=89=E6=9D=BE-?=
 =?UTF-8?q?=E5=9B=B0=E9=9A=BE=E6=B2=A1=E6=9C=89reach=E9=9F=B3=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modes/marathon_hard.lua     | 6 ++++--
 modes/marathon_normal.lua   | 4 ++--
 modes/marathon_ultimate.lua | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modes/marathon_hard.lua b/modes/marathon_hard.lua
index 56e4ac64..b451a9fe 100644
--- a/modes/marathon_hard.lua
+++ b/modes/marathon_hard.lua
@@ -5,9 +5,11 @@ local function check(P)
 		if T==50 then
 			P.gameEnv.drop=.25
 			P.gameEnv.target=100
+			SFX.play("reach")
 		elseif T==100 then
 			P._20G=true
 			P.gameEnv.target=200
+			SFX.play("reach")
 		else
 			P:win("finish")
 		end
@@ -31,10 +33,10 @@ return{
 	mesDisp=function(P)
 		setFont(45)
 		mStr(P.stat.row,69,390)
-		mStr(P.modeData.event*100+100,69,440)
+		mStr(P.gameEnv.target,69,440)
 		gc.rectangle("fill",25,445,90,4)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
+	score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
diff --git a/modes/marathon_normal.lua b/modes/marathon_normal.lua
index 28008f68..3a44e153 100644
--- a/modes/marathon_normal.lua
+++ b/modes/marathon_normal.lua
@@ -18,7 +18,7 @@ return{
 	env={
 		noTele=true,
 		wait=8,fall=20,
-		target=10,dropPiece=check_LVup,
+		dropPiece=check_LVup,
 		mindas=7,minarr=1,minsdarr=1,
 		bg="bg2",bgm="push",
 	},
@@ -33,7 +33,7 @@ return{
 		mStr(P.modeData.point+10,69,440)
 		gc.rectangle("fill",25,445,90,4)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
+	score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
diff --git a/modes/marathon_ultimate.lua b/modes/marathon_ultimate.lua
index 74fb96f9..4dd7a15f 100644
--- a/modes/marathon_ultimate.lua
+++ b/modes/marathon_ultimate.lua
@@ -40,7 +40,7 @@ return{
 		mStr(P.modeData.point+10,69,440)
 		gc.rectangle("fill",25,445,90,4)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
+	score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)