From ae41e5f2e6ed03fc5733a4588db6513e2a0f7945 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 16 Apr 2021 11:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=805=E4=BA=BA=E6=88=BF?= =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 3 ++- parts/language/lang_pt.lua | 3 ++- parts/language/lang_sp.lua | 3 ++- parts/language/lang_zh.lua | 3 ++- parts/scenes/net_rooms.lua | 24 ++++++++++++------------ 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 8fa032e3..4ca4de30 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -253,7 +253,8 @@ return{ refreshing="Refreshing Rooms", noRoom="Such emptiness much void, come back later?", refresh="Refresh", - new="New Room", + new="New Room(2)", + new2="New Room(5)", join="Join", up="↑", down="↓", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index d8972fa9..25cc3192 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -253,7 +253,8 @@ return{ -- refreshing="Refreshing Rooms", noRoom="Nenhuma sala agora", -- refresh="Refresh", - -- new="New room", + -- new="New Room(2)", + -- new2="New Room(5)", -- join="Join", up="↑", down="↓", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 051d7aeb..67131844 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -231,7 +231,8 @@ return{ -- refreshing="Refreshing Rooms", noRoom="No Hay Salas Actualmente", refresh="Refrescar", - new="Sala Nueva", + new="Sala Nueva(2)", + new2="Sala Nueva(5)", join="Unirse", up="↑", down="↓", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index ba76826b..c2da81b7 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -253,7 +253,8 @@ return{ refreshing="刷新房间列表中", noRoom="一个房间都没有哎...", refresh="刷新", - new="创建房间", + new="创建房间(2)", + new2="创建房间(5)", join="加入", up="↑", down="↓", diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 4c823fdc..166adfaa 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -28,15 +28,14 @@ function scene.keyDown(k) if fetchTimer<=3.26 then fetchRoom() end - elseif k=="n"then + elseif k=="m"or k=="n"then if TIME()-lastCreateRoomTime>16.2 then NET.createRoom( - kb.isDown("1")and"solo"or - kb.isDown("2")and"classic"or + k=="m"and"classic"or tonumber(USER.uid)<100 and( - kb.isDown("3")and"r49"or - kb.isDown("4")and"r99"or - kb.isDown("5")and"unlimited" + kb.isDown("q")and"r49"or + kb.isDown("w")and"r99"or + kb.isDown("e")and"unlimited" )or"solo", (USERS.getName(USER.uid)or"???").."'s room" ) @@ -87,7 +86,7 @@ end function scene.draw() --Fetching timer gc.setColor(1,1,1,.26) - gc.arc("fill","pie",240,620,60,-1.5708,-1.5708-1.2566*fetchTimer) + gc.arc("fill","pie",130,620,60,-1.5708,-1.5708-1.2566*fetchTimer) --Room list gc.setColor(1,1,1) @@ -122,11 +121,12 @@ local function hide_noRoom()return #NET.roomList==0 end scene.widgetList={ 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=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=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.newKey{name="refresh", x=130,y=620,w=140,h=140,font=35,code=fetchRoom, hide=function()return fetchTimer>3.26 end}, + WIDGET.newKey{name="new", x=330,y=620,w=140,h=140,font=20,code=pressKey"n"}, + WIDGET.newKey{name="new2", x=530,y=620,w=140,h=140,font=20,code=pressKey"m"}, + WIDGET.newKey{name="join", x=730,y=620,w=140,h=140,font=40,code=pressKey"return", hide=hide_noRoom}, + WIDGET.newKey{name="up", x=930,y=585,w=140,h=70,font=40,code=pressKey"up", hide=hide_noRoom}, + WIDGET.newKey{name="down", x=930,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}, }