From bb81429130c2a4e8888998ae227d843917a0f558 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 27 Oct 2020 13:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=B3=E5=8D=A1=E8=AF=84=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LANG/lang_en.lua | 1 - LANG/lang_symbol.lua | 1 - LANG/lang_zh.lua | 1 - parts/player.lua | 2 +- parts/scenes.lua | 20 +++++++++++++------- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/LANG/lang_en.lua b/LANG/lang_en.lua index bcde95bb..924bd8cc 100644 --- a/LANG/lang_en.lua +++ b/LANG/lang_en.lua @@ -49,7 +49,6 @@ return{ unlockSavingError="Failed to save unlocked content:", recSavingError="Failed to save record:", switchSpawnSFX="Switch on spawn SFX to play", - getRank="Rank: ", ranks={"D","C","B","A","S"}, needRestart="Effective after restart", diff --git a/LANG/lang_symbol.lua b/LANG/lang_symbol.lua index 424b66e1..1e31c308 100644 --- a/LANG/lang_symbol.lua +++ b/LANG/lang_symbol.lua @@ -49,7 +49,6 @@ return{ unlockSavingError="x!:", recSavingError="x!:", switchSpawnSFX="Switch on spawn SFX to play", - getRank="#:", ranks={"D","C","B","A","S"}, needRestart="!!*#R#*!!", diff --git a/LANG/lang_zh.lua b/LANG/lang_zh.lua index 2f3213a1..5b8e0ae6 100644 --- a/LANG/lang_zh.lua +++ b/LANG/lang_zh.lua @@ -49,7 +49,6 @@ return{ unlockSavingError="解锁保存失败:", recSavingError="纪录保存失败:", switchSpawnSFX="请开启方块出生音效", - getRank="本局评级:", ranks={"D","C","B","A","S"}, needRestart="重新开始以生效", diff --git a/parts/player.lua b/parts/player.lua index 523b543f..6ababd27 100644 --- a/parts/player.lua +++ b/parts/player.lua @@ -2563,7 +2563,7 @@ local function gameOver()--Save record needSave=true end if R>0 then - LOG.print(text.getRank..text.ranks[R],color.green) + GAME.rank=text.ranks[R] if M.unlock then for i=1,#M.unlock do local m=M.unlock[i] diff --git a/parts/scenes.lua b/parts/scenes.lua index d70f4190..9a0912bb 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -1338,20 +1338,20 @@ do--pause setFont(25) if GAME.pauseCount>0 then gc.setColor(1,.4,.4,T) - gc.print(text.pauseCount..":["..GAME.pauseCount.."] "..format("%.2f",GAME.pauseTime).."s",70,100) + gc.print(text.pauseCount..":["..GAME.pauseCount.."] "..format("%.2f",GAME.pauseTime).."s",40,160) end gc.setColor(1,1,1,T) - --Mode Info - _=drawableText.modeName - gc.draw(_,40,170) - gc.draw(drawableText.levelName,60+_:getWidth(),170) - --Result Text setFont(35) mText(GAME.result and drawableText[GAME.result]or drawableText.pause,640,50-10*(5-sceneTemp.timer*.1)^1.5) + --Mode Info + _=drawableText.modeName + gc.draw(_,40,200) + gc.draw(drawableText.levelName,60+_:getWidth(),200) + --Infos if GAME.frame>180 then _=S.list @@ -1362,7 +1362,13 @@ do--pause end end - --rank & trophy + --Level rank + if GAME.rank then + setFont(80) + gc.print(GAME.rank,50,10,nil,1.6) + end + + --Finesse rank & trophy if S.rank then setFont(60) gc.setColor(S.rankColor[1],S.rankColor[2],S.rankColor[3],T)