From 8c04b61a96d6c53f2493e6e896b937a66da2ef04 Mon Sep 17 00:00:00 2001 From: milimoe <110188673+milimoe@users.noreply.github.com> Date: Thu, 13 Apr 2023 21:37:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0RoomList=20?= =?UTF-8?q?(#6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FunGame.Server/Main.cs | 2 +- FunGame.Server/Model/ServerModel.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/FunGame.Server/Main.cs b/FunGame.Server/Main.cs index 3b190bc..fdece6b 100644 --- a/FunGame.Server/Main.cs +++ b/FunGame.Server/Main.cs @@ -85,7 +85,7 @@ void StartServer() // 开始监听连接 AddBannedList(ListeningSocket); - Config.RoomList = new(ListeningSocket); + Config.RoomList = new(); ServerHelper.WriteLine("Listen -> " + Config.ServerPort); ServerHelper.WriteLine("服务器启动成功，开始监听 . . ."); diff --git a/FunGame.Server/Model/ServerModel.cs b/FunGame.Server/Model/ServerModel.cs index 28c0ed9..b981bbf 100644 --- a/FunGame.Server/Model/ServerModel.cs +++ b/FunGame.Server/Model/ServerModel.cs @@ -327,7 +327,7 @@ namespace Milimoe.FunGame.Server.Model return Send(socket, type, false, msg); case SocketMessageType.UpdateRoom: - Config.RoomList ??= new(Server); + Config.RoomList ??= new(); Config.RoomList.Clear(); DataSet DsRoomTemp = new(), DsUserTemp = new(); DsRoomTemp = SQLHelper.ExecuteDataSet(RoomQuery.Select_Rooms, out SQLResult TestResult); @@ -335,7 +335,6 @@ namespace Milimoe.FunGame.Server.Model { DsUserTemp = SQLHelper.ExecuteDataSet(UserQuery.Select_Users, out TestResult); List rooms = Factory.GetList(DsRoomTemp, DsUserTemp); - Config.RoomList.AddRoom(General.HallInstance); // 添加空房间 Config.RoomList.AddRooms(rooms); // 更新服务器中的房间列表 } return Send(socket, type, DsRoomTemp, DsUserTemp); // 将Ds传递给客户端，在客户端中构建Room