把特别大的PASS字号改小，用缩放代替

框架跟进
26F-Studio · Jul 11, 2024 · 1eb602c · 1eb602c
1 parent 9948303
commit 1eb602c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/Zenitha b/Zenitha
diff --git a/assets/game/basePlayer.lua b/assets/game/basePlayer.lua
@@ -150,6 +150,7 @@ function P:say(arg)
         fontType=arg.type or 'norm',
         x=arg.x or 0,
         y=arg.y or 0,
+        k=arg.scale or 1,
         inPoint=(arg.i or 0.2)/D,
         outPoint=(arg.o or 0.5)/D,
         r=arg.c and arg.c[1] or 1,
@@ -640,7 +641,7 @@ function P:loadScript(script) -- Parse time stamps and labels, check syntax of l
                         elseif k=='size'     then if not (type(v)=='number' and v>0 and v%5==0 and v<=120) then error(errMsg.."Wrong arg 'size', need 5, 10, 15,... 120") end
                         elseif k=='type' or k=='style' then if type(v)~='string' then error(errMsg.."Wrong arg 'type', need string") end
                         elseif k=='style'    then if type(v)~='string' then error(errMsg.."Wrong arg 'style', need string") end
-                        elseif k=='i' or k=='o' or k=='x' or k=='y' then if type(v)~='number' then error(errMsg.."Wrong arg '"..k.."', need number") end
+                        elseif k=='i' or k=='o' or k=='x' or k=='y' or k=='scale' then if type(v)~='number' then error(errMsg.."Wrong arg '"..k.."', need number") end
                         elseif k=='c'        then if type(v)~='table'  then error(errMsg.."Wrong arg 'c', need table") end
                         else error(errMsg.."Wrong arg name '"..k.."'")
                         end

diff --git a/assets/game/mode/brik/interior/tutorial/1.basic.lua b/assets/game/mode/brik/interior/tutorial/1.basic.lua
@@ -165,7 +165,7 @@ return {
             "jeq quest4,signal,false",
             "sfx win",
 
-            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=120,type='bold',style='beat',c=COLOR.lG,y=-30}},
+            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=60,scale=2,type='bold',style='beat',c=COLOR.lG,y=-30}},
             {cmd=function(P) if P.isMain then PROGRESS.setTutorialPassed(1) end end},
             "finish AC",
         },

diff --git a/assets/game/mode/brik/interior/tutorial/2.sequence.lua b/assets/game/mode/brik/interior/tutorial/2.sequence.lua
@@ -204,10 +204,10 @@ return {
             "sfx win",
 
             "jeq extra,extra,true",
-            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=120,type='bold',style='beat',c=COLOR.lG,y=-30}},
+            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=60,scale=2,type='bold',style='beat',c=COLOR.lG,y=-30}},
             "j end",
             "extra:",
-            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=120,type='bold',style='beat',c=COLOR.lY,y=-30}},
+            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=60,scale=2,type='bold',style='beat',c=COLOR.lY,y=-30}},
             "end:",
             {cmd=function(P) if P.isMain then PROGRESS.setTutorialPassed(2) end end},
             "finish AC",

diff --git a/assets/game/mode/brik/interior/tutorial/4.stackBasic.lua b/assets/game/mode/brik/interior/tutorial/4.stackBasic.lua
@@ -145,7 +145,7 @@ return {
 
             "setc msg,false",
 
-            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=120,type='bold',style='beat',c=COLOR.lG,y=-30}},
+            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=60,scale=2,type='bold',style='beat',c=COLOR.lG,y=-30}},
             {cmd=function(P) if P.isMain then PROGRESS.setTutorialPassed(4) end end},
             "finish AC",
         },

diff --git a/assets/game/mode/brik/interior/tutorial/5.twoRotatingKey.lua b/assets/game/mode/brik/interior/tutorial/5.twoRotatingKey.lua
@@ -189,7 +189,7 @@ return {
             "wait signal",
 
             "sfx win",
-            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=120,type='bold',style='beat',c=COLOR.lG,y=-30}},
+            {cmd='say',arg={duration='6.26s',text="@tutorial_pass",size=60,scale=2,type='bold',style='beat',c=COLOR.lG,y=-30}},
             {cmd=function(P) if P.isMain then PROGRESS.setTutorialPassed(5) end end},
             "finish AC",
         },

diff --git a/assets/scene/tutorial_rotate.lua b/assets/scene/tutorial_rotate.lua
@@ -3,7 +3,7 @@ local level,score
 local time,totalTime
 local protect -- Prevent punishment 90 when need 180 for one time
 local handID,handMat,targetMat
-local texts
+local texts ---@type Zenitha.Text
 
 --[[ Levels
     1~40:    R/L(+F after 20)
@@ -101,7 +101,8 @@ local function endGame(passLevel)
     texts:add{
         text=passLevel==0 and Text.tutorial_notpass or Text.tutorial_pass,
         color=({[0]=COLOR.lR,COLOR.lG,COLOR.lB,COLOR.lY})[passLevel],
-        fontSize=80,
+        fontSize=40,
+        k=1.5,
         fontType='bold',
         style='beat',
         styleArg=1,

diff --git a/assets/scene/tutorial_shape.lua b/assets/scene/tutorial_shape.lua
@@ -2,7 +2,7 @@ local level,score
 local time,totalTime
 local noControl
 local quest,choices
-local texts
+local texts ---@type Zenitha.Text
 
 --[[ Levels
     1~40:    R/L(+F after 20)
@@ -114,7 +114,8 @@ local function endGame(passLevel)
     texts:add{
         text=passLevel==0 and Text.tutorial_notpass or Text.tutorial_pass,
         color=({[0]=COLOR.lR,COLOR.lG,COLOR.lY})[passLevel],
-        fontSize=80,
+        fontSize=40,
+        k=1.5,
         fontType='bold',
         style='beat',
         styleArg=1,