From c168a6c6858962d46559d648c97ef3a8127874e1 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 10 Aug 2021 03:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/app_dtw.lua | 16 ++++++------- parts/scenes/main.lua | 16 ++++++------- parts/scenes/pause.lua | 44 +++++++++++++++++----------------- parts/scenes/setting_video.lua | 32 +++++++++++++------------ 4 files changed, 55 insertions(+), 53 deletions(-) diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 2a5173fd..088ed9ed 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -233,15 +233,15 @@ function scene.draw() gc.rectangle('fill',300,0,680,720) gc.setColor(tileColor[mode]) gc.push('transform') - gc.translate(0,720-height+8) - for i=1,#pos do - if pos[i]<10 then - gc.rectangle('fill',130+170*pos[i]+8,-i*120,170-16,120-16) - else - gc.rectangle('fill',130+170*(pos[i]%10)+8,-i*120,170-16,120-16) - gc.rectangle('fill',130+170*int(pos[i]/10)+8,-i*120,170-16,120-16) - end + gc.translate(0,720-height+8) + for i=1,#pos do + if pos[i]<10 then + gc.rectangle('fill',130+170*pos[i]+8,-i*120,170-16,120-16) + else + gc.rectangle('fill',130+170*(pos[i]%10)+8,-i*120,170-16,120-16) + gc.rectangle('fill',130+170*int(pos[i]/10)+8,-i*120,170-16,120-16) end + end gc.pop() --Draw track line diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 44fe8bfb..b1980e57 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -156,14 +156,14 @@ function scene.draw() --Tip gc.setColor(COLOR.Z) gc.push('transform') - gc.translate(260,650) - gc.setLineWidth(2) - gc.rectangle('line',0,0,tipLength,42,3) - gc.stencil(tipStencil) - gc.setStencilTest('equal',1) - gc.draw(tip,0+scrollX,0) - gc.setColor(1,1,1,.2) - gc.setStencilTest() + gc.translate(260,650) + gc.setLineWidth(2) + gc.rectangle('line',0,0,tipLength,42,3) + gc.stencil(tipStencil) + gc.setStencilTest('equal',1) + gc.draw(tip,0+scrollX,0) + gc.setColor(1,1,1,.2) + gc.setStencilTest() gc.pop() --Player diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 8b3b6751..f611bd95 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -308,30 +308,30 @@ function scene.draw() --Mods gc.push('transform') - gc.translate(131,600) - gc.scale(.65) - if #GAME.mod>0 then - gc.setLineWidth(2) - if scoreValid()then - gc.setColor(.7,.7,.7,T) - gc.rectangle('line',-5,-5,500,150,8) - gc.setColor(.7,.7,.7,T*.05) - gc.rectangle('fill',-5,-5,500,150,8) - else - gc.setColor(.8,0,0,T) - gc.rectangle('line',-5,-5,500,150,8) - gc.setColor(1,0,0,T*.05) - gc.rectangle('fill',-5,-5,500,150,8) - end - setFont(35) - for _,M in next,MODOPT do - if M.sel>0 then - _=M.color - gc.setColor(_[1],_[2],_[3],T) - mStr(M.id,35+M.no%8*60,math.floor(M.no/8)*45) - end + gc.translate(131,600) + gc.scale(.65) + if #GAME.mod>0 then + gc.setLineWidth(2) + if scoreValid()then + gc.setColor(.7,.7,.7,T) + gc.rectangle('line',-5,-5,500,150,8) + gc.setColor(.7,.7,.7,T*.05) + gc.rectangle('fill',-5,-5,500,150,8) + else + gc.setColor(.8,0,0,T) + gc.rectangle('line',-5,-5,500,150,8) + gc.setColor(1,0,0,T*.05) + gc.rectangle('fill',-5,-5,500,150,8) + end + setFont(35) + for _,M in next,MODOPT do + if M.sel>0 then + _=M.color + gc.setColor(_[1],_[2],_[3],T) + mStr(M.id,35+M.no%8*60,math.floor(M.no/8)*45) end end + end gc.pop() end diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index b6d562e9..242f2aad 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -10,24 +10,26 @@ local fakePlayer={cur={bk={{true}},skinLib=nil},curX=0,ghoY=0} function scene.draw() local L=SKIN.lib[SETTING.skinSet] fakePlayer.skinLib=L + gc.push('transform') - gc.translate(720,149-WIDGET.scrollPos) - gc.scale(2) - gc.setColor(1,1,1) - PLY.draw.drawGhost[SETTING.ghostType](fakePlayer,math.floor(TIME()*3)%16+1,SETTING.ghost) + gc.translate(720,149-WIDGET.scrollPos) + gc.scale(2) + gc.setColor(1,1,1) + PLY.draw.drawGhost[SETTING.ghostType](fakePlayer,math.floor(TIME()*3)%16+1,SETTING.ghost) gc.pop() + gc.push('transform') - gc.setColor(1,1,1) - local T=L[1] - gc.translate(0,1410-WIDGET.scrollPos) - gc.setShader(SHADER.blockSatur) - gc.draw(T,435,0)gc.draw(T,465,0)gc.draw(T,465,30)gc.draw(T,495,30) - gc.setShader(SHADER.fieldSatur) - for i=1,8 do - gc.draw(L[i],330+30*i,100) - gc.draw(L[i+8],330+30*i,130) - end - gc.setShader() + gc.setColor(1,1,1) + local T=L[1] + gc.translate(0,1410-WIDGET.scrollPos) + gc.setShader(SHADER.blockSatur) + gc.draw(T,435,0)gc.draw(T,465,0)gc.draw(T,465,30)gc.draw(T,495,30) + gc.setShader(SHADER.fieldSatur) + for i=1,8 do + gc.draw(L[i],330+30*i,100) + gc.draw(L[i+8],330+30*i,130) + end + gc.setShader() gc.pop() end