diff --git a/FunGame.Server/Model/ServerModel.cs b/FunGame.Server/Model/ServerModel.cs index 248d014..28c0ed9 100644 --- a/FunGame.Server/Model/ServerModel.cs +++ b/FunGame.Server/Model/ServerModel.cs @@ -2,9 +2,9 @@ using Milimoe.FunGame.Core.Api.Transmittal; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Interface.Base; using Milimoe.FunGame.Core.Library.Common.Network; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Library.Server; using Milimoe.FunGame.Core.Library.SQLScript.Common; using Milimoe.FunGame.Core.Library.SQLScript.Entity; using Milimoe.FunGame.Server.Others; @@ -12,16 +12,16 @@ using Milimoe.FunGame.Server.Utility; namespace Milimoe.FunGame.Server.Model { - public class ServerModel : BaseModel + public class ServerModel : IServerModel { /** * Public */ - public override bool Running => _Running; - public override ClientSocket? Socket => _Socket; - public override Task? Task => _Task; - public override string ClientName => _ClientName; - public override User? User => _User; + public bool Running => _Running; + public ClientSocket? Socket => _Socket; + public Task? Task => _Task; + public string ClientName => _ClientName; + public User? User => _User; /** * Private @@ -57,7 +57,7 @@ namespace Milimoe.FunGame.Server.Model GetUsersCount(); } - public override bool Read(ClientSocket socket) + public bool Read(ClientSocket socket) { // 接收客户端消息 try @@ -410,7 +410,7 @@ namespace Milimoe.FunGame.Server.Model } } - public override bool Send(ClientSocket socket, SocketMessageType type, params object[] objs) + public bool Send(ClientSocket socket, SocketMessageType type, params object[] objs) { // 发送消息给客户端 try @@ -444,7 +444,7 @@ namespace Milimoe.FunGame.Server.Model } } - public override void Start() + public void Start() { Task StreamReader = Task.Factory.StartNew(() => { diff --git a/FunGame.Server/Others/Config.cs b/FunGame.Server/Others/Config.cs index 088d22f..27d9627 100644 --- a/FunGame.Server/Others/Config.cs +++ b/FunGame.Server/Others/Config.cs @@ -1,7 +1,7 @@ using System.Text; using System.Collections; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Library.Server; +using Milimoe.FunGame.Core.Library.Common.Architecture; namespace Milimoe.FunGame.Server.Others { diff --git a/FunGame.Server/Utility/DataUtility/MySQLConnection.cs b/FunGame.Server/Utility/DataUtility/MySQLConnection.cs index 9f06369..30f821d 100644 --- a/FunGame.Server/Utility/DataUtility/MySQLConnection.cs +++ b/FunGame.Server/Utility/DataUtility/MySQLConnection.cs @@ -1,6 +1,6 @@ using MySql.Data.MySqlClient; using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Library.Server; +using Milimoe.FunGame.Core.Library.Common.Architecture; namespace Milimoe.FunGame.Server.Utility.DataUtility { diff --git a/FunGame.Server/Utility/DataUtility/MySQLHelper.cs b/FunGame.Server/Utility/DataUtility/MySQLHelper.cs index da45672..e31d8b8 100644 --- a/FunGame.Server/Utility/DataUtility/MySQLHelper.cs +++ b/FunGame.Server/Utility/DataUtility/MySQLHelper.cs @@ -2,7 +2,7 @@ using MySql.Data.MySqlClient; using Milimoe.FunGame.Core.Api.Transmittal; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Library.Server; +using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Server.Utility.DataUtility; using Milimoe.FunGame.Server.Others; using Milimoe.FunGame.Server.Model;