diff --git a/FunGame.Implement/FunGame.Implement.csproj b/FunGame.Implement/FunGame.Implement.csproj index 2d50bb9..8979406 100644 --- a/FunGame.Implement/FunGame.Implement.csproj +++ b/FunGame.Implement/FunGame.Implement.csproj @@ -24,7 +24,7 @@ - ..\..\FunGame\bin\Server\Debug\net6.0\FunGame.Core.dll + ..\..\FunGame\bin\Server\Debug\net7.0\FunGame.Core.dll diff --git a/FunGame.Server/FunGame.Server.csproj b/FunGame.Server/FunGame.Server.csproj index c696201..c8ed7c9 100644 --- a/FunGame.Server/FunGame.Server.csproj +++ b/FunGame.Server/FunGame.Server.csproj @@ -5,7 +5,7 @@ net7.0 enable enable - Images\logo.ico + logo.ico logo.ico C:\milimoe\FunGame\bin\Server FunGameServer @@ -26,12 +26,12 @@ - + - ..\..\FunGame\bin\Server\Debug\net6.0\FunGame.Core.dll + ..\..\FunGame\bin\Server\Debug\net7.0\FunGame.Core.dll ..\..\FunGame\bin\Server\Debug\net6.0\MySql.Data.dll diff --git a/FunGame.Server/Main.cs b/FunGame.Server/Main.cs index b1636a6..325e6b7 100644 --- a/FunGame.Server/Main.cs +++ b/FunGame.Server/Main.cs @@ -6,12 +6,12 @@ using System; using System.Net.WebSockets; using Milimoe.FunGame.Server.Others; using Milimoe.FunGame.Server.Utility; -using Milimoe.FunGame.Core.Entity.Enum; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Api.Utility; using FunGame.Server.Model; Console.Title = Config.SERVER_NAME; -Console.WriteLine(FunGameEnums.GetInfo(Config.FunGameType)); +Console.WriteLine(FunGameEnum.GetInfo(Config.FunGameType)); bool Running = true; Socket? ServerSocket = null; @@ -184,7 +184,7 @@ bool Send(Socket socket, string name) // 发送消息给客户端 string msg = Config.SERVER_NAME + ";" + Config.SERVER_NOTICE; byte[] buffer = new byte[2048]; - buffer = Config.DEFAULT_ENCODING.GetBytes(SocketHelper.MakeMessage((int)SocketMessageType.GetNotice, msg)); + buffer = Config.DEFAULT_ENCODING.GetBytes($"1;{msg}"); if (socket.Send(buffer) > 0) { ServerHelper.WriteLine(SocketHelper.MakeClientName(name) + " <- " + "已确认连接"); diff --git a/FunGame.Server/Model/ClientSocket.cs b/FunGame.Server/Model/ClientSocket.cs index 32f39dd..5ca90f9 100644 --- a/FunGame.Server/Model/ClientSocket.cs +++ b/FunGame.Server/Model/ClientSocket.cs @@ -10,10 +10,10 @@ using System.Reflection.Metadata; using System.Net; using MySqlX.XDevAPI.Common; using Milimoe.FunGame.Server.Utility; -using Milimoe.FunGame.Core.Entity.General; -using Milimoe.FunGame.Core.Entity.Enum; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Server.Others; +using Milimoe.FunGame.Core.Entity; namespace FunGame.Server.Model { @@ -63,7 +63,7 @@ namespace FunGame.Server.Model break; case (int)SocketMessageType.CheckLogin: // 添加至玩家列表 - User = new User(msg); + User = (User)Factory.New(msg); msg = " >> 欢迎回来, " + msg + " 。"; AddUser(); ServerHelper.WriteLine("目前在线玩家数量: " + Config.OnlinePlayers.Count); diff --git a/FunGame.Server/Others/Config/Config.cs b/FunGame.Server/Others/Config/Config.cs index 62d321c..9ada4e6 100644 --- a/FunGame.Server/Others/Config/Config.cs +++ b/FunGame.Server/Others/Config/Config.cs @@ -7,7 +7,7 @@ using System.Net.Sockets; using System.Reflection.Metadata; using System.Text; using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity.Enum; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Api.Utility; namespace Milimoe.FunGame.Server.Others @@ -26,10 +26,9 @@ namespace Milimoe.FunGame.Server.Others public static int ONLINE_PLAYERS = 0; // 已连接的玩家数量 public static int CONNECTING_PLAYERS = 0; // 正在连接的玩家数量 public static Encoding DEFAULT_ENCODING = Encoding.UTF8; // 默认传输字符集 - public static FunGameEnums.FunGame FunGameType = FunGameEnums.FunGame.FunGame_Server; + public static FunGameEnum.FunGame FunGameType = FunGameEnum.FunGame.FunGame_Server; public static Hashtable OrderList = new(); - public static ReflectionHelper ReflectionHelper = new(); public static Hashtable OnlineClients = new Hashtable(); diff --git a/FunGame.Server/Utility/Utility.cs b/FunGame.Server/Utility/Utility.cs index e632330..9c90bbb 100644 --- a/FunGame.Server/Utility/Utility.cs +++ b/FunGame.Server/Utility/Utility.cs @@ -6,18 +6,12 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity.General; -using Milimoe.FunGame.Core.Entity.Enum; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Server.Others; +using Milimoe.FunGame.Core.Entity; namespace Milimoe.FunGame.Server.Utility { - public class Utility : FunGame.Core.Api.Utility.Utility - { - - } - public class DataHelper { private static MySqlConnection? msc = null; diff --git a/FunGame.Server/logo.ico b/FunGame.Server/logo.ico new file mode 100644 index 0000000..4082874 Binary files /dev/null and b/FunGame.Server/logo.ico differ