From 22b61bc9c3fc54925a0aa39e5ee9d07fec95f0aa Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 2 Dec 2021 00:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9A=82=E5=81=9C=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=BA>=3D180=E5=B8=A7=E8=80=8C=E4=B8=8D=E6=98=AF>180?= =?UTF-8?q?=E5=B8=A7=20key=E6=8E=A7=E4=BB=B6=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/widget.lua | 24 +++++++++++------------- parts/scenes/pause.lua | 6 +++--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Zframework/widget.lua b/Zframework/widget.lua index f6a2dc61..f5a0a37c 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -303,17 +303,6 @@ function key:draw() local align=self.align local r,g,b=c[1],c[2],c[3] - --Background - gc_setColor(0,0,0,.3) - gc_rectangle('fill',x,y,w,h,4) - - --Frame - if not self.noFrame then - gc_setColor(.2+r*.8,.2+g*.8,.2+b*.8,.7) - gc_setLineWidth(2) - gc_rectangle('line',x,y,w,h,3) - end - --Fill if self.fShade then gc_setColor(r,g,b,ATV*.25) @@ -325,6 +314,16 @@ function key:draw() gc_draw(self.fShade,x+w-self.edge-self.fShade:getWidth(),y+h*.5-self.fShade:getHeight()*.5) end else + --Background + gc_setColor(0,0,0,.3) + gc_rectangle('fill',x,y,w,h,4) + + --Frame + gc_setColor(.2+r*.8,.2+g*.8,.2+b*.8,.7) + gc_setLineWidth(2) + gc_rectangle('line',x,y,w,h,3) + + --Shade gc_setColor(1,1,1,ATV*.05) gc_rectangle('fill',x,y,w,h,3) end @@ -351,7 +350,7 @@ function key:press(_,_,k) SFX.play('key') end end -function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,noFrame][,color][,font=30][,fType][,sound=true][,align='M'][,edge=0][,code][,hideF][,hide] +function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,color][,font=30][,fType][,sound=true][,align='M'][,edge=0][,code][,hideF][,hide] if not D.h then D.h=D.w end local _={ name= D.name or"_", @@ -371,7 +370,6 @@ function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,noFrame][,color][,fo fText= D.fText, fShade= D.fShade, - noFrame=D.noFrame, color= D.color and(COLOR[D.color]or D.color)or COLOR.Z, font= D.font or 30, fType= D.fType, diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 02f781c7..812a62c9 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -222,7 +222,7 @@ function scene.draw() end --Big info frame - if PLAYERS[1].frameRun>180 then + if PLAYERS[1].frameRun>=180 then gc.push('transform') gc.translate(560,205) gc.setLineWidth(2) @@ -349,12 +349,12 @@ scene.widgetList={ WIDGET.newKey{name='setting', x=290,y=440,w=300,h=70,code=pressKey's',hideF=function()return GAME.fromRepMenu end}, WIDGET.newKey{name='quit', x=290,y=540,w=300,h=70,code=pressKey'q'}, WIDGET.newKey{name='tas', x=290,y=620,w=240,h=50,code=pressKey't',hideF=function()return not SETTING.allowTAS or GAME.tasUsed or GAME.result or GAME.replaying end}, - WIDGET.newKey{name='page_prev',x=500,y=390,w=70,code=pressKey'tab',noFrame=true, + WIDGET.newKey{name='page_prev',x=500,y=390,w=70,code=pressKey'tab', fText=GC.DO{70,70,{'setLW',2}, {'dRPol',33,35,32,3,6,3.142},{'dRPol',45,35,32,3,6,3.142}}, fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRPol',33,35,32,3,6,3.142},{'fRPol',45,35,32,3,6,3.142}}}}, hideF=function()return PLAYERS[1].frameRun<=180 end, }, - WIDGET.newKey{name='page_next',x=1230,y=390,w=70,code=pressKey'Stab',noFrame=true, + WIDGET.newKey{name='page_next',x=1230,y=390,w=70,code=pressKey'Stab', fText=GC.DO{70,70,{'setLW',2}, {'dRPol',37,35,32,3,6},{'dRPol',25,35,32,3,6}}, fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRPol',37,35,32,3,6},{'fRPol',25,35,32,3,6}}}}, hideF=function()return PLAYERS[1].frameRun<=180 end,