diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index b16190cd..473036ab 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -33,7 +33,7 @@ function scene.sceneBack() end function scene.update(dt) - curLang=curLang+dt*0.6 + curLang=curLang+dt*1.626 if curLang>=#languages+1 then curLang=1 end @@ -41,9 +41,9 @@ end function scene.draw() setFont(80) - love.graphics.setColor(1,1,1,1-curLang%1) + love.graphics.setColor(1,1,1,1-curLang%1*2) GC.mStr(languages[curLang-curLang%1],640,20) - love.graphics.setColor(1,1,1,curLang%1) + love.graphics.setColor(1,1,1,curLang%1*2) GC.mStr(languages[curLang-curLang%1+1]or languages[1],640,20) end @@ -57,18 +57,18 @@ local function _setLang(lid) end scene.widgetList={ - WIDGET.newButton{x=271,y=210,w=346,h=100,font=42, fText=langList.en, color='R',code=function()_setLang('en')end}, - WIDGET.newButton{x=271,y=329,w=346,h=100,font=42, fText=langList.fr, color='F',code=function()_setLang('fr')end}, - WIDGET.newButton{x=271,y=508,w=346,h=220,font=42, fText=langList.es,color='O',code=function()_setLang('es')end}, + WIDGET.newButton{x=271,y=210,w=346,h=100,font=40, fText=langList.en, color='R',code=function()_setLang('en')end}, + WIDGET.newButton{x=271,y=329,w=346,h=100,font=40, fText=langList.fr, color='F',code=function()_setLang('fr')end}, + WIDGET.newButton{x=271,y=508,w=346,h=220,font=40, fText=langList.es, color='O',code=function()_setLang('es')end}, - WIDGET.newButton{x=637,y=210,w=346,h=100,font=42, fText=langList.pt, color='G',code=function()_setLang('pt')end}, - WIDGET.newButton{x=637,y=329,w=346,h=100,font=42, fText=langList.symbol, color='J',code=function()_setLang('symbol')end}, - WIDGET.newButton{x=637,y=449,w=346,h=100,font=42,fText=langList.zh_yygq, color='L',code=function()_setLang('zh_yygq')end}, - WIDGET.newButton{x=637,y=568,w=346,h=100,font=42, fText=langList.zh_grass, color='Y',code=function()_setLang('zh_grass')end}, + WIDGET.newButton{x=637,y=210,w=346,h=100,font=40, fText=langList.pt, color='G',code=function()_setLang('pt')end}, + WIDGET.newButton{x=637,y=329,w=346,h=100,font=40, fText=langList.symbol, color='J',code=function()_setLang('symbol')end}, + WIDGET.newButton{x=637,y=449,w=346,h=100,font=40, fText=langList.zh_yygq, color='L',code=function()_setLang('zh_yygq')end}, + WIDGET.newButton{x=637,y=568,w=346,h=100,font=40, fText=langList.zh_grass,color='Y',code=function()_setLang('zh_grass')end}, - WIDGET.newButton{x=1003,y=210,w=346,h=100,font=42,fText=langList.zh, color='B',code=function()_setLang('zh')end}, - WIDGET.newButton{x=1003,y=329,w=346,h=100,font=42, fText=langList.zh_full, color='S',code=function()_setLang('zh_full')end}, - WIDGET.newButton{x=1003,y=449,w=346,h=100,font=42,fText=langList.zh_trad, color='N',code=function()_setLang('zh_trad')end}, + WIDGET.newButton{x=1003,y=210,w=346,h=100,font=40,fText=langList.zh, color='B',code=function()_setLang('zh')end}, + WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_full, color='S',code=function()_setLang('zh_full')end}, + WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='N',code=function()_setLang('zh_trad')end}, WIDGET.newButton{name='back',x=1003,y=568,w=346,h=100,font=60,fText=CHAR.icon.back,code=backScene}, } diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 812a62c9..b000b44e 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -36,8 +36,8 @@ function scene.sceneInit(org) ("%d(%d) %.2fLPM"):format(S.row,S.dig,S.row/S.time*60), ("%d(%d) %.2fAPM"):format(S.atk,S.digatk,S.atk/S.time*60), ("%d(%d-%d)"):format(S.pend,S.recv,S.recv-S.pend), - ("%d/%d/%d/%d"):format(S.clears[1],S.clears[2],S.clears[3],S.clears[4]), - ("(%d)/%d/%d/%d"):format(S.spins[1],S.spins[2],S.spins[3],S.spins[4]), + ("[1] %-7d[2] %-7d[3] %-7d[4] %-7d"):format(S.clears[1],S.clears[2],S.clears[3],S.clears[4]), + (CHAR.icon.num0InSpin.." %-8d"..CHAR.icon.num1InSpin.." %-8d"..CHAR.icon.num2InSpin.." %-8d"..CHAR.icon.num3InSpin.." %-8d"):format(S.spins[1],S.spins[2],S.spins[3],S.spins[4]), ("%d/%d ; %d/%d"):format(S.b2b,S.b3b,S.pc,S.hpc), ("%d/%dx/%.2f%%"):format(S.extraPiece,S.maxFinesseCombo,S.finesseRate*20/S.piece), }