From b61a1270e93e22a8e1bdd0f974d33e4c16fb2448 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 17 Nov 2021 16:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BD=8D=E7=BD=AE=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=BC=80=E5=90=AF=E5=90=8Ehold=E7=9A=84=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BD=8D=E7=BD=AE=E4=B9=9F=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 2 +- parts/language/lang_es.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_pt.lua | 2 +- parts/language/lang_zh_grass.lua | 2 +- parts/player/draw.lua | 17 +++++++++++++++-- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 5e8eb1a1..5a3103e6 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -368,7 +368,7 @@ return{ score="Score Pop-Ups", bufferWarn="Buffer Alerts", showSpike="Spike Counter", - nextPos="Next Preview", + nextPos="Spawn Preview", highCam="Screen Scrolling", warn="Danger Alerts", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 092af859..430c14bb 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -335,7 +335,7 @@ return{ score="Puntaje en Pantalla", bufferWarn="Alerta de Búfer", showSpike="Contador de Spike", - nextPos="Ver Spawn de Pza. Sig.", + -- nextPos="Spawn Preview", highCam="Cám. Vista Aérea", warn="Alerta de Peligro", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 7b866052..95d31302 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -333,7 +333,7 @@ return{ score="Pop-up de score", -- bufferWarn="Buffer Alert", -- showSpike="Spike Counter", - nextPos="Prévisualisation de position", + -- nextPos="Spawn Preview", highCam="Vue d'oiseau", warn="Alerte de danger", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 11675aed..ec34679c 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -357,7 +357,7 @@ return{ score="Pop-up de pontos", -- bufferWarn="Buffer Alert", -- showSpike="Spike Counter", - nextPos="Próxima Pos.", + -- nextPos="Spawn Preview", highCam="Vista Olho-de-pássaro", warn="Alerta de perigo", diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 340f916b..7056919e 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -367,7 +367,7 @@ return{ score="分数弹出", bufferWarn="缓冲区警报", showSpike="尖峰计数器", - nextPos="下次预览", + nextPos="繁殖预览", highCam="屏幕滚动", warn="危险警报", diff --git a/parts/player/draw.lua b/parts/player/draw.lua index aa43b836..369d2bf2 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -360,6 +360,18 @@ local function _drawNextPreview(B,fieldH,fieldBeneath) end end end end +local function _drawHoldPreview(B,fieldH,fieldBeneath) + gc_setColor(1,1,1,.3) + local y=int(fieldH+1-modf(B.RS.centerPos[B.id][B.dir][1]))+ceil(fieldBeneath/30)+.14 + B=B.bk + local x=int(6-#B[1]*.5) + local cross=TEXTURE.puzzleMark[-1] + for i=1,#B do for j=1,#B[1]do + if B[i][j]then + gc_draw(cross,30*(x+j-2),30*(1-y-i)) + end + end end +end local function _drawBuffer(atkBuffer,bufferWarn,atkBufferSum1,atkBufferSum) local h=0 for i=1,#atkBuffer do @@ -807,8 +819,9 @@ function draw.norm(P,repMode) end --Draw next preview - if ENV.nextPos and P.nextQueue[1]then - _drawNextPreview(P.nextQueue[1],ENV.fieldH,P.fieldBeneath) + if ENV.nextPos then + if P.nextQueue[1]then _drawNextPreview(P.nextQueue[1],ENV.fieldH,P.fieldBeneath)end + if P.holdQueue[1]then _drawHoldPreview(P.holdQueue[1],ENV.fieldH,P.fieldBeneath)end end --Draw AI's drop destination