From 97dcb1cef3f9ddad7d86a45064404b60d0abba4a Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Mon, 23 Sep 2024 17:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=99=E7=A8=8B=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=83=E5=85=B3=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../brik/interior/tutorial/4.finesseBasic.lua |  1 -
 .../interior/tutorial/7.techrashPractice.lua  | 21 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua b/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua
index 2faf6caa..b972a468 100644
--- a/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua
+++ b/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua
@@ -163,7 +163,6 @@ return {
                     -- Correct
                     table.remove(P.modeData.targetPreview,1)
                     P.modeData.keySaved=P.modeData.keySaved+(target.best-P.modeData.curKeyCount)
-                    print(P.modeData.keySaved)
                     if #P.modeData.targetPreview==0 then
                         P.modeData.questFin=true
                         P.settings.spawnDelay=1e99
diff --git a/assets/game/mode/brik/interior/tutorial/7.techrashPractice.lua b/assets/game/mode/brik/interior/tutorial/7.techrashPractice.lua
index 78cec19b..0455259a 100644
--- a/assets/game/mode/brik/interior/tutorial/7.techrashPractice.lua
+++ b/assets/game/mode/brik/interior/tutorial/7.techrashPractice.lua
@@ -26,8 +26,14 @@ return {
                 P.modeData.multiplier=1
                 P.modeData.protect=false
                 P.modeData.display=false
+                P.modeData.techrashTimer=0
                 PROGRESS.setInteriorScore('tuto7_score',0)
-                PROGRESS.setInteriorScore('tuto7_time',2600,'<')
+                PROGRESS.setInteriorScore('tuto7_time',2600e3,'<')
+            end,
+            always=function(P)
+                if P.modeData.techrashTimer>0 then
+                    P.modeData.techrashTimer=P.modeData.techrashTimer-1
+                end
             end,
             afterClear=function(P,clear)
                 if clear.line<4 then
@@ -45,10 +51,13 @@ return {
                     P.modeData.protect=false
                     local s1=P.modeData.score
                     local s2=math.min(s1+P.modeData.multiplier*math.min(P.combo,10),99)
+                    if s2-s1>1 then
+                        P.modeData.techrashTimer=P.modeData.techrashTimer+260*(s2-s1-1)
+                    end
                     P.modeData.score=s2
                     PROGRESS.setInteriorScore('tuto7_score',s2)
                     if s2>=99 then
-                        PROGRESS.setInteriorScore('tuto7_time',P.gameTime/1000,'<')
+                        PROGRESS.setInteriorScore('tuto7_time',P.gameTime,'<')
                         P.modeData.display=STRING.time(P.gameTime/1000)
                         P:finish('win')
                     elseif s1<62 and s2>=62 then
@@ -63,9 +72,11 @@ return {
                 end
             end,
             drawOnPlayer=function(P)
-                GC.setColor(1,P.modeData.multiplier==1 and 1 or 0.62,1-P.combo*.26,P.modeData.protect and .5 or 1)
+                GC.setColor(1,P.modeData.multiplier==1 and 1 or 0.62,1.1-P.combo*.126,P.modeData.protect and .5 or 1)
                 FONT.set(80) GC.mStr(P.modeData.score,-300,-70)
-                FONT.set(30) GC.mStr(Text.target_score,-300,20)
+                FONT.set(30) GC.mStr(P.modeData.techrashTimer>0 and Text.target_score or Text.target_techrash,-300,20)
+                GC.setColor(1,1,1,.62)
+                GC.mStr(Text.target_score,-300,20)
                 FONT.set(20)
                 GC.setColor(1,1,1,.872)
                 if P.modeData.display then
@@ -73,7 +84,7 @@ return {
                 elseif PROGRESS.getInteriorScore('tuto7_score')<99 then
                     GC.mStr(PROGRESS.getInteriorScore('tuto7_score'),-300,60)
                 else
-                    GC.mStr(STRING.time(PROGRESS.getInteriorScore('tuto7_time')),-300,60)
+                    GC.mStr(STRING.time(PROGRESS.getInteriorScore('tuto7_time')/1000),-300,60)
                 end
             end,
         },