圆角圆角圆角圆角圆角

This commit is contained in:
MrZ626
2021-08-08 00:02:07 +08:00
parent a2f0142712
commit 5f8cbe524e
11 changed files with 62 additions and 64 deletions

View File

@@ -595,7 +595,7 @@ do--function drawSelfProfile()
ins(img,{"clear",0,0,0})
ins(img,{"setLW",4})
ins(img,{"setCL",.5,.8,1})
ins(img,{"dRect",2,2,21,21})
ins(img,{"dRect",2,2,21,21,2})
--TODO: draw with lv
img=GC.DO(img)
@@ -612,7 +612,7 @@ do--function drawSelfProfile()
--Draw avatar
gc_setLineWidth(2)
gc_setColor(.3,.3,.3,.8)gc_rectangle('fill',0,0,-300,80)
gc_setColor(1,1,1)gc_rectangle('line',0,0,-300,80)
gc_setColor(1,1,1)gc_rectangle('line',-300,0,300,80,5)
gc_rectangle('line',-73,7,66,66,2)
gc_draw(selfAvatar,-72,8,nil,.5)
@@ -656,10 +656,6 @@ do--function drawWarning()
end
end
end
do--function drawSystemInfo(
--你竟然找到了这里!说明你是真的闲(
--感谢支持Techmino!!!
end

View File

@@ -53,10 +53,10 @@ local spinCenterImg=GC.DO{9,9,
{'setCL',1,1,1},
{'fRect',3,3,3,3},
}
local playerBoarders=GC.DO{334,620,
local playerBoarder=GC.DO{334,620,
{'setLW',2},
{'setCL',.97,.97,.975},
{'dRect',16,1,302,618,7},
{'dRect',16,1,302,618,5},
{'fRect',17,612,300,2},
{'dRect',318,9,15,596,3},
{'dRect',1,9,15,596,3},
@@ -626,7 +626,7 @@ function draw.drawProgress(s1,s2)
setFont(40)
mStr(s1,62,322)
mStr(s2,62,376)
gc.rectangle('fill',24,375,76,4)
gc.rectangle('fill',24,375,76,4,2)
end
function draw.drawRoyaleInfo(P)
setFont(35)
@@ -760,7 +760,7 @@ function draw.norm(P)
--Draw boarders
gc_setColor(P.frameColor)
gc_draw(playerBoarders,-17,-12)
gc_draw(playerBoarder,-17,-12)
--Draw target selecting pad
if GAME.modeEnv.royaleMode then

View File

@@ -85,7 +85,7 @@ end
function scene.draw()
gc.setColor(COLOR.Z)
gc.setLineWidth(2)
gc.rectangle('line',100,80,650,150)
gc.rectangle('line',100,80,650,150,5)
setFont(45)
if reg then gc.printf(reg,0,100,720,'right')end
if val then gc.printf(val,0,150,720,'right')end
@@ -93,25 +93,25 @@ function scene.draw()
end
scene.widgetList={
WIDGET.newKey{name="_1",x=150,y=300,w=90,fText="1",font=50,code=pressKey"1"},
WIDGET.newKey{name="_2",x=250,y=300,w=90,fText="2",font=50,code=pressKey"2"},
WIDGET.newKey{name="_3",x=350,y=300,w=90,fText="3",font=50,code=pressKey"3"},
WIDGET.newKey{name="_4",x=150,y=400,w=90,fText="4",font=50,code=pressKey"4"},
WIDGET.newKey{name="_5",x=250,y=400,w=90,fText="5",font=50,code=pressKey"5"},
WIDGET.newKey{name="_6",x=350,y=400,w=90,fText="6",font=50,code=pressKey"6"},
WIDGET.newKey{name="_7",x=150,y=500,w=90,fText="7",font=50,code=pressKey"7"},
WIDGET.newKey{name="_8",x=250,y=500,w=90,fText="8",font=50,code=pressKey"8"},
WIDGET.newKey{name="_9",x=350,y=500,w=90,fText="9",font=50,code=pressKey"9"},
WIDGET.newKey{name="_0",x=150,y=600,w=90,fText="0",font=50,code=pressKey"0"},
WIDGET.newKey{name=".",x=250,y=600,w=90,fText=".",color='lM',font=50,code=pressKey"."},
WIDGET.newKey{name="e",x=350,y=600,w=90,fText="e",color='lM',font=50,code=pressKey"e"},
WIDGET.newKey{name="+",x=450,y=300,w=90,fText="+",color='lB',font=50,code=pressKey"+"},
WIDGET.newKey{name="-",x=450,y=400,w=90,fText="-",color='lB',font=50,code=pressKey"-"},
WIDGET.newKey{name="*",x=450,y=500,w=90,fText="*",color='lB',font=50,code=pressKey"*"},
WIDGET.newKey{name="/",x=450,y=600,w=90,fText="/",color='lB',font=50,code=pressKey"/"},
WIDGET.newKey{name="<",x=550,y=300,w=90,fText="<",color='lR',font=50,code=pressKey"backspace"},
WIDGET.newKey{name="=",x=550,y=400,w=90,fText="=",color='lY',font=50,code=pressKey"return"},
WIDGET.newKey{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
WIDGET.newKey{name="_1",x=145,y=300,w=90,fText="1",font=50,code=pressKey"1"},
WIDGET.newKey{name="_2",x=245,y=300,w=90,fText="2",font=50,code=pressKey"2"},
WIDGET.newKey{name="_3",x=345,y=300,w=90,fText="3",font=50,code=pressKey"3"},
WIDGET.newKey{name="_4",x=145,y=400,w=90,fText="4",font=50,code=pressKey"4"},
WIDGET.newKey{name="_5",x=245,y=400,w=90,fText="5",font=50,code=pressKey"5"},
WIDGET.newKey{name="_6",x=345,y=400,w=90,fText="6",font=50,code=pressKey"6"},
WIDGET.newKey{name="_7",x=145,y=500,w=90,fText="7",font=50,code=pressKey"7"},
WIDGET.newKey{name="_8",x=245,y=500,w=90,fText="8",font=50,code=pressKey"8"},
WIDGET.newKey{name="_9",x=345,y=500,w=90,fText="9",font=50,code=pressKey"9"},
WIDGET.newKey{name="_0",x=145,y=600,w=90,fText="0",font=50,code=pressKey"0"},
WIDGET.newKey{name=".",x=245,y=600,w=90,fText=".",color='lM',font=50,code=pressKey"."},
WIDGET.newKey{name="e",x=345,y=600,w=90,fText="e",color='lM',font=50,code=pressKey"e"},
WIDGET.newKey{name="+",x=445,y=300,w=90,fText="+",color='lB',font=50,code=pressKey"+"},
WIDGET.newKey{name="-",x=445,y=400,w=90,fText="-",color='lB',font=50,code=pressKey"-"},
WIDGET.newKey{name="*",x=445,y=500,w=90,fText="*",color='lB',font=50,code=pressKey"*"},
WIDGET.newKey{name="/",x=445,y=600,w=90,fText="/",color='lB',font=50,code=pressKey"/"},
WIDGET.newKey{name="<",x=545,y=300,w=90,fText="<",color='lR',font=50,code=pressKey"backspace"},
WIDGET.newKey{name="=",x=545,y=400,w=90,fText="=",color='lY',font=50,code=pressKey"return"},
WIDGET.newKey{name="back",x=1135,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
}
return scene

View File

@@ -78,10 +78,10 @@ function scene.update()
if P.y0 then
if P.y>P.y0 then
P.y=max(P.y-8,P.y0,70)
P.vy=-8
P.vy=-10
elseif P.y<P.y0 then
P.y=min(P.y+8,P.y0,650)
P.vy=8
P.vy=10
else
P.vy=P.vy*.5
end
@@ -154,9 +154,9 @@ function scene.draw()
--Draw boundary
gc.setColor(COLOR.Z)
gc.setLineWidth(6)
gc.line(130,20,1160,20)
gc.line(130,700,1160,700)
gc.setLineWidth(4)
gc.line(134,20,1146,20)
gc.line(134,700,1146,700)
--Draw ball & speed line
gc.setColor(1,1,1-abs(ry)*.16)
@@ -166,9 +166,9 @@ function scene.draw()
--Draw pads
gc.setColor(1,.8,.8)
gc.rectangle('fill',130,p1.y-50,20,100)
gc.rectangle('fill',134,p1.y-50,16,100)
gc.setColor(.8,.8,1)
gc.rectangle('fill',1130,p2.y-50,20,100)
gc.rectangle('fill',1130,p2.y-50,16,100)
end
scene.widgetList={

View File

@@ -271,8 +271,8 @@ function scene.draw()
--Draw field
gc.setColor(COLOR.Z)
gc.setLineWidth(3)
gc.rectangle('line',-2,-2,304,604)
gc.setLineWidth(2)
gc.rectangle('line',-2,-2,304,604,5)
gc.setLineWidth(2)
local cross=TEXTURE.puzzleMark[-1]
local F=FIELD[page]
@@ -362,7 +362,7 @@ function scene.draw()
--Left button
if pens[1]>0 then
gc.setColor(minoColor[pens[1]])
gc.rectangle('fill',5,5,23,30)
gc.rectangle('fill',5,5,23,30,3)
elseif pens[1]==-1 then
gc.setColor(COLOR.Z)
gc.line(5,5,28,35)
@@ -371,7 +371,7 @@ function scene.draw()
if penMode==0 then
gc.setLineWidth(13)
gc.setColor(COLOR.rainbow(TIME()*12.6))
gc.rectangle('fill',5,5,23,30)
gc.rectangle('fill',5,5,23,30,3)
else
gc.setLineWidth(3)
gc.setColor(1,0,0)
@@ -383,7 +383,7 @@ function scene.draw()
--Right button
if pens[2]>0 then
gc.setColor(minoColor[pens[2]])
gc.rectangle('fill',52,5,23,30)
gc.rectangle('fill',52,5,23,30,3)
elseif pens[2]==-1 then
gc.setColor(COLOR.Z)
gc.setLineWidth(3)
@@ -393,7 +393,7 @@ function scene.draw()
if penMode==0 then
gc.setLineWidth(13)
gc.setColor(COLOR.rainbow(TIME()*12.6))
gc.rectangle('fill',52,5,23,30)
gc.rectangle('fill',52,5,23,30,3)
else
gc.setLineWidth(3)
gc.setColor(1,0,0)
@@ -405,7 +405,7 @@ function scene.draw()
--Middle button
if pens[3]>0 then
gc.setColor(minoColor[pens[3]])
gc.rectangle('fill',35,2,10,21)
gc.rectangle('fill',35,2,10,21,3)
elseif pens[3]==-1 then
gc.setColor(COLOR.Z)
gc.setLineWidth(2)
@@ -415,7 +415,7 @@ function scene.draw()
if penMode==0 then
gc.setLineWidth(13)
gc.setColor(COLOR.rainbow(TIME()*12.6))
gc.rectangle('fill',35,2,10,21)
gc.rectangle('fill',35,2,10,21,3)
else
gc.setLineWidth(3)
gc.setColor(1,0,0)

View File

@@ -122,9 +122,9 @@ end
function scene.draw()
--Draw frame
gc.setLineWidth(4)
gc.setLineWidth(2)
gc.setColor(COLOR.Z)
gc.rectangle('line',60,110,1160,170)
gc.rectangle('line',58,108,1164,174,5)
--Draw inputing target
setFont(30)
@@ -237,7 +237,7 @@ scene.widgetList={
WIDGET.newKey{name="reset", x=1000, y=640,w=90, color='lY',font=50,code=pressKey"delete"},
WIDGET.newButton{name="copy", x=1140, y=440,w=170,h=80, color='lR',font=40,code=pressKey"cC",hideF=function()return #MISSION==0 end},
WIDGET.newButton{name="paste", x=1140, y=540,w=170,h=80, color='lB',font=40,code=pressKey"cV"},
WIDGET.newSwitch{name="mission",x=1150, y=350,disp=CUSval("missionKill"),code=CUSrev("missionKill")},
WIDGET.newSwitch{name="mission",x=1150, y=340,disp=CUSval("missionKill"),code=CUSrev("missionKill")},
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,code=backScene},
}

View File

@@ -131,8 +131,8 @@ end
function scene.draw()
--Draw frame
gc.setColor(COLOR.Z)
gc.setLineWidth(4)
gc.rectangle('line',100,110,1080,260)
gc.setLineWidth(2)
gc.rectangle('line',100,110,1080,260,5)
--Draw sequence
local miniBlock=TEXTURE.miniBlock

View File

@@ -166,10 +166,10 @@ function scene.draw()
gc.print(item[1],30,y)
end
gc.setLineWidth(4)
gc.setLineWidth(2)
gc.setColor(COLOR.Z)
gc.rectangle('line',300,180,958,526)
gc.rectangle('line',20,180,280,526)
gc.rectangle('line',300,180,958,526,5)
gc.rectangle('line',20,180,280,526,5)
if waiting>0 then
local r=TIME()*2

View File

@@ -158,7 +158,7 @@ function scene.draw()
gc.push('transform')
gc.translate(260,650)
gc.setLineWidth(2)
gc.rectangle('line',0,0,tipLength,42)
gc.rectangle('line',0,0,tipLength,42,3)
gc.stencil(tipStencil)
gc.setStencilTest('equal',1)
gc.draw(tip,0+scrollX,0)

View File

@@ -277,7 +277,7 @@ function scene.draw()
if sel then
local M=MODES[sel]
gc_setColor(.5,.5,.5,.8)
gc_rectangle('fill',920,0,360,720)--Info board
gc_rectangle('fill',920,0,360,720,5)--Info board
gc_setColor(M.color)
setFont(40)mStr(text.modes[sel][1],1100,5)
setFont(30)mStr(text.modes[sel][2],1100,50)
@@ -289,7 +289,7 @@ function scene.draw()
if M.score then
mText(drawableText.highScore,1100,240)
gc_setColor(.3,.3,.3,.7)
gc_rectangle('fill',940,290,320,280)--Highscore board
gc_rectangle('fill',940,290,320,280,5)--Highscore board
local L=M.records
gc_setColor(1,1,1)
if L[1]then

View File

@@ -78,15 +78,17 @@ function scene.draw()
gc_print(item[i],740,40*i+10)
end
gc_setLineWidth(4)
for x=1,8 do
x=80*x-40
gc_setLineWidth(2)
gc.rectangle('line',40,80,560,160,5)
gc.rectangle('line',40,320,560,160,5)
for x=1,6 do
x=80*x+40
gc_line(x,80,x,240)
gc_line(x,320,x,480)
end
for y=2,6 do
gc_line(40,40*y,600,40*y)
gc_line(40,240+40*y,600,240+40*y)
for y=1,3 do
gc_line(40,80+40*y,600,80+40*y)
gc_line(40,320+40*y,600,320+40*y)
end
local t=TIME()
@@ -100,8 +102,8 @@ function scene.draw()
end
scene.widgetList={
WIDGET.newButton{name="path", x=800,y=540,w=250,h=80,font=25,code=function()love.system.openURL(SAVEDIR)end,hide=MOBILE},
WIDGET.newButton{name="save", x=800,y=640,w=250,h=80,font=25,code=goScene'savedata'},
WIDGET.newButton{name="path", x=820,y=540,w=250,h=80,font=25,code=function()love.system.openURL(SAVEDIR)end,hide=MOBILE},
WIDGET.newButton{name="save", x=820,y=640,w=250,h=80,font=25,code=goScene'savedata'},
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
}