From 7676f32cf291c2af58d7d5a81d821fa4f07f300e Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 29 Apr 2021 23:46:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=94=E7=BD=91=E4=B8=BB?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E6=97=A0?= =?UTF-8?q?=E6=95=88=EF=BC=8C=E6=88=BF=E9=97=B4=E5=88=97=E8=A1=A8=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/net_menu.lua | 2 +- parts/scenes/net_rooms.lua | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index d7195822..5b5a4cf7 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -15,7 +15,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s"}, + WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene"setting_game"}, WIDGET.newButton{name="ffa", x=640, y=200,w=350,h=120,font=40,code=function()NET.enterRoom("ffa")end}, WIDGET.newButton{name="rooms", x=640, y=360,w=350,h=120,font=40,code=goScene"net_rooms"}, WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,color="D",font=40,code=NULL}, diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index c9b324f4..6a299fc7 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -106,7 +106,9 @@ function scene.update(dt) fetchRoom() end end - selected=min(selected,#NET.roomList) + if #NET.roomList>0 then + selected=min(selected,#NET.roomList) + end end local function roomListStencil() @@ -169,7 +171,7 @@ scene.widgetList={ WIDGET.newKey{name="refresh", x=300,y=620,w=140,h=140,font=35,code=fetchRoom,hide=function()return fetchTimer>3.26 end}, WIDGET.newKey{name="new", x=500,y=620,w=140,h=140,font=20,code=pressKey"n"}, WIDGET.newKey{name="new2", x=700,y=620,w=140,h=140,font=20,code=pressKey"m"}, - WIDGET.newKey{name="join", x=900,y=620,w=140,h=140,font=40,code=pressKey"return",hide=function()return #NET.roomList==0 end}, + WIDGET.newKey{name="join", x=900,y=620,w=140,h=140,font=40,code=pressKey"return",hide=function()return #NET.roomList==0 or NET.getlock("enterRoom") end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, }