From e6f5723ecc27704de4239a839e3d685e224679b3 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 6 Aug 2021 17:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=B7=B7=E6=88=98=E6=A8=A1=E5=BC=8F=E4=BF=A1=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=87=BD=E6=95=B0=E7=A7=BB=E5=85=A5=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=9F=E4=B8=80=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/modes/techmino49_e.lua | 14 +------------- parts/modes/techmino49_h.lua | 14 +------------- parts/modes/techmino49_u.lua | 14 +------------- parts/modes/techmino99_e.lua | 14 +------------- parts/modes/techmino99_h.lua | 14 +------------- parts/modes/techmino99_u.lua | 14 +------------- parts/player/draw.lua | 17 +++++++++++++++++ 7 files changed, 23 insertions(+), 78 deletions(-) diff --git a/parts/modes/techmino49_e.lua b/parts/modes/techmino49_e.lua index 22d9f059..78fbab3e 100644 --- a/parts/modes/techmino49_e.lua +++ b/parts/modes/techmino49_e.lua @@ -54,19 +54,7 @@ return{ end end end, mesDisp=function(P) - setFont(35) - mStr(#PLY_ALIVE.."/49",69,175) - mStr(P.modeData.ko,80,215) - gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222) - setFont(20) - gc.setColor(1,.5,0,.6) - gc.print(P.badge,103,227) - gc.setColor(1,1,1) - setFont(25) - gc.print(text.powerUp[P.strength],18,290) - for i=1,P.strength do - gc.draw(IMG.badgeIcon,16*i+12,260) - end + PLY.draw.drawRoyaleInfo(P) end, score=function(P)return{P.modeData.place,P.modeData.ko}end, scoreDisp=function(D)return"NO."..D[1].." KO:"..D[2]end, diff --git a/parts/modes/techmino49_h.lua b/parts/modes/techmino49_h.lua index e7bb4954..b4197c1e 100644 --- a/parts/modes/techmino49_h.lua +++ b/parts/modes/techmino49_h.lua @@ -54,19 +54,7 @@ return{ end end end, mesDisp=function(P) - setFont(35) - mStr(#PLY_ALIVE.."/49",69,175) - mStr(P.modeData.ko,80,215) - gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222) - setFont(20) - gc.setColor(1,.5,0,.6) - gc.print(P.badge,103,227) - gc.setColor(1,1,1) - setFont(25) - gc.print(text.powerUp[P.strength],18,290) - for i=1,P.strength do - gc.draw(IMG.badgeIcon,16*i+12,260) - end + PLY.draw.drawRoyaleInfo(P) end, score=function(P)return{P.modeData.place,P.modeData.ko}end, scoreDisp=function(D)return"NO."..D[1].." KO:"..D[2]end, diff --git a/parts/modes/techmino49_u.lua b/parts/modes/techmino49_u.lua index e147f838..0264f5ef 100644 --- a/parts/modes/techmino49_u.lua +++ b/parts/modes/techmino49_u.lua @@ -54,19 +54,7 @@ return{ end end end, mesDisp=function(P) - setFont(35) - mStr(#PLY_ALIVE.."/49",69,175) - mStr(P.modeData.ko,80,215) - gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222) - setFont(20) - gc.setColor(1,.5,0,.6) - gc.print(P.badge,103,227) - gc.setColor(1,1,1) - setFont(25) - gc.print(text.powerUp[P.strength],18,290) - for i=1,P.strength do - gc.draw(IMG.badgeIcon,16*i+12,260) - end + PLY.draw.drawRoyaleInfo(P) end, score=function(P)return{P.modeData.place,P.modeData.ko}end, scoreDisp=function(D)return"NO."..D[1].." KO:"..D[2]end, diff --git a/parts/modes/techmino99_e.lua b/parts/modes/techmino99_e.lua index bdd80d11..c0018b79 100644 --- a/parts/modes/techmino99_e.lua +++ b/parts/modes/techmino99_e.lua @@ -54,19 +54,7 @@ return{ end end end, mesDisp=function(P) - setFont(35) - mStr(#PLY_ALIVE.."/99",69,175) - mStr(P.modeData.ko,80,215) - gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222) - setFont(20) - gc.setColor(1,.5,0,.6) - gc.print(P.badge,103,227) - gc.setColor(1,1,1) - setFont(25) - gc.print(text.powerUp[P.strength],18,290) - for i=1,P.strength do - gc.draw(IMG.badgeIcon,16*i+12,260) - end + PLY.draw.drawRoyaleInfo(P) end, score=function(P)return{P.modeData.place,P.modeData.ko}end, scoreDisp=function(D)return"NO."..D[1].." KO:"..D[2]end, diff --git a/parts/modes/techmino99_h.lua b/parts/modes/techmino99_h.lua index 9e6a3080..feecfaea 100644 --- a/parts/modes/techmino99_h.lua +++ b/parts/modes/techmino99_h.lua @@ -54,19 +54,7 @@ return{ end end end, mesDisp=function(P) - setFont(35) - mStr(#PLY_ALIVE.."/99",69,175) - mStr(P.modeData.ko,80,215) - gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222) - setFont(20) - gc.setColor(1,.5,0,.6) - gc.print(P.badge,103,227) - gc.setColor(1,1,1) - setFont(25) - gc.print(text.powerUp[P.strength],18,290) - for i=1,P.strength do - gc.draw(IMG.badgeIcon,16*i+12,260) - end + PLY.draw.drawRoyaleInfo(P) end, score=function(P)return{P.modeData.place,P.modeData.ko}end, scoreDisp=function(D)return"NO."..D[1].." KO:"..D[2]end, diff --git a/parts/modes/techmino99_u.lua b/parts/modes/techmino99_u.lua index 6ed61432..edee6ecc 100644 --- a/parts/modes/techmino99_u.lua +++ b/parts/modes/techmino99_u.lua @@ -54,19 +54,7 @@ return{ end end end, mesDisp=function(P) - setFont(35) - mStr(#PLY_ALIVE.."/99",69,175) - mStr(P.modeData.ko,80,215) - gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222) - setFont(20) - gc.setColor(1,.5,0,.6) - gc.print(P.badge,103,227) - gc.setColor(1,1,1) - setFont(25) - gc.print(text.powerUp[P.strength],18,290) - for i=1,P.strength do - gc.draw(IMG.badgeIcon,16*i+12,260) - end + PLY.draw.drawRoyaleInfo(P) end, score=function(P)return{P.modeData.place,P.modeData.ko}end, scoreDisp=function(D)return"NO."..D[1].." KO:"..D[2]end, diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 54cb065e..8953373a 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -628,6 +628,22 @@ function draw.drawProgress(s1,s2) mStr(s2,62,376) gc.rectangle('fill',24,375,76,4) end +function draw.drawRoyaleInfo(P) + setFont(35) + mStr(#PLY_ALIVE.."/"..#PLAYERS,69,175) + mStr(P.modeData.ko,80,215) + gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222) + setFont(20) + gc.setColor(1,.5,0,.6) + gc.print(P.badge,103,227) + gc.setColor(.97,.97,.97) + setFont(25) + gc.print(text.powerUp[P.strength],18,290) + gc.setColor(1,1,1) + for i=1,P.strength do + gc.draw(IMG.badgeIcon,16*i+12,260) + end +end function draw.norm(P) local ENV=P.gameEnv @@ -754,6 +770,7 @@ function draw.norm(P) end gc_setColor(1,1,1,P.swappingAtkMode*.025) setFont(35) + gc_setLineWidth(1) for i=1,4 do gc_rectangle('line',RCPB[2*i-1],RCPB[2*i],90,35,8,4) gc_printf(text.atkModeName[i],RCPB[2*i-1]-4,RCPB[2*i]+4,200,"center",nil,.5)