SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

进度显示器移入常用玩家draw函数并微调

Browse Source
This commit is contained in:
MrZ626
2021-08-06 09:58:26 +08:00
parent a21d6e834d
commit 998c79d331
14 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
parts/modes/classic_fast.lua
View File

@@ -38,10 +38,7 @@ return{
local r=P.modeData.target*.1
mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),69,210)
mText(drawableText.speedLV,69,290)
setFont(45)
mStr(P.stat.row,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
end,
score=function(P)return{P.stat.score,P.stat.row}end,
scoreDisp=function(D)return D[1].." "..D[2].." Lines"end,

5
parts/modes/marathon_bfmax.lua
View File

@@ -36,10 +36,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
PLY.draw.drawTargetLine(P,200-P.stat.row)
end,
getRank=function(P)

5
parts/modes/marathon_h.lua
View File

@@ -27,10 +27,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
PLY.draw.drawTargetLine(P,200-P.stat.row)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,

5
parts/modes/marathon_n.lua
View File

@@ -24,10 +24,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
PLY.draw.drawTargetLine(P,200-P.stat.row)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,

5
parts/modes/master_final.lua
View File

@@ -58,10 +58,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.pt,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
end,
score=function(P)return{P.modeData.pt,P.stat.time}end,
scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end,

5
parts/modes/master_h.lua
View File

@@ -74,10 +74,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.pt,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
end,
score=function(P)return{P.modeData.pt,P.stat.time}end,
scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end,

5
parts/modes/master_l.lua
View File

@@ -60,10 +60,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.pt,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
end,
score=function(P)return{P.modeData.pt,P.stat.time}end,
scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end,

5
parts/modes/master_n.lua
View File

@@ -74,10 +74,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.pt,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
end,
score=function(P)return{P.modeData.pt,P.stat.time}end,
scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end,

5
parts/modes/master_ph.lua
View File

@@ -147,10 +147,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.pt,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
end,
score=function(P)return{P.result=='win'and 260 or P.modeData.pt,P.stat.time}end,
scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end,

5
parts/modes/master_u.lua
View File

@@ -69,10 +69,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.pt,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.modeData.pt,P.modeData.target)
end,
score=function(P)return{P.modeData.pt,P.stat.time}end,
scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end,

5
parts/modes/rhythm_e.lua
View File

@@ -45,10 +45,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
setFont(30)
mStr(P.modeData.bpm,69,178)

5
parts/modes/rhythm_h.lua
View File

@@ -45,10 +45,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
setFont(30)
mStr(P.modeData.bpm,69,178)

5
parts/modes/rhythm_u.lua
View File

@@ -51,10 +51,7 @@ return{
},
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,320)
mStr(P.modeData.target,69,370)
gc.rectangle('fill',25,375,90,4)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
setFont(30)
mStr(P.modeData.bpm,69,178)

13
parts/player/draw.lua
View File

@@ -409,6 +409,7 @@ local function drawHold(P)
local N=ENV.holdCount*72
gc_push('transform')
gc_translate(12,20)
gc_setLineWidth(2)
gc_setColor(0,0,0,.4)gc_rectangle('fill',0,0,100,N+8,5)
gc_setColor(.97,.97,.975)gc_rectangle('line',0,0,100,N+8,5)
N=#holdQueue<ENV.holdCount and P.nextQueue[1]and 1 or P.holdTime+1
@@ -539,6 +540,7 @@ function draw.drawNext_norm(P)
local ENV=P.gameEnv
local texture=P.skinLib
gc_translate(488,20)
gc_setLineWidth(2)
local N=ENV.nextCount*72
gc_setColor(0,0,0,.4)gc_rectangle('fill',0,0,100,N+8,5)
gc_setColor(.97,.97,.975)gc_rectangle('line',0,0,100,N+8,5)
@@ -575,6 +577,7 @@ function draw.drawNext_hidden(P)
local ENV=P.gameEnv
local texture=P.skinLib
gc_translate(476,20)
gc_setLineWidth(2)
local N=ENV.nextCount*72
gc_setColor(.5,0,0,.4)gc_rectangle('fill',0,0,124,N+8)
gc_setColor(.97,.97,.975)gc_rectangle('line',0,0,124,N+8)
@@ -619,6 +622,12 @@ function draw.drawTargetLine(P,r)
gc_pop()
end
end
function draw.drawProgress(s1,s2)
setFont(40)
mStr(s1,62,322)
mStr(s2,62,376)
gc.rectangle('fill',24,375,76,4)
end
function draw.norm(P)
local ENV=P.gameEnv
@@ -729,7 +738,6 @@ function draw.norm(P)
gc_pop()
gc_setStencilTest()
gc_setLineWidth(2)
drawBuffer(P)
drawB2Bbar(P)
drawLDI(P,ENV)
@@ -795,13 +803,12 @@ function draw.norm(P)
-- gc_line(0,600-P.garbageBeneath*30,300,600-P.garbageBeneath*30)
gc_pop()
gc_setLineWidth(2)
P:drawNext()
drawHold(P)
--Mode informations
if GAME.curMode.mesDisp then
gc_setColor(1,1,1)
gc_setColor(.97,.97,.97)
GAME.curMode.mesDisp(P)
end