From f36e900b7b4f975d88ddfe0fcd6e26f587e668e7 Mon Sep 17 00:00:00 2001 From: milimoe Date: Sun, 24 Sep 2023 19:20:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86CreateRoom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DataRequestController.cs | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/FunGame.Server/Controllers/DataRequestController.cs b/FunGame.Server/Controllers/DataRequestController.cs index 677012e..08add5d 100644 --- a/FunGame.Server/Controllers/DataRequestController.cs +++ b/FunGame.Server/Controllers/DataRequestController.cs @@ -150,11 +150,11 @@ namespace Milimoe.FunGame.Server.Controller /// private void CreateRoom(Hashtable RequestData, Hashtable ResultData) { - string roomid = "-1"; + Room room = General.HallInstance; if (RequestData.Count >= 3) { ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(SocketMessageType.DataRequest) + "] " + Server.GetClientName() + " -> CreateRoom"); - string roomtype_string = DataRequest.GetHashtableJsonObject(RequestData, "roomtype") ?? GameMode.GameMode_All; + string roomtype_string = DataRequest.GetHashtableJsonObject(RequestData, "roomtype") ?? GameMode.All; User user = DataRequest.GetHashtableJsonObject(RequestData, "master") ?? Factory.GetUser(); string password = DataRequest.GetHashtableJsonObject(RequestData, "password") ?? ""; @@ -162,21 +162,26 @@ namespace Milimoe.FunGame.Server.Controller { RoomType roomtype = roomtype_string switch { - GameMode.GameMode_Mix => RoomType.Mix, - GameMode.GameMode_Team => RoomType.Team, - GameMode.GameMode_MixHasPass => RoomType.MixHasPass, - GameMode.GameMode_TeamHasPass => RoomType.TeamHasPass, + GameMode.Mix => RoomType.Mix, + GameMode.Team => RoomType.Team, + GameMode.MixHasPass => RoomType.MixHasPass, + GameMode.TeamHasPass => RoomType.TeamHasPass, _ => RoomType.All }; - roomid = Verification.CreateVerifyCode(VerifyCodeType.MixVerifyCode, 7).ToUpper(); + string roomid = Verification.CreateVerifyCode(VerifyCodeType.MixVerifyCode, 7).ToUpper(); SQLHelper.Execute(RoomQuery.Insert_CreateRoom(roomid, user.Id, roomtype, password ?? "")); if (SQLHelper.Result == SQLResult.Success) { ServerHelper.WriteLine("[CreateRoom] Master: " + user.Username + " RoomID: " + roomid); + SQLHelper.ExecuteDataSet(RoomQuery.Select_IsExistRoom(roomid)); + if (SQLHelper.Result == SQLResult.Success && SQLHelper.DataSet.Tables[0].Rows.Count > 0) + { + room = Factory.GetRoom(SQLHelper.DataSet.Tables[0].Rows[0], user); + } } } } - ResultData.Add("roomid", roomid); + ResultData.Add("room", room); } ///