From 7df6a465623446168a7c69f5483823529092a254 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Sat, 28 Sep 2024 00:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E7=A8=8B=E5=85=B3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A=E7=8A=B6=E6=80=81=EF=BC=8C1234=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=8C=89=E9=A1=BA=E5=BA=8F=E5=AE=8C=E6=88=90=EF=BC=88?=
 =?UTF-8?q?=E6=9C=89=E8=B7=B3=E8=BF=87=E6=9D=A1=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mode/brik/interior/tutorial/1.basic.lua   |  5 +++--
 .../brik/interior/tutorial/2.sequence.lua     |  5 +++--
 .../brik/interior/tutorial/3.stackBasic.lua   |  5 +++--
 .../brik/interior/tutorial/4.finesseBasic.lua |  4 ++--
 assets/progress.lua                           | 12 +++++-------
 assets/scene/tutorial_in.lua                  | 19 ++++++++++---------
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/assets/game/mode/brik/interior/tutorial/1.basic.lua b/assets/game/mode/brik/interior/tutorial/1.basic.lua
index dde4fc4c..ebec758f 100644
--- a/assets/game/mode/brik/interior/tutorial/1.basic.lua
+++ b/assets/game/mode/brik/interior/tutorial/1.basic.lua
@@ -194,10 +194,11 @@ return {
                 P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='beat',c=COLOR.lG,y=-30}
                 if P.modeData.allFinesse then
                     P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='flicker',c=COLOR.Y,y=-30}
-                    PROGRESS.setTutorialPassed(1,2)
+                    PROGRESS.setTutorialPassed(1,3)
                 else
-                    PROGRESS.setTutorialPassed(1,1)
+                    PROGRESS.setTutorialPassed(1,2)
                 end
+                PROGRESS.setTutorialPassed(2,1)
                 P:finish('win')
             end},
         },
diff --git a/assets/game/mode/brik/interior/tutorial/2.sequence.lua b/assets/game/mode/brik/interior/tutorial/2.sequence.lua
index 54fd850a..b4893d80 100644
--- a/assets/game/mode/brik/interior/tutorial/2.sequence.lua
+++ b/assets/game/mode/brik/interior/tutorial/2.sequence.lua
@@ -211,10 +211,11 @@ return {
                 P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='beat',c=COLOR.lG,y=-30}
                 if P.modeData.extra then
                     P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='flicker',c=COLOR.Y,y=-30}
-                    PROGRESS.setTutorialPassed(2,2)
+                    PROGRESS.setTutorialPassed(2,3)
                 else
-                    PROGRESS.setTutorialPassed(2,1)
+                    PROGRESS.setTutorialPassed(2,2)
                 end
+                PROGRESS.setTutorialPassed(3,1)
                 P:finish('win')
             end},
         },
diff --git a/assets/game/mode/brik/interior/tutorial/3.stackBasic.lua b/assets/game/mode/brik/interior/tutorial/3.stackBasic.lua
index 4ae731b4..c90c2bb3 100644
--- a/assets/game/mode/brik/interior/tutorial/3.stackBasic.lua
+++ b/assets/game/mode/brik/interior/tutorial/3.stackBasic.lua
@@ -49,10 +49,11 @@ return {
                     P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='beat',c=COLOR.lG,y=-30}
                     if not normalClear then
                         P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='flicker',c=COLOR.Y,y=-30}
-                        PROGRESS.setTutorialPassed(3,2)
+                        PROGRESS.setTutorialPassed(3,3)
                     else
-                        PROGRESS.setTutorialPassed(3,1)
+                        PROGRESS.setTutorialPassed(3,2)
                     end
+                    PROGRESS.setTutorialPassed(4,1)
                 else
                     local unstabality=0
 
diff --git a/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua b/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua
index b972a468..4866ef7e 100644
--- a/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua
+++ b/assets/game/mode/brik/interior/tutorial/4.finesseBasic.lua
@@ -243,11 +243,11 @@ return {
                 P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='beat',c=COLOR.lG,y=-30}
                 if P.modeData.keySaved>12.6 then
                     P:say{duration='6.26s',text="@tutorial_pass",size=60,k=2,type='bold',style='flicker',c=COLOR.Y,y=-30}
