From 32ec6d6be72593c046162c460a04eafbdb7d0d33 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 7 Apr 2021 14:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=88=BF=E9=97=B4=E5=88=97=E8=A1=A8ui?= =?UTF-8?q?=EF=BC=8C=E7=BC=A9=E7=9F=AD=E5=88=9B=E6=88=BF=E5=86=B7=E5=8D=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/net_rooms.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 09577710..fd8985df 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -1,5 +1,4 @@ local gc=love.graphics -local min=math.min local NET=NET local scrollPos,selected @@ -29,7 +28,7 @@ function scene.keyDown(k) fetchRoom() end elseif k=="n"then - if TIME()-lastCreateRoomTime>26 then + if TIME()-lastCreateRoomTime>16.2 then NET.createRoom() lastCreateRoomTime=TIME() else @@ -85,7 +84,7 @@ function scene.draw() gc.setColor(1,1,1,.3) gc.rectangle("fill",50,40*(1+selected-scrollPos)+30,1180,40) setFont(35) - for i=1,min(10,#NET.roomList-scrollPos)do + for i=1,math.min(10,#NET.roomList-scrollPos)do local R=NET.roomList[scrollPos+i] if R.private then gc.setColor(1,1,1) @@ -102,14 +101,15 @@ function scene.draw() end end +local function hide_noRoom()return #NET.roomList==0 end scene.widgetList={ - WIDGET.newText{name="refreshing",x=640,y=260,font=65,hide=function()return not NET.getLock("fetchRoom")end}, + WIDGET.newText{name="refreshing",x=640,y=255,font=45,hide=function()return not NET.getLock("fetchRoom")end}, WIDGET.newText{name="noRoom", x=640,y=260,font=40,hide=function()return #NET.roomList>0 or NET.getLock("fetchRoom")end}, - WIDGET.newKey{name="refresh", x=240,y=620,w=140,h=140,font=40,code=fetchRoom, hide=function()return fetchTimer>3.26 end}, + WIDGET.newKey{name="refresh", x=240,y=620,w=140,h=140,font=35,code=fetchRoom, hide=function()return fetchTimer>3.26 end}, WIDGET.newKey{name="new", x=440,y=620,w=140,h=140,font=25,code=pressKey"n"}, - WIDGET.newKey{name="join", x=640,y=620,w=140,h=140,font=40,code=pressKey"return", hide=function()return #NET.roomList==0 end}, - WIDGET.newKey{name="up", x=840,y=585,w=140,h=70,font=40,code=pressKey"up", hide=function()return #NET.roomList==0 end}, - WIDGET.newKey{name="down", x=840,y=655,w=140,h=70,font=40,code=pressKey"down", hide=function()return #NET.roomList==0 end}, + WIDGET.newKey{name="join", x=640,y=620,w=140,h=140,font=40,code=pressKey"return", hide=hide_noRoom}, + WIDGET.newKey{name="up", x=840,y=585,w=140,h=70,font=40,code=pressKey"up", hide=hide_noRoom}, + WIDGET.newKey{name="down", x=840,y=655,w=140,h=70,font=40,code=pressKey"down", hide=hide_noRoom}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, }