From f1068eacd89b19c8c79d315c7a6602e6a6f19076 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 21 Sep 2021 22:49:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=AD=A3=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E6=95=B4=E7=90=86=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8A=8AFONT.set=E6=89=93=E6=88=90FONT.get=20close=20?= =?UTF-8?q?#312?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/app_15p.lua | 4 ++-- parts/scenes/app_AtoZ.lua | 6 +++--- parts/scenes/app_UTTT.lua | 2 +- parts/scenes/app_arithmetic.lua | 6 +++--- parts/scenes/app_calc.lua | 4 ++-- parts/scenes/app_cannon.lua | 2 +- parts/scenes/app_pong.lua | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index f6a7b9ee..76b7cfa1 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -258,7 +258,7 @@ local backColor={ },--Black } function scene.draw() - FONT.get(40) + FONT.set(40) gc.setColor(COLOR.Z) gc.print(("%.3f"):format(time),1026,80) gc.setColor(1,.8,.8) @@ -282,7 +282,7 @@ function scene.draw() gc.setLineWidth(4) local mono=invis and state==1 - FONT.get(80) + FONT.set(80) for i=1,4 do for j=1,4 do if cx~=j or cy~=i then diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index f97f8603..8cc64203 100644 --- a/parts/scenes/app_AtoZ.lua +++ b/parts/scenes/app_AtoZ.lua @@ -82,7 +82,7 @@ function scene.update() end function scene.draw() - FONT.get(40) + FONT.set(40) gc.setColor(COLOR.Z) gc.print(("%.3f"):format(time),1026,80) gc.print(mistake,1026,150) @@ -99,7 +99,7 @@ function scene.draw() gc.setColor(.2,.8,.2)--ready end - FONT.get(100) + FONT.set(100) GC.mStr(state==1 and #targetString-progress+1 or state==0 and"Ready"or state==2 and"Win",640,200) gc.setColor(COLOR.Z) @@ -107,7 +107,7 @@ function scene.draw() gc.print(targetString:sub(progress+1),310,380) gc.setColor(1,1,1,.7) - FONT.get(40) + FONT.set(40) gc.print(targetString,120,520) end diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index f9003824..e76bc103 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -171,7 +171,7 @@ function scene.draw() if gameover then --Draw result - FONT.get(60) + FONT.set(60) if gameover==0 then gc.setColor(1,.6,.6) mStr("RED\nWON",1140,200) diff --git a/parts/scenes/app_arithmetic.lua b/parts/scenes/app_arithmetic.lua index 31b414ed..01265ae0 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -189,15 +189,15 @@ function scene.update(dt) end end function scene.draw() - FONT.get(35) + FONT.set(35) gc.setColor(COLOR.Z) GC.mStr("["..level.."]",640,30) - FONT.get(100) + FONT.set(100) if type(question)=='table'then gc.setColor(1,1,1)end GC.mStr(question,640,60) - FONT.get(80) + FONT.set(80) gc.setColor(1,1,1,inputTime) GC.mStr(input,640,160) end diff --git a/parts/scenes/app_calc.lua b/parts/scenes/app_calc.lua index 572f86c3..13089988 100644 --- a/parts/scenes/app_calc.lua +++ b/parts/scenes/app_calc.lua @@ -114,10 +114,10 @@ function scene.draw() gc.setColor(COLOR.Z) gc.setLineWidth(2) gc.rectangle('line',100,80,650,150,5) - FONT.get(45) + FONT.set(45) if reg then gc.printf(reg,0,100,720,'right')end if val then gc.printf(val,0,150,720,'right')end - if sym then FONT.get(50)gc.print(sym,126,150)end + if sym then FONT.set(50)gc.print(sym,126,150)end end scene.widgetList={ diff --git a/parts/scenes/app_cannon.lua b/parts/scenes/app_cannon.lua index 2d72bb49..02443384 100644 --- a/parts/scenes/app_cannon.lua +++ b/parts/scenes/app_cannon.lua @@ -103,7 +103,7 @@ function scene.draw() end --Info - FONT.get(40) + FONT.set(40) if combo>1 then gc.setColor(1,1,.6) gc.print("x"..combo,300,80) diff --git a/parts/scenes/app_pong.lua b/parts/scenes/app_pong.lua index aef286fc..e3b22064 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -152,7 +152,7 @@ end function scene.draw() --Draw score gc.setColor(.4,.4,.4) - FONT.get(100) + FONT.set(100) GC.mStr(p1.score,470,20) GC.mStr(p2.score,810,20)