-                    PROGRESS.setTutorialPassed(4,2)
+                    PROGRESS.setTutorialPassed(4,3)
                 elseif P.modeData.keySaved>6.26  then
                     P:say{duration='1.26s',text=P.modeData.keySaved.."/12",k=2,size=30,type='bold',style='fly',c=COLOR.lY,y=60}
                 else
-                    PROGRESS.setTutorialPassed(4,1)
+                    PROGRESS.setTutorialPassed(4,2)
                 end
                 P:finish('win')
             end},
diff --git a/assets/progress.lua b/assets/progress.lua
index 066b955b..7f5805f0 100644
--- a/assets/progress.lua
+++ b/assets/progress.lua
@@ -12,7 +12,7 @@ local prgs=setmetatable({
         dig=0,
         sprint=0,
         marathon=0,
-        tutorial='0000', -- 0: Not Finished, 1: Passed, 2: Perfect Passed (unlock B side)
+        tutorial='1000', -- 0:Not Unlocked  1: Not Finished,  2: Passed,  3: Perfect Passed (unlock B side)
         tuto5_score=0,
         tuto6_score=0,
         tuto7_score=0,
@@ -153,7 +153,7 @@ end
 function PROGRESS.fix()
     prgs.brik_stdMap=nil
     if type(prgs.interiorScore.tutorial)=='table' then
-        prgs.interiorScore.tutorial='0000'
+        prgs.interiorScore.tutorial='1000'
         prgs.tuto5_score=0
         prgs.tuto6_score=0
         prgs.tuto7_score=0
@@ -415,7 +415,7 @@ function PROGRESS.getTutorialPassed(n)
     if n then
         return tonumber(prgs.interiorScore.tutorial:sub(n,n))
     else
-        return not prgs.interiorScore.tutorial:find('0')
+        return not prgs.interiorScore.tutorial:find('[01]')
     end
 end
 function PROGRESS.getInteriorScore(mode) return prgs.interiorScore[mode] end
@@ -437,11 +437,9 @@ function PROGRESS.setMain(n)
         while prgs.main<n do
             prgs.main=prgs.main+1
             if prgs.main==2 then
-                for i=1,4 do
-                    prgs.interiorScore.tutorial[i]=math.max(prgs.interiorScore.tutorial[i],1)
-                end
+                prgs.interiorScore.tutorial=prgs.interiorScore.tutorial:gsub('0','1')
             elseif prgs.main==3 then
-                -- ?
+                prgs.interiorScore.tutorial=prgs.interiorScore.tutorial:gsub('[01]','2')
             elseif prgs.main==4 then
                 -- ?
             elseif prgs.main==5 then
diff --git a/assets/scene/tutorial_in.lua b/assets/scene/tutorial_in.lua
index c4e9f3bb..51f25053 100644
--- a/assets/scene/tutorial_in.lua
+++ b/assets/scene/tutorial_in.lua
@@ -24,7 +24,9 @@ local function B(t)
     return WIDGET.new(w)
 end
 local function playTutorial(level)
-    if PROGRESS.getTutorialPassed(level)<2 then
+    local unlock=PROGRESS.getTutorialPassed(level)
+    if unlock==0 then
+    elseif unlock<=2 then
         SCN.go('game_in','none','brik/interior/tutorial/'..(
             level==1 and '1.basic' or
             level==2 and '2.sequence' or
@@ -47,16 +49,15 @@ function scene.load()
         if v.name then
             local id=tonumber(v.name:sub(-1))
             local state=PROGRESS.getTutorialPassed(id)
-            if state==2 then
+            if state==0 then
+                v.color='lD'
+                v.text="???"
+            elseif state<=2 then
+                v.color=state==1 and 'B' or 'lG'
+                v.text=LANG(buttonTexts[id])
+            else
                 v.color='lR'
                 v.text=LANG(buttonTexts[4+id])
-            else
-                if state==0 then
-                    v.color='B'
-                elseif state==1 then
-                    v.color='lG'
-                end
-                v.text=LANG(buttonTexts[id])
             end
         end
     end