diff --git a/.gitignore b/.gitignore index d0b71bb..9491a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -360,8 +360,4 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd - -# FunGame Implement -Implement/*.cs -Implement/Implement/*.cs \ No newline at end of file +FodyWeavers.xsd \ No newline at end of file diff --git a/Core/Api/Factory/CharacterFactory.cs b/Api/Factory/CharacterFactory.cs similarity index 100% rename from Core/Api/Factory/CharacterFactory.cs rename to Api/Factory/CharacterFactory.cs diff --git a/Core/Api/Factory/InventoryFactory.cs b/Api/Factory/InventoryFactory.cs similarity index 100% rename from Core/Api/Factory/InventoryFactory.cs rename to Api/Factory/InventoryFactory.cs diff --git a/Core/Api/Factory/ItemFactory.cs b/Api/Factory/ItemFactory.cs similarity index 100% rename from Core/Api/Factory/ItemFactory.cs rename to Api/Factory/ItemFactory.cs diff --git a/Core/Api/Factory/RoomFactory.cs b/Api/Factory/RoomFactory.cs similarity index 100% rename from Core/Api/Factory/RoomFactory.cs rename to Api/Factory/RoomFactory.cs diff --git a/Core/Api/Factory/SkillFactory.cs b/Api/Factory/SkillFactory.cs similarity index 100% rename from Core/Api/Factory/SkillFactory.cs rename to Api/Factory/SkillFactory.cs diff --git a/Core/Api/Factory/UserFactory.cs b/Api/Factory/UserFactory.cs similarity index 100% rename from Core/Api/Factory/UserFactory.cs rename to Api/Factory/UserFactory.cs diff --git a/Core/Api/Transmittal/MailSender.cs b/Api/Transmittal/MailSender.cs similarity index 100% rename from Core/Api/Transmittal/MailSender.cs rename to Api/Transmittal/MailSender.cs diff --git a/Core/Api/Transmittal/SQLHelper.cs b/Api/Transmittal/SQLHelper.cs similarity index 100% rename from Core/Api/Transmittal/SQLHelper.cs rename to Api/Transmittal/SQLHelper.cs diff --git a/Core/Api/Utility/ConcurrentQueue.cs b/Api/Utility/ConcurrentQueue.cs similarity index 100% rename from Core/Api/Utility/ConcurrentQueue.cs rename to Api/Utility/ConcurrentQueue.cs diff --git a/Core/Api/Utility/Factory.cs b/Api/Utility/Factory.cs similarity index 100% rename from Core/Api/Utility/Factory.cs rename to Api/Utility/Factory.cs diff --git a/Core/Api/Utility/General.cs b/Api/Utility/General.cs similarity index 100% rename from Core/Api/Utility/General.cs rename to Api/Utility/General.cs diff --git a/Core/Api/Utility/Implement.cs b/Api/Utility/Implement.cs similarity index 100% rename from Core/Api/Utility/Implement.cs rename to Api/Utility/Implement.cs diff --git a/Core/Api/Utility/Singleton.cs b/Api/Utility/Singleton.cs similarity index 100% rename from Core/Api/Utility/Singleton.cs rename to Api/Utility/Singleton.cs diff --git a/Core/Api/Utility/TextReader.cs b/Api/Utility/TextReader.cs similarity index 100% rename from Core/Api/Utility/TextReader.cs rename to Api/Utility/TextReader.cs diff --git a/Core/Entity/BaseEntity.cs b/Entity/BaseEntity.cs similarity index 100% rename from Core/Entity/BaseEntity.cs rename to Entity/BaseEntity.cs diff --git a/Core/Entity/Character/Character.cs b/Entity/Character/Character.cs similarity index 100% rename from Core/Entity/Character/Character.cs rename to Entity/Character/Character.cs diff --git a/Core/Entity/Empty.cs b/Entity/Empty.cs similarity index 100% rename from Core/Entity/Empty.cs rename to Entity/Empty.cs diff --git a/Core/Entity/Item/ActiveItem.cs b/Entity/Item/ActiveItem.cs similarity index 100% rename from Core/Entity/Item/ActiveItem.cs rename to Entity/Item/ActiveItem.cs diff --git a/Core/Entity/Item/Item.cs b/Entity/Item/Item.cs similarity index 100% rename from Core/Entity/Item/Item.cs rename to Entity/Item/Item.cs diff --git a/Core/Entity/Item/PassiveItem.cs b/Entity/Item/PassiveItem.cs similarity index 100% rename from Core/Entity/Item/PassiveItem.cs rename to Entity/Item/PassiveItem.cs diff --git a/Core/Entity/Skill/ActiveSkill.cs b/Entity/Skill/ActiveSkill.cs similarity index 100% rename from Core/Entity/Skill/ActiveSkill.cs rename to Entity/Skill/ActiveSkill.cs diff --git a/Core/Entity/Skill/PassiveSkill.cs b/Entity/Skill/PassiveSkill.cs similarity index 100% rename from Core/Entity/Skill/PassiveSkill.cs rename to Entity/Skill/PassiveSkill.cs diff --git a/Core/Entity/Skill/Skill.cs b/Entity/Skill/Skill.cs similarity index 100% rename from Core/Entity/Skill/Skill.cs rename to Entity/Skill/Skill.cs diff --git a/Core/Entity/Statistics/CharacterStatistics.cs b/Entity/Statistics/CharacterStatistics.cs similarity index 100% rename from Core/Entity/Statistics/CharacterStatistics.cs rename to Entity/Statistics/CharacterStatistics.cs diff --git a/Core/Entity/Statistics/GameStatistics.cs b/Entity/Statistics/GameStatistics.cs similarity index 100% rename from Core/Entity/Statistics/GameStatistics.cs rename to Entity/Statistics/GameStatistics.cs diff --git a/Core/Entity/Statistics/UserStatistics.cs b/Entity/Statistics/UserStatistics.cs similarity index 100% rename from Core/Entity/Statistics/UserStatistics.cs rename to Entity/Statistics/UserStatistics.cs diff --git a/Core/Entity/System/Inventory.cs b/Entity/System/Inventory.cs similarity index 100% rename from Core/Entity/System/Inventory.cs rename to Entity/System/Inventory.cs diff --git a/Core/Entity/System/Room.cs b/Entity/System/Room.cs similarity index 100% rename from Core/Entity/System/Room.cs rename to Entity/System/Room.cs diff --git a/Core/Entity/User/User.cs b/Entity/User/User.cs similarity index 100% rename from Core/Entity/User/User.cs rename to Entity/User/User.cs diff --git a/Core/Core.csproj b/FunGame.csproj similarity index 100% rename from Core/Core.csproj rename to FunGame.csproj diff --git a/FunGame.sln b/FunGame.sln index 1198777..6ecf086 100644 --- a/FunGame.sln +++ b/FunGame.sln @@ -2,12 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32804.467 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Implement", "Implement\Implement.csproj", "{CC6C83C6-5818-4565-8873-67587FED1D0A}" - ProjectSection(ProjectDependencies) = postProject - {842BB22E-4309-4ADD-93CD-A981CE10C30E} = {842BB22E-4309-4ADD-93CD-A981CE10C30E} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{842BB22E-4309-4ADD-93CD-A981CE10C30E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunGame", "FunGame.csproj", "{842BB22E-4309-4ADD-93CD-A981CE10C30E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Implement/Implement.csproj b/Implement/Implement.csproj deleted file mode 100644 index 538b5cc..0000000 --- a/Implement/Implement.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - net7.0 - enable - enable - Milimoe - ..\bin - Milimoe - Implement - ..\bin - 1.0 - 1.0 - Milimoe.FunGame.Core.Implement - FunGame.$(MSBuildProjectName) - - - - embedded - - - - embedded - - - - - - - diff --git a/Core/Interface/Base/IClientSocket.cs b/Interface/Base/IClientSocket.cs similarity index 100% rename from Core/Interface/Base/IClientSocket.cs rename to Interface/Base/IClientSocket.cs diff --git a/Core/Interface/Base/IMailSender.cs b/Interface/Base/IMailSender.cs similarity index 100% rename from Core/Interface/Base/IMailSender.cs rename to Interface/Base/IMailSender.cs diff --git a/Core/Interface/Base/ISQLHelper.cs b/Interface/Base/ISQLHelper.cs similarity index 100% rename from Core/Interface/Base/ISQLHelper.cs rename to Interface/Base/ISQLHelper.cs diff --git a/Core/Interface/Base/ISocket.cs b/Interface/Base/ISocket.cs similarity index 100% rename from Core/Interface/Base/ISocket.cs rename to Interface/Base/ISocket.cs diff --git a/Core/Interface/Base/ISocketHandler.cs b/Interface/Base/ISocketHandler.cs similarity index 100% rename from Core/Interface/Base/ISocketHandler.cs rename to Interface/Base/ISocketHandler.cs diff --git a/Core/Interface/Base/ISocketHeartBeat.cs b/Interface/Base/ISocketHeartBeat.cs similarity index 100% rename from Core/Interface/Base/ISocketHeartBeat.cs rename to Interface/Base/ISocketHeartBeat.cs diff --git a/Core/Interface/Entity/Base/IBaseEntity.cs b/Interface/Entity/Base/IBaseEntity.cs similarity index 100% rename from Core/Interface/Entity/Base/IBaseEntity.cs rename to Interface/Entity/Base/IBaseEntity.cs diff --git a/Core/Interface/Entity/Property/IActiveEnable.cs b/Interface/Entity/Property/IActiveEnable.cs similarity index 100% rename from Core/Interface/Entity/Property/IActiveEnable.cs rename to Interface/Entity/Property/IActiveEnable.cs diff --git a/Core/Interface/Entity/Relationship/IRelateCharacter.cs b/Interface/Entity/Relationship/IRelateCharacter.cs similarity index 100% rename from Core/Interface/Entity/Relationship/IRelateCharacter.cs rename to Interface/Entity/Relationship/IRelateCharacter.cs diff --git a/Core/Interface/Entity/Relationship/IRelateUser.cs b/Interface/Entity/Relationship/IRelateUser.cs similarity index 100% rename from Core/Interface/Entity/Relationship/IRelateUser.cs rename to Interface/Entity/Relationship/IRelateUser.cs diff --git a/Core/Interface/Entity/Typical/ICharacter.cs b/Interface/Entity/Typical/ICharacter.cs similarity index 100% rename from Core/Interface/Entity/Typical/ICharacter.cs rename to Interface/Entity/Typical/ICharacter.cs diff --git a/Core/Interface/Entity/Typical/IItem.cs b/Interface/Entity/Typical/IItem.cs similarity index 100% rename from Core/Interface/Entity/Typical/IItem.cs rename to Interface/Entity/Typical/IItem.cs diff --git a/Core/Interface/Event/EventHandlers.cs b/Interface/Event/EventHandlers.cs similarity index 100% rename from Core/Interface/Event/EventHandlers.cs rename to Interface/Event/EventHandlers.cs diff --git a/Core/Interface/Event/Events.cs b/Interface/Event/Events.cs similarity index 100% rename from Core/Interface/Event/Events.cs rename to Interface/Event/Events.cs diff --git a/Core/Interface/Example.cs b/Interface/Example.cs similarity index 100% rename from Core/Interface/Example.cs rename to Interface/Example.cs diff --git a/Core/Interface/General/IClient.cs b/Interface/General/IClient.cs similarity index 100% rename from Core/Interface/General/IClient.cs rename to Interface/General/IClient.cs diff --git a/Core/Interface/General/IServer.cs b/Interface/General/IServer.cs similarity index 100% rename from Core/Interface/General/IServer.cs rename to Interface/General/IServer.cs diff --git a/Core/Library/Common/Architecture/BaseController.cs b/Library/Common/Architecture/BaseController.cs similarity index 100% rename from Core/Library/Common/Architecture/BaseController.cs rename to Library/Common/Architecture/BaseController.cs diff --git a/Core/Library/Common/Architecture/BaseModel.cs b/Library/Common/Architecture/BaseModel.cs similarity index 100% rename from Core/Library/Common/Architecture/BaseModel.cs rename to Library/Common/Architecture/BaseModel.cs diff --git a/Core/Library/Common/Architecture/DataRequest.cs b/Library/Common/Architecture/DataRequest.cs similarity index 100% rename from Core/Library/Common/Architecture/DataRequest.cs rename to Library/Common/Architecture/DataRequest.cs diff --git a/Core/Library/Common/Event/GeneralEventArgs.cs b/Library/Common/Event/GeneralEventArgs.cs similarity index 100% rename from Core/Library/Common/Event/GeneralEventArgs.cs rename to Library/Common/Event/GeneralEventArgs.cs diff --git a/Core/Library/Common/Event/LoginEventArgs.cs b/Library/Common/Event/LoginEventArgs.cs similarity index 100% rename from Core/Library/Common/Event/LoginEventArgs.cs rename to Library/Common/Event/LoginEventArgs.cs diff --git a/Core/Library/Common/Event/RegisterEventArgs.cs b/Library/Common/Event/RegisterEventArgs.cs similarity index 100% rename from Core/Library/Common/Event/RegisterEventArgs.cs rename to Library/Common/Event/RegisterEventArgs.cs diff --git a/Core/Library/Common/Event/RoomEventArgs.cs b/Library/Common/Event/RoomEventArgs.cs similarity index 100% rename from Core/Library/Common/Event/RoomEventArgs.cs rename to Library/Common/Event/RoomEventArgs.cs diff --git a/Core/Library/Common/Event/SendTalkEventArgs.cs b/Library/Common/Event/SendTalkEventArgs.cs similarity index 100% rename from Core/Library/Common/Event/SendTalkEventArgs.cs rename to Library/Common/Event/SendTalkEventArgs.cs diff --git a/Core/Library/Common/Network/ClientSocket.cs b/Library/Common/Network/ClientSocket.cs similarity index 100% rename from Core/Library/Common/Network/ClientSocket.cs rename to Library/Common/Network/ClientSocket.cs diff --git a/Core/Library/Common/Network/JsonObject.cs b/Library/Common/Network/JsonObject.cs similarity index 100% rename from Core/Library/Common/Network/JsonObject.cs rename to Library/Common/Network/JsonObject.cs diff --git a/Core/Library/Common/Network/MailObject.cs b/Library/Common/Network/MailObject.cs similarity index 100% rename from Core/Library/Common/Network/MailObject.cs rename to Library/Common/Network/MailObject.cs diff --git a/Core/Library/Common/Network/ServerSocket.cs b/Library/Common/Network/ServerSocket.cs similarity index 100% rename from Core/Library/Common/Network/ServerSocket.cs rename to Library/Common/Network/ServerSocket.cs diff --git a/Core/Library/Common/Network/Socket.cs b/Library/Common/Network/Socket.cs similarity index 100% rename from Core/Library/Common/Network/Socket.cs rename to Library/Common/Network/Socket.cs diff --git a/Core/Library/Common/Network/SocketObject.cs b/Library/Common/Network/SocketObject.cs similarity index 100% rename from Core/Library/Common/Network/SocketObject.cs rename to Library/Common/Network/SocketObject.cs diff --git a/Core/Library/Common/Plugin/BasePlugin.cs b/Library/Common/Plugin/BasePlugin.cs similarity index 100% rename from Core/Library/Common/Plugin/BasePlugin.cs rename to Library/Common/Plugin/BasePlugin.cs diff --git a/Core/Library/Constant/ConstantSet.cs b/Library/Constant/ConstantSet.cs similarity index 100% rename from Core/Library/Constant/ConstantSet.cs rename to Library/Constant/ConstantSet.cs diff --git a/Core/Library/Constant/FunGameInfo.cs b/Library/Constant/FunGameInfo.cs similarity index 100% rename from Core/Library/Constant/FunGameInfo.cs rename to Library/Constant/FunGameInfo.cs diff --git a/Core/Library/Constant/General.cs b/Library/Constant/General.cs similarity index 100% rename from Core/Library/Constant/General.cs rename to Library/Constant/General.cs diff --git a/Core/Library/Constant/MethodEnum.cs b/Library/Constant/MethodEnum.cs similarity index 100% rename from Core/Library/Constant/MethodEnum.cs rename to Library/Constant/MethodEnum.cs diff --git a/Core/Library/Constant/ResultEnum.cs b/Library/Constant/ResultEnum.cs similarity index 100% rename from Core/Library/Constant/ResultEnum.cs rename to Library/Constant/ResultEnum.cs diff --git a/Core/Library/Constant/StateEnum.cs b/Library/Constant/StateEnum.cs similarity index 100% rename from Core/Library/Constant/StateEnum.cs rename to Library/Constant/StateEnum.cs diff --git a/Core/Library/Constant/TypeEnum.cs b/Library/Constant/TypeEnum.cs similarity index 100% rename from Core/Library/Constant/TypeEnum.cs rename to Library/Constant/TypeEnum.cs diff --git a/Core/Library/Exception/Exception.cs b/Library/Exception/Exception.cs similarity index 100% rename from Core/Library/Exception/Exception.cs rename to Library/Exception/Exception.cs diff --git a/Core/Library/Exception/ExceptionExtension.cs b/Library/Exception/ExceptionExtension.cs similarity index 100% rename from Core/Library/Exception/ExceptionExtension.cs rename to Library/Exception/ExceptionExtension.cs diff --git a/Core/Library/SQLScript/Common/Common.cs b/Library/SQLScript/Common/Common.cs similarity index 100% rename from Core/Library/SQLScript/Common/Common.cs rename to Library/SQLScript/Common/Common.cs diff --git a/Core/Library/SQLScript/Entity/RoomQuery.cs b/Library/SQLScript/Entity/RoomQuery.cs similarity index 100% rename from Core/Library/SQLScript/Entity/RoomQuery.cs rename to Library/SQLScript/Entity/RoomQuery.cs diff --git a/Core/Library/SQLScript/Entity/UserQuery.cs b/Library/SQLScript/Entity/UserQuery.cs similarity index 100% rename from Core/Library/SQLScript/Entity/UserQuery.cs rename to Library/SQLScript/Entity/UserQuery.cs diff --git a/Core/Library/Server/BaseModel.cs b/Library/Server/BaseModel.cs similarity index 100% rename from Core/Library/Server/BaseModel.cs rename to Library/Server/BaseModel.cs diff --git a/Core/Library/Server/RoomList.cs b/Library/Server/RoomList.cs similarity index 100% rename from Core/Library/Server/RoomList.cs rename to Library/Server/RoomList.cs diff --git a/Core/Library/Server/SQLServerInfo.cs b/Library/Server/SQLServerInfo.cs similarity index 100% rename from Core/Library/Server/SQLServerInfo.cs rename to Library/Server/SQLServerInfo.cs diff --git a/Core/Library/Server/SmtpClientInfo.cs b/Library/Server/SmtpClientInfo.cs similarity index 100% rename from Core/Library/Server/SmtpClientInfo.cs rename to Library/Server/SmtpClientInfo.cs diff --git a/Core/Others/Others.cs b/Others/Others.cs similarity index 100% rename from Core/Others/Others.cs rename to Others/Others.cs diff --git a/Core/Service/MailManager.cs b/Service/MailManager.cs similarity index 100% rename from Core/Service/MailManager.cs rename to Service/MailManager.cs diff --git a/Core/Service/ModelManager.cs b/Service/ModelManager.cs similarity index 100% rename from Core/Service/ModelManager.cs rename to Service/ModelManager.cs diff --git a/Core/Service/PluginManager.cs b/Service/PluginManager.cs similarity index 100% rename from Core/Service/PluginManager.cs rename to Service/PluginManager.cs diff --git a/Core/Service/RedisManager.cs b/Service/RedisManager.cs similarity index 100% rename from Core/Service/RedisManager.cs rename to Service/RedisManager.cs diff --git a/Core/Service/ResourceManager.cs b/Service/ResourceManager.cs similarity index 100% rename from Core/Service/ResourceManager.cs rename to Service/ResourceManager.cs diff --git a/Core/Service/SocketManager.cs b/Service/SocketManager.cs similarity index 100% rename from Core/Service/SocketManager.cs rename to Service/SocketManager.cs