diff --git a/FunGame.Server/Controller/ServerController.cs b/FunGame.Server/Controller/ServerController.cs index 6d814aa..048c59d 100644 --- a/FunGame.Server/Controller/ServerController.cs +++ b/FunGame.Server/Controller/ServerController.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace FunGame.Server.Controller +namespace FunGame.Server.Controller { internal class ServerController { diff --git a/FunGame.Server/Main.cs b/FunGame.Server/Main.cs index dfa7d10..0c488f3 100644 --- a/FunGame.Server/Main.cs +++ b/FunGame.Server/Main.cs @@ -1,16 +1,12 @@ -using System.Text; -using System.Text.RegularExpressions; -using System; -using Milimoe.FunGame.Server.Utility; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Library.Common.Network; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Server.Model; using Milimoe.FunGame.Server.Others; -using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Library.Common.Network; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Server.Utility; Console.Title = Config.SERVER_NAME; -Console.WriteLine(FunGameEnum.GetInfo((FunGameEnum.FunGame)Config.FunGameType)); +Console.WriteLine(FunGameInfo.GetInfo((FunGameInfo.FunGame)Config.FunGameType)); bool Running = true; ServerSocket? ListeningSocket = null; @@ -64,7 +60,7 @@ void StartServer() if (!INIHelper.ExistINIFile()) { ServerHelper.WriteLine("未检测到配置文件,将自动创建配置文件 . . ."); - INIHelper.Init((FunGameEnum.FunGame)Config.FunGameType); + INIHelper.Init((FunGameInfo.FunGame)Config.FunGameType); ServerHelper.WriteLine("配置文件FunGame.ini创建成功,请修改该配置文件,然后重启服务器。"); ServerHelper.WriteLine("请输入 help 来获取帮助,输入 quit 关闭服务器。"); return; diff --git a/FunGame.Server/Model/ServerModel.cs b/FunGame.Server/Model/ServerModel.cs index a827f7b..6e13bc8 100644 --- a/FunGame.Server/Model/ServerModel.cs +++ b/FunGame.Server/Model/ServerModel.cs @@ -1,19 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.IO; -using System.Text; -using System.Threading.Tasks; -using System.Data.SqlTypes; -using System.Reflection.Metadata; -using System.Net; -using MySqlX.XDevAPI.Common; -using Milimoe.FunGame.Server.Utility; -using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Library.Common.Network; -using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Library.Common.Network; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Server.Others; +using Milimoe.FunGame.Server.Utility; namespace Milimoe.FunGame.Server.Model { diff --git a/FunGame.Server/Others/Config.cs b/FunGame.Server/Others/Config.cs index 11715bc..6ede66b 100644 --- a/FunGame.Server/Others/Config.cs +++ b/FunGame.Server/Others/Config.cs @@ -1,14 +1,7 @@ -using System; +using Milimoe.FunGame.Core.Library.Constant; using System.Collections; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Net.Sockets; -using System.Reflection.Metadata; using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Api.Utility; namespace Milimoe.FunGame.Server.Others { @@ -25,8 +18,8 @@ namespace Milimoe.FunGame.Server.Others public static int MAX_CONNECTFAILED { get; set; } = 5; // 最大连接失败次数 public static int ONLINE_PLAYERS { get; set; } = 0; // 已连接的玩家数量 public static int CONNECTING_PLAYERS { get; set; } = 0; // 正在连接的玩家数量 - public static Encoding DEFAULT_ENCODING { get; } = General.DEFAULT_ENCODING; // 默认传输字符集 - public static int FunGameType { get; } = (int)FunGameEnum.FunGame.FunGame_Server; + public static Encoding DEFAULT_ENCODING { get; } = General.DefaultEncoding; // 默认传输字符集 + public static int FunGameType { get; } = (int)FunGameInfo.FunGame.FunGame_Server; public static Hashtable OrderList { get; } = new(); diff --git a/FunGame.Server/Others/OrderDictionary.cs b/FunGame.Server/Others/OrderDictionary.cs index a63f2a2..02b2883 100644 --- a/FunGame.Server/Others/OrderDictionary.cs +++ b/FunGame.Server/Others/OrderDictionary.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Server.Others +namespace Milimoe.FunGame.Server.Others { public class OrderDictionary { diff --git a/FunGame.Server/Utility/Utility.cs b/FunGame.Server/Utility/Utility.cs index cff974f..ad33cab 100644 --- a/FunGame.Server/Utility/Utility.cs +++ b/FunGame.Server/Utility/Utility.cs @@ -1,14 +1,8 @@ -using MySql.Data.MySqlClient; -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Server.Others; +using MySql.Data.MySqlClient; +using System.Collections; namespace Milimoe.FunGame.Server.Utility {