房间内显示房间信息

parts/net.lua

@@ -5,13 +5,20 @@ local WS,TIME=WS,TIME
 local NET={
 	connected=false,
 	allow_online=false,
-	allReady=false,
-	serverGaming=false,
-	connectingStream=false,
-	roomList={},
 	accessToken=false,
-	rid=false,
+	roomList={},
-	rsid=false,
+	roomInfo={
+		-- rid=false,
+		name=false,
+		-- type=false,
+		private=false,
+		-- count=false,
+		capacity=false,
+	},
+	allReady=false,
+	streamRoomID=false,
+	connectingStream=false,
+	serverGaming=false,
 }
 
 local mesType={
@@ -109,7 +116,7 @@ function NET.wsconn_stream()
 		WS.connect('stream','/stream',JSON.encode{
 			uid=USER.uid,
 			accessToken=NET.accessToken,
-			rid=NET.rsid,
+			rid=NET.streamRoomID,
 		})
 		TASK.new(NET.updateWS_stream)
 	end
@@ -169,27 +176,34 @@ function NET.fetchRoom()
 		})
 	end
 end
-function NET.createRoom(roomType,name)
+function NET.createRoom(roomType,roomName)
 	if NET.lock('enterRoom',1.26)then
+		NET.roomInfo.name=roomName or"?"
+		NET.roomInfo.type=roomType or"?"
+		NET.roomInfo.private=false
+		NET.roomInfo.capacity="?"
 		WS.send('play',JSON.encode{
 			action=1,
 			data={
 				type=roomType,
-				name=name,
+				name=roomName,
 				password=nil,
 				config=dumpBasicConfig(),
 			}
 		})
 	end
 end
-function NET.enterRoom(roomID,password)
+function NET.enterRoom(room,password)
 	if NET.lock('enterRoom',1.26)then
 		SFX.play('reach',.6)
-		NET.rid=roomID
+		NET.roomInfo.name=room.name or"?"
+		NET.roomInfo.type=room.type or"?"
+		NET.roomInfo.private=not not password
+		NET.roomInfo.capacity=room.capacity or"?"
 		WS.send('play',JSON.encode{
 			action=2,
 			data={
-				rid=roomID,
+				rid=room.rid,
 				config=dumpBasicConfig(),
 				password=password,
 			}
@@ -410,7 +424,7 @@ function NET.updateWS_play()
 							SFX.play('reach',.6)
 							NET.allReady=true
 						elseif res.action==8 then--Set
-							NET.rsid=d.rid
+							NET.streamRoomID=d.rid
 							NET.connectingStream=true
 							NET.wsconn_stream()
 						elseif res.action==9 then--Game finished

parts/scenes/net_game.lua

@@ -258,6 +258,14 @@ function scene.draw()
 			mStr(text.ready,640,10)
 		end
 
+		--Room info.
+		gc.setColor(1,1,1)
+		setFont(25)
+		mStr(NET.roomInfo.name,640,685)
+		setFont(40)
+		gc.print(netPLY.getCount().."/"..NET.roomInfo.capacity,70,655)
+		if NET.roomInfo.private then gc.draw(IMG.lock,30,668)end
+
 		--Profile
 		drawSelfProfile()
 	end

parts/scenes/net_menu.lua

@@ -16,7 +16,7 @@ end
 
 scene.widgetList={
 	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="ffa",	x=640,	y=200,w=350,h=120,font=40,code=function()NET.enterRoom({name="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},
 	WIDGET.newButton{name="logout",	x=880,	y=40,w=180,h=60,color='dR',

parts/scenes/net_rooms.lua

@@ -66,7 +66,7 @@ function scene.keyDown(k)
 				LOG.print("Can't enter private room now")
 				return
 			end
-			NET.enterRoom(NET.roomList[selected].rid)--,password
+			NET.enterRoom(NET.roomList[selected])--,password
 		end
 	end
 end