From 315237d0fc6d0344d20cb71c81b1d46ec7a95781 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 10 Apr 2021 02:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E4=B8=80=E8=88=AC=E5=8F=AA=E8=83=BD=E5=BC=80=E5=8D=95=E6=8C=91?= =?UTF-8?q?=E6=88=BF=EF=BC=8C=E7=94=B5=E8=84=91=E7=94=A8=E6=88=B7=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=BC=80=E5=A4=9A=E4=BA=BA=E6=88=BF=EF=BC=8C=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E7=94=B5=E8=84=91=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=BC=80=E6=9B=B4=E5=A4=A7=E7=9A=84=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/net.lua | 6 +++--- parts/scenes/net_rooms.lua | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/parts/net.lua b/parts/net.lua index 7c2cefb2..96c75de2 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -173,13 +173,13 @@ function NET.fetchRoom() }) end end -function NET.createRoom() +function NET.createRoom(roomType,name) if NET.lock("enterRoom",3)then WS.send("play",JSON.encode{ action=1, data={ - type="classic", - name=(USER.username or"???").."'s room", + type=roomType, + name=name, password=nil, config=dumpBasicConfig(), } diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 93b230fa..aca6ffc9 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -1,4 +1,5 @@ local gc=love.graphics +local kb=love.keyboard local NET=NET local scrollPos,selected @@ -29,7 +30,16 @@ function scene.keyDown(k) end elseif k=="n"then if TIME()-lastCreateRoomTime>16.2 then - NET.createRoom() + NET.createRoom( + kb.isDown("1")and"solo"or + kb.isDown("2")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" + )or"solo'", + (USER.username or"???").."'s room" + ) lastCreateRoomTime=TIME() else LOG.print(text.createRoomTooFast,"warn")