优化教程5和教程7的纪录信息显示

可以按住ctrl键重看教程1~4 框架跟进
26F-Studio · Sep 29, 2024 · 6463c57 · 6463c57
1 parent 7485250
commit 6463c57
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/Zenitha b/Zenitha
diff --git a/assets/game/mode/brik/interior/tutorial/5.finessePractice.lua b/assets/game/mode/brik/interior/tutorial/5.finessePractice.lua
@@ -114,7 +114,7 @@ return {
                 if PROGRESS.getInteriorScore('tuto5_score')<99 then
                     P.modeData.display=PROGRESS.getInteriorScore('tuto5_score').."/99"
                 else
-                    P.modeData.display=STRING.time(PROGRESS.getInteriorScore('tuto5_time')/1000)
+                    P.modeData.display={COLOR.lY,STRING.time(PROGRESS.getInteriorScore('tuto5_time')/1000)}
                 end
             end,
             afterResetPos=function(P)
@@ -141,13 +141,12 @@ return {
                 if posSucc and keySucc then
                     -- Correct
                     P.modeData.finesseCombo=P.modeData.finesseCombo+1
-                    if P.modeData.finesseCombo%3==0 then
-                        PROGRESS.setInteriorScore('tuto5_score',P.modeData.finesseCombo)
-                    end
                     if P.modeData.finesseCombo==99 then
+                        PROGRESS.setInteriorScore('tuto5_score',99)
                         PROGRESS.setInteriorScore('tuto5_time',P.gameTime)
-                        P.modeData.display=STRING.time(P.gameTime/1000)
+                        P.modeData.display={COLOR.lY,STRING.time(PROGRESS.getInteriorScore('tuto5_time')/1000)}
                         P:finish('win')
+                    else
                     end
                     table.remove(P.modeData.targetPreview,1)
                     P.modeData.correct=true
@@ -158,6 +157,7 @@ return {
                     table.insert(P.nextQueue,1,P.hand)
                     P.hand=nil
                     P:playSound(posSucc and 'rotate_failed' or 'move_failed',2)
+                    P.modeData.display=PROGRESS.getInteriorScore('tuto5_score').."/99"
                     if not P.modeData.protect then
                         P.modeData.finesseCombo=math.max(P.modeData.finesseCombo-6,0)
                         P.modeData.protect=true

diff --git a/assets/game/mode/brik/interior/tutorial/7.techrashPractice.lua b/assets/game/mode/brik/interior/tutorial/7.techrashPractice.lua
@@ -27,6 +27,12 @@ return {
                 P.modeData.protect=false
                 P.modeData.display=false
                 P.modeData.techrashTimer=0
+
+                if PROGRESS.getInteriorScore('tuto7_score')>=99 then
+                    P.modeData.display=PROGRESS.getInteriorScore('tuto7_score').."/99"
+                else
+                    P.modeData.display={COLOR.lY,PROGRESS.getInteriorScore('tuto7_time')/1000}
+                end
             end,
             always=function(P)
                 if P.modeData.techrashTimer>0 then
@@ -56,15 +62,18 @@ return {
                     PROGRESS.setInteriorScore('tuto7_score',s2)
                     if s2>=99 then
                         PROGRESS.setInteriorScore('tuto7_time',P.gameTime,'<')
-                        P.modeData.display=STRING.time(P.gameTime/1000)
+                        P.modeData.display={COLOR.lY,PROGRESS.getInteriorScore('tuto7_time')/1000}
                         P:finish('win')
-                    elseif s1<62 and s2>=62 then
-                        P.settings.holdSlot=0
-                        P.holdQueue[1]=nil
-                    elseif s1<10 and s2>=10 then
-                        if not P.holdQueue[1] then
+                    else
+                        P.modeData.display=PROGRESS.getInteriorScore('tuto7_score').."/99"
+                        if s1<62 and s2>=62 then
                             P.settings.holdSlot=0
-                            P.modeData.multiplier=2
+                            P.holdQueue[1]=nil
+                        elseif s1<10 and s2>=10 then
+                            if not P.holdQueue[1] then
+                                P.settings.holdSlot=0
+                                P.modeData.multiplier=2
+                            end
                         end
                     end
                 end
@@ -77,13 +86,7 @@ return {
                 GC.mStr(Text.target_score,-300,20)
                 FONT.set(20)
                 GC.setColor(1,1,1,.872)
-                if P.modeData.display then
-                    GC.mStr(P.modeData.display,-300,60)
-                elseif PROGRESS.getInteriorScore('tuto7_score')<99 then
-                    GC.mStr(PROGRESS.getInteriorScore('tuto7_score'),-300,60)
-                else
-                    GC.mStr(STRING.time(PROGRESS.getInteriorScore('tuto7_time')/1000),-300,60)
-                end
+                GC.mStr(P.modeData.display,-300,60)
             end,
         },
         script={

diff --git a/assets/scene/tutorial_in.lua b/assets/scene/tutorial_in.lua
@@ -26,7 +26,7 @@ end
 local function playTutorial(level)
     local unlock=PROGRESS.getTutorialPassed(level)
     if unlock==0 then
-    elseif unlock<=2 then
+    elseif unlock<=2 or isCtrlPressed() then
         SCN.go('game_in','none','brik/interior/tutorial/'..(
             level==1 and '1.basic' or
             level==2 and '2.sequence' or