From 32a7035a90302cf95a2b882aad7761c109d8ca9b Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 30 May 2021 15:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=A0=E5=A4=84ui=E5=B0=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/init.lua | 3 ++- Zframework/widget.lua | 12 ++++++------ parts/player/draw.lua | 10 +++++----- parts/scenes/net_menu.lua | 4 ++-- parts/scenes/pause.lua | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Zframework/init.lua b/Zframework/init.lua index 34d5b36f..9530d244 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -571,6 +571,7 @@ function love.run() FCT=FCT-100 gc_replaceTransform(SCR.origin) + gc_setColor(1,1,1) BG.draw() gc_replaceTransform(SCR.xOy) if SCN.draw then SCN.draw()end @@ -588,7 +589,7 @@ function love.run() gc_setColor(1,1,1) gc_draw(ms.isDown(1)and cursor_holdImg or cursorImg,mx,my,nil,nil,nil,8,8) end - + gc_replaceTransform(SCR.xOy_ul) --Draw power info. if SETTING.powerInfo then gc_setColor(1,1,1) diff --git a/Zframework/widget.lua b/Zframework/widget.lua index 346ccd8a..025a1370 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -20,9 +20,9 @@ local xOy=SCR.xOy local downArrowIcon=DOGC{40,25,{'fPoly',0,0,20,25,40,0}} local upArrowIcon=DOGC{40,25,{'fPoly',0,25,20,0,40,25}} local clearIcon=DOGC{40,40, - {'fRect',16,5,8,2}, - {'fRect',8,7,24,2}, - {'fRect',12,11,18,24}, + {'fRect',16,5,8,3}, + {'fRect',8,8,24,3}, + {'fRect',11,14,18,21}, } local sureIcon=DOGC{40,40, {'setFT',35}, @@ -960,12 +960,12 @@ function textBox:draw() end --Background - gc_setColor(0,0,0,.3) + gc_setColor(0,0,0,.4) gc_rectangle('fill',x,y,w,h) --Frame gc_setLineWidth(4) - gc_setColor(1,1,WIDGET.sel==self and 0 or 1) + gc_setColor(1,1,WIDGET.sel==self and .8 or 1) gc_rectangle('line',x,y,w,h) --Slider @@ -1280,7 +1280,7 @@ function WIDGET.draw() gc_draw(widgetCover,nil,nil,nil,scr_w,scr_h/360) end gc_setCanvas() - gc_setBlendMode('lighten','premultiplied') + gc_setBlendMode('alpha','premultiplied') gc_draw(widgetCanvas) gc_setBlendMode('alpha') gc_replaceTransform(SCR.xOy) diff --git a/parts/player/draw.lua b/parts/player/draw.lua index fe289427..fe21a2ef 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -207,8 +207,8 @@ local function drawFXs(P) gc_rectangle('fill',150-x*150,15-S[1]*30-y*15,300*x,y*30) end end -local function drawGhost(P,clr) - gc_setColor(1,1,1,P.gameEnv.ghost) +local function drawGhost(P,clr,alpha) + gc_setColor(1,1,1,alpha) local texture=SKIN.curText local CB=P.cur.bk for i=1,#CB do for j=1,#CB[1]do @@ -612,9 +612,9 @@ function draw.norm(P) --Draw ghost & rotation center if ENV.ghost then - drawGhost(P,curColor) + drawGhost(P,curColor,ENV.ghost) if ENV.center then - gc_setColor(1,1,1,trans*ENV.center) + gc_setColor(1,1,1,ENV.center) gc_draw(spinCenterImg,centerX,-30*(P.ghoY+P.cur.sc[1])+15,nil,nil,nil,4,4) end end @@ -820,7 +820,7 @@ function draw.demo(P) drawField(P) drawFXs(P) if P.cur and P.waiting==-1 then - if ENV.ghost then drawGhost(P,curColor)end + if ENV.ghost then drawGhost(P,curColor,ENV.ghost)end if ENV.block then local dy=ENV.smooth and P.ghoY~=P.curY and(P.dropDelay/ENV.drop-1)*30 or 0 gc_translate(0,-dy) diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index 337fe0d8..68feedc5 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -17,8 +17,8 @@ end scene.widgetList={ WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene'setting_game'}, - WIDGET.newButton{name="league", x=640, y=180,w=350,h=120,font=40,color='dH',code=goScene'net_league'}, - WIDGET.newButton{name="ffa", x=640, y=360,w=350,h=120,font=40,color='dH',code=function()NET.enterRoom({name="ffa"})end}, + WIDGET.newButton{name="league", x=640, y=180,w=350,h=120,font=40,color='D',code=goScene'net_league'}, + WIDGET.newButton{name="ffa", x=640, y=360,w=350,h=120,font=40,color='D',code=function()LOG.print("Coming soon 开发中,敬请期待")--[[NET.enterRoom({name="ffa"})]]end}, WIDGET.newButton{name="rooms", x=640, y=540,w=350,h=120,font=40,code=goScene'net_rooms'}, WIDGET.newButton{name="logout", x=880, y=40,w=180,h=60,color='dR', code=function() diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index c6259914..10ec2cbc 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -6,7 +6,7 @@ local setFont,mStr=setFont,mStr local fnsRankColor={ Z=COLOR.lY, - S=COLOR.lG, + S=COLOR.lH, A=COLOR.N, B=COLOR.lG, C=COLOR.M,