diff --git a/.gitignore b/.gitignore
index 105693f..d0b71bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -363,5 +363,5 @@ MigrationBackup/
FodyWeavers.xsd
# FunGame Implement
-FunGame.Implement/*.cs
-FunGame.Implement/Implement/*.cs
\ No newline at end of file
+Implement/*.cs
+Implement/Implement/*.cs
\ No newline at end of file
diff --git a/FunGame.Core/Api/Factory/CharacterFactory.cs b/Core/Api/Factory/CharacterFactory.cs
similarity index 100%
rename from FunGame.Core/Api/Factory/CharacterFactory.cs
rename to Core/Api/Factory/CharacterFactory.cs
diff --git a/FunGame.Core/Api/Factory/InventoryFactory.cs b/Core/Api/Factory/InventoryFactory.cs
similarity index 100%
rename from FunGame.Core/Api/Factory/InventoryFactory.cs
rename to Core/Api/Factory/InventoryFactory.cs
diff --git a/FunGame.Core/Api/Factory/ItemFactory.cs b/Core/Api/Factory/ItemFactory.cs
similarity index 100%
rename from FunGame.Core/Api/Factory/ItemFactory.cs
rename to Core/Api/Factory/ItemFactory.cs
diff --git a/FunGame.Core/Api/Factory/RoomFactory.cs b/Core/Api/Factory/RoomFactory.cs
similarity index 100%
rename from FunGame.Core/Api/Factory/RoomFactory.cs
rename to Core/Api/Factory/RoomFactory.cs
diff --git a/FunGame.Core/Api/Factory/SkillFactory.cs b/Core/Api/Factory/SkillFactory.cs
similarity index 100%
rename from FunGame.Core/Api/Factory/SkillFactory.cs
rename to Core/Api/Factory/SkillFactory.cs
diff --git a/FunGame.Core/Api/Factory/UserFactory.cs b/Core/Api/Factory/UserFactory.cs
similarity index 100%
rename from FunGame.Core/Api/Factory/UserFactory.cs
rename to Core/Api/Factory/UserFactory.cs
diff --git a/FunGame.Core/Api/Transmittal/MailSender.cs b/Core/Api/Transmittal/MailSender.cs
similarity index 100%
rename from FunGame.Core/Api/Transmittal/MailSender.cs
rename to Core/Api/Transmittal/MailSender.cs
diff --git a/FunGame.Core/Api/Transmittal/SQLHelper.cs b/Core/Api/Transmittal/SQLHelper.cs
similarity index 100%
rename from FunGame.Core/Api/Transmittal/SQLHelper.cs
rename to Core/Api/Transmittal/SQLHelper.cs
diff --git a/FunGame.Core/Api/Utility/ConcurrentQueue.cs b/Core/Api/Utility/ConcurrentQueue.cs
similarity index 100%
rename from FunGame.Core/Api/Utility/ConcurrentQueue.cs
rename to Core/Api/Utility/ConcurrentQueue.cs
diff --git a/FunGame.Core/Api/Utility/Factory.cs b/Core/Api/Utility/Factory.cs
similarity index 100%
rename from FunGame.Core/Api/Utility/Factory.cs
rename to Core/Api/Utility/Factory.cs
diff --git a/FunGame.Core/Api/Utility/General.cs b/Core/Api/Utility/General.cs
similarity index 100%
rename from FunGame.Core/Api/Utility/General.cs
rename to Core/Api/Utility/General.cs
diff --git a/FunGame.Core/Api/Utility/Implement.cs b/Core/Api/Utility/Implement.cs
similarity index 100%
rename from FunGame.Core/Api/Utility/Implement.cs
rename to Core/Api/Utility/Implement.cs
diff --git a/FunGame.Core/Api/Utility/Singleton.cs b/Core/Api/Utility/Singleton.cs
similarity index 100%
rename from FunGame.Core/Api/Utility/Singleton.cs
rename to Core/Api/Utility/Singleton.cs
diff --git a/FunGame.Core/Api/Utility/TextReader.cs b/Core/Api/Utility/TextReader.cs
similarity index 100%
rename from FunGame.Core/Api/Utility/TextReader.cs
rename to Core/Api/Utility/TextReader.cs
diff --git a/FunGame.Core/FunGame.Core.csproj b/Core/Core.csproj
similarity index 100%
rename from FunGame.Core/FunGame.Core.csproj
rename to Core/Core.csproj
diff --git a/FunGame.Core/Entity/BaseEntity.cs b/Core/Entity/BaseEntity.cs
similarity index 100%
rename from FunGame.Core/Entity/BaseEntity.cs
rename to Core/Entity/BaseEntity.cs
diff --git a/FunGame.Core/Entity/Character/Character.cs b/Core/Entity/Character/Character.cs
similarity index 100%
rename from FunGame.Core/Entity/Character/Character.cs
rename to Core/Entity/Character/Character.cs
diff --git a/FunGame.Core/Entity/Empty.cs b/Core/Entity/Empty.cs
similarity index 100%
rename from FunGame.Core/Entity/Empty.cs
rename to Core/Entity/Empty.cs
diff --git a/FunGame.Core/Entity/Item/ActiveItem.cs b/Core/Entity/Item/ActiveItem.cs
similarity index 100%
rename from FunGame.Core/Entity/Item/ActiveItem.cs
rename to Core/Entity/Item/ActiveItem.cs
diff --git a/FunGame.Core/Entity/Item/Item.cs b/Core/Entity/Item/Item.cs
similarity index 100%
rename from FunGame.Core/Entity/Item/Item.cs
rename to Core/Entity/Item/Item.cs
diff --git a/FunGame.Core/Entity/Item/PassiveItem.cs b/Core/Entity/Item/PassiveItem.cs
similarity index 100%
rename from FunGame.Core/Entity/Item/PassiveItem.cs
rename to Core/Entity/Item/PassiveItem.cs
diff --git a/FunGame.Core/Entity/Skill/ActiveSkill.cs b/Core/Entity/Skill/ActiveSkill.cs
similarity index 100%
rename from FunGame.Core/Entity/Skill/ActiveSkill.cs
rename to Core/Entity/Skill/ActiveSkill.cs
diff --git a/FunGame.Core/Entity/Skill/PassiveSkill.cs b/Core/Entity/Skill/PassiveSkill.cs
similarity index 100%
rename from FunGame.Core/Entity/Skill/PassiveSkill.cs
rename to Core/Entity/Skill/PassiveSkill.cs
diff --git a/FunGame.Core/Entity/Skill/Skill.cs b/Core/Entity/Skill/Skill.cs
similarity index 100%
rename from FunGame.Core/Entity/Skill/Skill.cs
rename to Core/Entity/Skill/Skill.cs
diff --git a/FunGame.Core/Entity/Statistics/CharacterStatistics.cs b/Core/Entity/Statistics/CharacterStatistics.cs
similarity index 100%
rename from FunGame.Core/Entity/Statistics/CharacterStatistics.cs
rename to Core/Entity/Statistics/CharacterStatistics.cs
diff --git a/FunGame.Core/Entity/Statistics/GameStatistics.cs b/Core/Entity/Statistics/GameStatistics.cs
similarity index 100%
rename from FunGame.Core/Entity/Statistics/GameStatistics.cs
rename to Core/Entity/Statistics/GameStatistics.cs
diff --git a/FunGame.Core/Entity/Statistics/UserStatistics.cs b/Core/Entity/Statistics/UserStatistics.cs
similarity index 100%
rename from FunGame.Core/Entity/Statistics/UserStatistics.cs
rename to Core/Entity/Statistics/UserStatistics.cs
diff --git a/FunGame.Core/Entity/System/Inventory.cs b/Core/Entity/System/Inventory.cs
similarity index 100%
rename from FunGame.Core/Entity/System/Inventory.cs
rename to Core/Entity/System/Inventory.cs
diff --git a/FunGame.Core/Entity/System/Room.cs b/Core/Entity/System/Room.cs
similarity index 100%
rename from FunGame.Core/Entity/System/Room.cs
rename to Core/Entity/System/Room.cs
diff --git a/FunGame.Core/Entity/User/User.cs b/Core/Entity/User/User.cs
similarity index 100%
rename from FunGame.Core/Entity/User/User.cs
rename to Core/Entity/User/User.cs
diff --git a/FunGame.Core/Interface/Base/IClientSocket.cs b/Core/Interface/Base/IClientSocket.cs
similarity index 100%
rename from FunGame.Core/Interface/Base/IClientSocket.cs
rename to Core/Interface/Base/IClientSocket.cs
diff --git a/FunGame.Core/Interface/Base/IMailSender.cs b/Core/Interface/Base/IMailSender.cs
similarity index 100%
rename from FunGame.Core/Interface/Base/IMailSender.cs
rename to Core/Interface/Base/IMailSender.cs
diff --git a/FunGame.Core/Interface/Base/ISQLHelper.cs b/Core/Interface/Base/ISQLHelper.cs
similarity index 100%
rename from FunGame.Core/Interface/Base/ISQLHelper.cs
rename to Core/Interface/Base/ISQLHelper.cs
diff --git a/FunGame.Core/Interface/Base/ISocket.cs b/Core/Interface/Base/ISocket.cs
similarity index 100%
rename from FunGame.Core/Interface/Base/ISocket.cs
rename to Core/Interface/Base/ISocket.cs
diff --git a/FunGame.Core/Interface/Base/ISocketHandler.cs b/Core/Interface/Base/ISocketHandler.cs
similarity index 100%
rename from FunGame.Core/Interface/Base/ISocketHandler.cs
rename to Core/Interface/Base/ISocketHandler.cs
diff --git a/FunGame.Core/Interface/Base/ISocketHeartBeat.cs b/Core/Interface/Base/ISocketHeartBeat.cs
similarity index 100%
rename from FunGame.Core/Interface/Base/ISocketHeartBeat.cs
rename to Core/Interface/Base/ISocketHeartBeat.cs
diff --git a/FunGame.Core/Interface/Entity/Base/IBaseEntity.cs b/Core/Interface/Entity/Base/IBaseEntity.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/Base/IBaseEntity.cs
rename to Core/Interface/Entity/Base/IBaseEntity.cs
diff --git a/FunGame.Core/Interface/Entity/Property/IActiveEnable.cs b/Core/Interface/Entity/Property/IActiveEnable.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/Property/IActiveEnable.cs
rename to Core/Interface/Entity/Property/IActiveEnable.cs
diff --git a/FunGame.Core/Interface/Entity/Relationship/IRelateCharacter.cs b/Core/Interface/Entity/Relationship/IRelateCharacter.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/Relationship/IRelateCharacter.cs
rename to Core/Interface/Entity/Relationship/IRelateCharacter.cs
diff --git a/FunGame.Core/Interface/Entity/Relationship/IRelateUser.cs b/Core/Interface/Entity/Relationship/IRelateUser.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/Relationship/IRelateUser.cs
rename to Core/Interface/Entity/Relationship/IRelateUser.cs
diff --git a/FunGame.Core/Interface/Entity/Typical/ICharacter.cs b/Core/Interface/Entity/Typical/ICharacter.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/Typical/ICharacter.cs
rename to Core/Interface/Entity/Typical/ICharacter.cs
diff --git a/FunGame.Core/Interface/Entity/Typical/IItem.cs b/Core/Interface/Entity/Typical/IItem.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/Typical/IItem.cs
rename to Core/Interface/Entity/Typical/IItem.cs
diff --git a/FunGame.Core/Interface/Event/EventHandlers.cs b/Core/Interface/Event/EventHandlers.cs
similarity index 100%
rename from FunGame.Core/Interface/Event/EventHandlers.cs
rename to Core/Interface/Event/EventHandlers.cs
diff --git a/FunGame.Core/Interface/Event/Events.cs b/Core/Interface/Event/Events.cs
similarity index 100%
rename from FunGame.Core/Interface/Event/Events.cs
rename to Core/Interface/Event/Events.cs
diff --git a/FunGame.Core/Interface/Example.cs b/Core/Interface/Example.cs
similarity index 100%
rename from FunGame.Core/Interface/Example.cs
rename to Core/Interface/Example.cs
diff --git a/FunGame.Core/Interface/General/IClient.cs b/Core/Interface/General/IClient.cs
similarity index 100%
rename from FunGame.Core/Interface/General/IClient.cs
rename to Core/Interface/General/IClient.cs
diff --git a/FunGame.Core/Interface/General/IServer.cs b/Core/Interface/General/IServer.cs
similarity index 100%
rename from FunGame.Core/Interface/General/IServer.cs
rename to Core/Interface/General/IServer.cs
diff --git a/FunGame.Core/Library/Common/Architecture/BaseController.cs b/Core/Library/Common/Architecture/BaseController.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Architecture/BaseController.cs
rename to Core/Library/Common/Architecture/BaseController.cs
diff --git a/FunGame.Core/Library/Common/Architecture/BaseModel.cs b/Core/Library/Common/Architecture/BaseModel.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Architecture/BaseModel.cs
rename to Core/Library/Common/Architecture/BaseModel.cs
diff --git a/FunGame.Core/Library/Common/Architecture/DataRequest.cs b/Core/Library/Common/Architecture/DataRequest.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Architecture/DataRequest.cs
rename to Core/Library/Common/Architecture/DataRequest.cs
diff --git a/FunGame.Core/Library/Common/Event/GeneralEventArgs.cs b/Core/Library/Common/Event/GeneralEventArgs.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Event/GeneralEventArgs.cs
rename to Core/Library/Common/Event/GeneralEventArgs.cs
diff --git a/FunGame.Core/Library/Common/Event/LoginEventArgs.cs b/Core/Library/Common/Event/LoginEventArgs.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Event/LoginEventArgs.cs
rename to Core/Library/Common/Event/LoginEventArgs.cs
diff --git a/FunGame.Core/Library/Common/Event/RegisterEventArgs.cs b/Core/Library/Common/Event/RegisterEventArgs.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Event/RegisterEventArgs.cs
rename to Core/Library/Common/Event/RegisterEventArgs.cs
diff --git a/FunGame.Core/Library/Common/Event/RoomEventArgs.cs b/Core/Library/Common/Event/RoomEventArgs.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Event/RoomEventArgs.cs
rename to Core/Library/Common/Event/RoomEventArgs.cs
diff --git a/FunGame.Core/Library/Common/Event/SendTalkEventArgs.cs b/Core/Library/Common/Event/SendTalkEventArgs.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Event/SendTalkEventArgs.cs
rename to Core/Library/Common/Event/SendTalkEventArgs.cs
diff --git a/FunGame.Core/Library/Common/Network/ClientSocket.cs b/Core/Library/Common/Network/ClientSocket.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Network/ClientSocket.cs
rename to Core/Library/Common/Network/ClientSocket.cs
diff --git a/FunGame.Core/Library/Common/Network/JsonObject.cs b/Core/Library/Common/Network/JsonObject.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Network/JsonObject.cs
rename to Core/Library/Common/Network/JsonObject.cs
diff --git a/FunGame.Core/Library/Common/Network/MailObject.cs b/Core/Library/Common/Network/MailObject.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Network/MailObject.cs
rename to Core/Library/Common/Network/MailObject.cs
diff --git a/FunGame.Core/Library/Common/Network/ServerSocket.cs b/Core/Library/Common/Network/ServerSocket.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Network/ServerSocket.cs
rename to Core/Library/Common/Network/ServerSocket.cs
diff --git a/FunGame.Core/Library/Common/Network/Socket.cs b/Core/Library/Common/Network/Socket.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Network/Socket.cs
rename to Core/Library/Common/Network/Socket.cs
diff --git a/FunGame.Core/Library/Common/Network/SocketObject.cs b/Core/Library/Common/Network/SocketObject.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Network/SocketObject.cs
rename to Core/Library/Common/Network/SocketObject.cs
diff --git a/FunGame.Core/Library/Common/Plugin/BasePlugin.cs b/Core/Library/Common/Plugin/BasePlugin.cs
similarity index 100%
rename from FunGame.Core/Library/Common/Plugin/BasePlugin.cs
rename to Core/Library/Common/Plugin/BasePlugin.cs
diff --git a/FunGame.Core/Library/Constant/ConstantSet.cs b/Core/Library/Constant/ConstantSet.cs
similarity index 100%
rename from FunGame.Core/Library/Constant/ConstantSet.cs
rename to Core/Library/Constant/ConstantSet.cs
diff --git a/FunGame.Core/Library/Constant/FunGameInfo.cs b/Core/Library/Constant/FunGameInfo.cs
similarity index 100%
rename from FunGame.Core/Library/Constant/FunGameInfo.cs
rename to Core/Library/Constant/FunGameInfo.cs
diff --git a/FunGame.Core/Library/Constant/General.cs b/Core/Library/Constant/General.cs
similarity index 100%
rename from FunGame.Core/Library/Constant/General.cs
rename to Core/Library/Constant/General.cs
diff --git a/FunGame.Core/Library/Constant/MethodEnum.cs b/Core/Library/Constant/MethodEnum.cs
similarity index 100%
rename from FunGame.Core/Library/Constant/MethodEnum.cs
rename to Core/Library/Constant/MethodEnum.cs
diff --git a/FunGame.Core/Library/Constant/ResultEnum.cs b/Core/Library/Constant/ResultEnum.cs
similarity index 100%
rename from FunGame.Core/Library/Constant/ResultEnum.cs
rename to Core/Library/Constant/ResultEnum.cs
diff --git a/FunGame.Core/Library/Constant/StateEnum.cs b/Core/Library/Constant/StateEnum.cs
similarity index 100%
rename from FunGame.Core/Library/Constant/StateEnum.cs
rename to Core/Library/Constant/StateEnum.cs
diff --git a/FunGame.Core/Library/Constant/TypeEnum.cs b/Core/Library/Constant/TypeEnum.cs
similarity index 100%
rename from FunGame.Core/Library/Constant/TypeEnum.cs
rename to Core/Library/Constant/TypeEnum.cs
diff --git a/FunGame.Core/Library/Exception/Exception.cs b/Core/Library/Exception/Exception.cs
similarity index 100%
rename from FunGame.Core/Library/Exception/Exception.cs
rename to Core/Library/Exception/Exception.cs
diff --git a/FunGame.Core/Library/Exception/ExceptionExtension.cs b/Core/Library/Exception/ExceptionExtension.cs
similarity index 100%
rename from FunGame.Core/Library/Exception/ExceptionExtension.cs
rename to Core/Library/Exception/ExceptionExtension.cs
diff --git a/FunGame.Core/Library/SQLScript/Common/Common.cs b/Core/Library/SQLScript/Common/Common.cs
similarity index 100%
rename from FunGame.Core/Library/SQLScript/Common/Common.cs
rename to Core/Library/SQLScript/Common/Common.cs
diff --git a/FunGame.Core/Library/SQLScript/Entity/RoomQuery.cs b/Core/Library/SQLScript/Entity/RoomQuery.cs
similarity index 100%
rename from FunGame.Core/Library/SQLScript/Entity/RoomQuery.cs
rename to Core/Library/SQLScript/Entity/RoomQuery.cs
diff --git a/FunGame.Core/Library/SQLScript/Entity/UserQuery.cs b/Core/Library/SQLScript/Entity/UserQuery.cs
similarity index 100%
rename from FunGame.Core/Library/SQLScript/Entity/UserQuery.cs
rename to Core/Library/SQLScript/Entity/UserQuery.cs
diff --git a/FunGame.Core/Library/Server/BaseModel.cs b/Core/Library/Server/BaseModel.cs
similarity index 100%
rename from FunGame.Core/Library/Server/BaseModel.cs
rename to Core/Library/Server/BaseModel.cs
diff --git a/FunGame.Core/Library/Server/RoomList.cs b/Core/Library/Server/RoomList.cs
similarity index 100%
rename from FunGame.Core/Library/Server/RoomList.cs
rename to Core/Library/Server/RoomList.cs
diff --git a/FunGame.Core/Library/Server/SQLServerInfo.cs b/Core/Library/Server/SQLServerInfo.cs
similarity index 100%
rename from FunGame.Core/Library/Server/SQLServerInfo.cs
rename to Core/Library/Server/SQLServerInfo.cs
diff --git a/FunGame.Core/Library/Server/SmtpClientInfo.cs b/Core/Library/Server/SmtpClientInfo.cs
similarity index 100%
rename from FunGame.Core/Library/Server/SmtpClientInfo.cs
rename to Core/Library/Server/SmtpClientInfo.cs
diff --git a/FunGame.Core/Others/Others.cs b/Core/Others/Others.cs
similarity index 100%
rename from FunGame.Core/Others/Others.cs
rename to Core/Others/Others.cs
diff --git a/FunGame.Core/Service/MailManager.cs b/Core/Service/MailManager.cs
similarity index 100%
rename from FunGame.Core/Service/MailManager.cs
rename to Core/Service/MailManager.cs
diff --git a/FunGame.Core/Service/ModelManager.cs b/Core/Service/ModelManager.cs
similarity index 100%
rename from FunGame.Core/Service/ModelManager.cs
rename to Core/Service/ModelManager.cs
diff --git a/FunGame.Core/Service/PluginManager.cs b/Core/Service/PluginManager.cs
similarity index 100%
rename from FunGame.Core/Service/PluginManager.cs
rename to Core/Service/PluginManager.cs
diff --git a/FunGame.Core/Service/RedisManager.cs b/Core/Service/RedisManager.cs
similarity index 100%
rename from FunGame.Core/Service/RedisManager.cs
rename to Core/Service/RedisManager.cs
diff --git a/FunGame.Core/Service/ResourceManager.cs b/Core/Service/ResourceManager.cs
similarity index 100%
rename from FunGame.Core/Service/ResourceManager.cs
rename to Core/Service/ResourceManager.cs
diff --git a/FunGame.Core/Service/SocketManager.cs b/Core/Service/SocketManager.cs
similarity index 100%
rename from FunGame.Core/Service/SocketManager.cs
rename to Core/Service/SocketManager.cs
diff --git a/FunGame.Console/FunGame.Console.csproj b/FunGame.Console/FunGame.Console.csproj
deleted file mode 100644
index 31bcbd3..0000000
--- a/FunGame.Console/FunGame.Console.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- Exe
- net7.0
- enable
- enable
- Milimoe
- Milimoe
- FunGame
- FunGame.Console
- logo.ico
- ..\bin\
- FunGame
- Milimoe.$(MSBuildProjectName.Replace(" ", "_"))
-
-
-
- embedded
-
-
-
- embedded
-
-
-
-
-
-
-
diff --git a/FunGame.Console/Main.cs b/FunGame.Console/Main.cs
deleted file mode 100644
index 0794a3d..0000000
--- a/FunGame.Console/Main.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-Console.WriteLine("Hello, FunGame's Console!");
-Console.ReadKey();
diff --git a/FunGame.Console/images/logo.ico b/FunGame.Console/images/logo.ico
deleted file mode 100644
index 4082874..0000000
Binary files a/FunGame.Console/images/logo.ico and /dev/null differ
diff --git a/FunGame.Console/logo.ico b/FunGame.Console/logo.ico
deleted file mode 100644
index 4082874..0000000
Binary files a/FunGame.Console/logo.ico and /dev/null differ
diff --git a/FunGame.Desktop/Controller/InventoryController.cs b/FunGame.Desktop/Controller/InventoryController.cs
deleted file mode 100644
index eadd5d6..0000000
--- a/FunGame.Desktop/Controller/InventoryController.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Milimoe.FunGame.Desktop.Controller
-{
- public class InventoryController
- {
- }
-}
diff --git a/FunGame.Desktop/Controller/LoginController.cs b/FunGame.Desktop/Controller/LoginController.cs
deleted file mode 100644
index 2ca0ee9..0000000
--- a/FunGame.Desktop/Controller/LoginController.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-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;
-
-namespace Milimoe.FunGame.Desktop.Controller
-{
- public class LoginController : BaseController
- {
- private readonly LoginModel LoginModel;
-
- public LoginController()
- {
- LoginModel = new LoginModel();
- }
-
- public override void Dispose()
- {
- LoginModel.Dispose();
- }
-
- public static async Task LoginAccount(params object[]? objs)
- {
- bool result = false;
-
- try
- {
- LoginEventArgs LoginEventArgs = new(objs);
- if (RunTime.Login?.OnBeforeLoginEvent(LoginEventArgs) == Core.Library.Constant.EventResult.Fail) return false;
-
- result = await LoginModel.LoginAccountAsync(objs);
-
- if (result) RunTime.Login?.OnSucceedLoginEvent(LoginEventArgs);
- else RunTime.Login?.OnFailedLoginEvent(LoginEventArgs);
- RunTime.Login?.OnAfterLoginEvent(LoginEventArgs);
- }
- catch (Exception e)
- {
- RunTime.WritelnSystemInfo(e.GetErrorInfo());
- }
-
- return result;
- }
- }
-}
diff --git a/FunGame.Desktop/Controller/MainController.cs b/FunGame.Desktop/Controller/MainController.cs
deleted file mode 100644
index 57697b9..0000000
--- a/FunGame.Desktop/Controller/MainController.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using Milimoe.FunGame.Core.Library.Common.Event;
-using Milimoe.FunGame.Core.Library.Common.Architecture;
-using Milimoe.FunGame.Core.Library.Constant;
-using Milimoe.FunGame.Desktop.Model;
-using Milimoe.FunGame.Desktop.UI;
-using Milimoe.FunGame.Desktop.Library;
-
-namespace Milimoe.FunGame.Desktop.Controller
-{
- public class MainController : BaseController
- {
- public bool Connected => Do(MainInvokeType.Connected);
-
- private MainModel MainModel { get; }
- private Main Main { get; }
-
- public MainController(Main Main)
- {
- this.Main = Main;
- MainModel = new MainModel(Main);
- }
-
- public override void Dispose()
- {
- MainModel.Dispose();
- }
-
- /**
- * 从内部去调用Model的方法,并记录日志。
- */
- private T Do(MainInvokeType DoType, params object[] args)
- {
- object result = new();
- switch(DoType)
- {
- case MainInvokeType.LogOut:
- if (Main.OnBeforeLogoutEvent(new GeneralEventArgs()) == EventResult.Fail) return (T)result;
- result = MainModel.LogOut();
- break;
-
- case MainInvokeType.IntoRoom:
- string roomid = new("-1");
- if (args != null && args.Length > 0) roomid = (string)args[0];
- if (Main.OnBeforeIntoRoomEvent(new RoomEventArgs(roomid)) == EventResult.Fail) return (T)result;
- result = MainModel.IntoRoom(roomid);
- break;
-
- case MainInvokeType.UpdateRoom:
- result = MainModel.UpdateRoom();
- break;
-
- case MainInvokeType.QuitRoom:
- roomid = new("-1");
- if (args != null && args.Length > 0) roomid = (string)args[0];
- if (Main.OnBeforeQuitRoomEvent(new RoomEventArgs(roomid)) == EventResult.Fail) return (T)result;
- result = MainModel.QuitRoom(roomid);
- break;
-
- case MainInvokeType.CreateRoom:
- if (Main.OnBeforeCreateRoomEvent(new RoomEventArgs()) == EventResult.Fail) return (T)result;
- result = MainModel.CreateRoom();
- break;
-
- case MainInvokeType.Chat:
- string msg = "";
- if (args != null && args.Length > 0) msg = (string)args[0];
- if (Main.OnBeforeSendTalkEvent(new SendTalkEventArgs(msg)) == EventResult.Fail) return (T)result;
- if (msg.Trim() != "") result = MainModel.Chat(msg);
- break;
-
- default:
- break;
- }
- return (T)result;
- }
-
- public bool LogOut()
- {
- return Do(MainInvokeType.LogOut);
- }
-
- public bool UpdateRoom()
- {
- return Do(MainInvokeType.UpdateRoom);
- }
-
- public bool IntoRoom(string roomid)
- {
- return Do(MainInvokeType.IntoRoom, roomid);
- }
-
- public bool QuitRoom(string roomid)
- {
- return Do(MainInvokeType.QuitRoom, roomid);
- }
-
- public bool CreateRoom()
- {
- return Do(MainInvokeType.CreateRoom);
- }
-
- public bool Chat(string msg)
- {
- return Do(MainInvokeType.Chat, msg);
- }
- }
-}
diff --git a/FunGame.Desktop/Controller/RegisterController.cs b/FunGame.Desktop/Controller/RegisterController.cs
deleted file mode 100644
index 5368dc7..0000000
--- a/FunGame.Desktop/Controller/RegisterController.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Milimoe.FunGame.Desktop.Library.Component;
-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;
-
-namespace Milimoe.FunGame.Desktop.Controller
-{
- public class RegisterController : BaseController
- {
- private readonly Register Register;
- private readonly RegisterModel RegModel;
-
- public RegisterController(Register reg)
- {
- Register = reg;
- RegModel = new RegisterModel(reg);
- }
-
- public override void Dispose()
- {
- RegModel.Dispose();
- }
-
- public async Task Reg(params object[]? objs)
- {
- bool result = false;
-
- try
- {
- RegisterEventArgs RegEventArgs = new (objs);
- if (Register.OnBeforeRegEvent(RegEventArgs) == EventResult.Fail) return false;
-
- result = await RegModel.Reg(objs);
-
- if (result) Register.OnSucceedRegEvent(RegEventArgs);
- else Register.OnFailedRegEvent(RegEventArgs);
- Register.OnAfterRegEvent(RegEventArgs);
- }
- catch (Exception e)
- {
- RunTime.WritelnSystemInfo(e.GetErrorInfo());
- }
-
- return result;
- }
- }
-}
diff --git a/FunGame.Desktop/Controller/RoomSettingController.cs b/FunGame.Desktop/Controller/RoomSettingController.cs
deleted file mode 100644
index 47dcd9d..0000000
--- a/FunGame.Desktop/Controller/RoomSettingController.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Milimoe.FunGame.Desktop.Controller
-{
- public class RoomSettingController
- {
- }
-}
diff --git a/FunGame.Desktop/Controller/RunTimeController.cs b/FunGame.Desktop/Controller/RunTimeController.cs
deleted file mode 100644
index d473d0e..0000000
--- a/FunGame.Desktop/Controller/RunTimeController.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using Milimoe.FunGame.Core.Library.Common.Event;
-using Milimoe.FunGame.Core.Library.Constant;
-using Milimoe.FunGame.Desktop.Library;
-using Milimoe.FunGame.Desktop.Model;
-using Milimoe.FunGame.Desktop.UI;
-
-namespace Milimoe.FunGame.Desktop.Controller
-{
- public class RunTimeController
- {
- public bool Connected => Do(RunTimeInvokeType.Connected);
-
- private RunTimeModel RunTimeModel { get; }
- private Main Main { get; }
-
- public RunTimeController(Main Main)
- {
- this.Main = Main;
- RunTimeModel = new RunTimeModel(Main);
- }
-
- /**
- * 从内部去调用Model的方法,并记录日志。
- */
- private T Do(RunTimeInvokeType DoType, params object[] args)
- {
- object result = new();
- switch (DoType)
- {
- case RunTimeInvokeType.GetServerConnection:
- result = RunTimeModel.GetServerConnection();
- break;
-
- case RunTimeInvokeType.Connect:
- result = RunTimeModel.Connect();
- if ((ConnectResult)result != ConnectResult.Success)
- {
- Main.OnFailedConnectEvent(new GeneralEventArgs());
- Main.OnAfterConnectEvent(new GeneralEventArgs());
- }
- break;
-
- case RunTimeInvokeType.Connected:
- result = RunTimeModel.Connected;
- break;
-
- case RunTimeInvokeType.Disconnect:
- if (Main.OnBeforeDisconnectEvent(new GeneralEventArgs()) == EventResult.Fail) return (T)result;
- RunTimeModel.Disconnect();
- break;
-
- case RunTimeInvokeType.Disconnected:
- break;
-
- case RunTimeInvokeType.AutoLogin:
- break;
-
- case RunTimeInvokeType.Close:
- if (args != null && args.Length > 0)
- {
- RunTimeModel.Error((Exception)args[0]);
- result = true;
- }
- else
- result = RunTimeModel.Close();
- break;
-
- default:
- break;
- }
- return (T)result;
- }
-
- public bool GetServerConnection()
- {
- return Do(RunTimeInvokeType.GetServerConnection);
- }
-
- public ConnectResult Connect()
- {
- return Do(RunTimeInvokeType.Connect);
- }
-
- public void Disconnect()
- {
- Do