diff --git a/FunGame.Desktop/Controller/LoginController.cs b/FunGame.Desktop/Controller/LoginController.cs index 757fdb3..1feeae9 100644 --- a/FunGame.Desktop/Controller/LoginController.cs +++ b/FunGame.Desktop/Controller/LoginController.cs @@ -1,12 +1,12 @@ using Milimoe.FunGame.Core.Library.Common.Event; -using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Desktop.Library; using Milimoe.FunGame.Desktop.Model; using Milimoe.FunGame.Core.Library.Exception; +using Milimoe.FunGame.Core.Controller; namespace Milimoe.FunGame.Desktop.Controller { - public class LoginController : BaseController + public class LoginController : SocketHandlerController { private readonly LoginModel LoginModel; diff --git a/FunGame.Desktop/Controller/MainController.cs b/FunGame.Desktop/Controller/MainController.cs index 021d18d..45ca865 100644 --- a/FunGame.Desktop/Controller/MainController.cs +++ b/FunGame.Desktop/Controller/MainController.cs @@ -1,5 +1,5 @@ -using Milimoe.FunGame.Core.Entity; -using Milimoe.FunGame.Core.Library.Common.Architecture; +using Milimoe.FunGame.Core.Controller; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Event; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.Exception; @@ -9,7 +9,7 @@ using Milimoe.FunGame.Desktop.UI; namespace Milimoe.FunGame.Desktop.Controller { - public class MainController : BaseController + public class MainController : SocketHandlerController { private MainModel MainModel { get; } private Main Main { get; } diff --git a/FunGame.Desktop/Controller/RegisterController.cs b/FunGame.Desktop/Controller/RegisterController.cs index ec871a9..904aa51 100644 --- a/FunGame.Desktop/Controller/RegisterController.cs +++ b/FunGame.Desktop/Controller/RegisterController.cs @@ -1,15 +1,14 @@ -using Milimoe.FunGame.Desktop.Library.Component; -using Milimoe.FunGame.Desktop.Library; +using Milimoe.FunGame.Desktop.Library; using Milimoe.FunGame.Desktop.Model; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Desktop.UI; -using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Core.Library.Exception; using Milimoe.FunGame.Core.Library.Common.Event; +using Milimoe.FunGame.Core.Controller; namespace Milimoe.FunGame.Desktop.Controller { - public class RegisterController : BaseController + public class RegisterController : SocketHandlerController { private readonly Register Register; private readonly RegisterModel RegModel; diff --git a/FunGame.Desktop/Model/LoginModel.cs b/FunGame.Desktop/Model/LoginModel.cs index 0ec7c2b..19412cf 100644 --- a/FunGame.Desktop/Model/LoginModel.cs +++ b/FunGame.Desktop/Model/LoginModel.cs @@ -1,21 +1,21 @@ using Milimoe.FunGame.Core.Api.Transmittal; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; -using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Core.Library.Common.Network; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.Exception; using Milimoe.FunGame.Core.Library.SQLScript.Common; using Milimoe.FunGame.Core.Library.SQLScript.Entity; -using Milimoe.FunGame.Desktop.Library; +using Milimoe.FunGame.Core.Model; using Milimoe.FunGame.Desktop.Library.Component; +using RunTime = Milimoe.FunGame.Desktop.Library.RunTime; namespace Milimoe.FunGame.Desktop.Model { /// /// 请不要越过Controller直接调用Model中的方法。 /// - public class LoginModel : BaseModel + public class LoginModel : SocketHandlerModel { private static new SocketObject Work; private static new bool Working = false; diff --git a/FunGame.Desktop/Model/MainModel.cs b/FunGame.Desktop/Model/MainModel.cs index bd2a902..4a0ffb2 100644 --- a/FunGame.Desktop/Model/MainModel.cs +++ b/FunGame.Desktop/Model/MainModel.cs @@ -1,18 +1,18 @@ using Milimoe.FunGame.Core.Entity; -using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Core.Library.Common.Network; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.Exception; -using Milimoe.FunGame.Desktop.Library; +using Milimoe.FunGame.Core.Model; using Milimoe.FunGame.Desktop.Library.Component; using Milimoe.FunGame.Desktop.UI; +using RunTime = Milimoe.FunGame.Desktop.Library.RunTime; namespace Milimoe.FunGame.Desktop.Model { - public class MainModel : BaseModel + public class MainModel : SocketHandlerModel { private readonly Main Main; - private readonly Core.Model.Session Usercfg = RunTime.Session; + private readonly Session Usercfg = RunTime.Session; public MainModel(Main main) : base(RunTime.Socket) { diff --git a/FunGame.Desktop/Model/RegisterModel.cs b/FunGame.Desktop/Model/RegisterModel.cs index dfe2ffc..4754dc5 100644 --- a/FunGame.Desktop/Model/RegisterModel.cs +++ b/FunGame.Desktop/Model/RegisterModel.cs @@ -1,15 +1,15 @@ using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Core.Library.Common.Network; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.Exception; +using Milimoe.FunGame.Core.Model; using Milimoe.FunGame.Desktop.Library; using Milimoe.FunGame.Desktop.Library.Component; -using Milimoe.FunGame.Desktop.UI; +using RunTime = Milimoe.FunGame.Desktop.Library.RunTime; namespace Milimoe.FunGame.Desktop.Model { - public class RegisterModel : BaseModel + public class RegisterModel : SocketHandlerModel { public RegisterModel() : base(RunTime.Socket) {