From 3ffc87c0bb4a61acca8f147979c0e9db86c716b4 Mon Sep 17 00:00:00 2001 From: Mili Date: Tue, 21 Feb 2023 23:19:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85Exception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FunGame.Core/Api/Data/SQLHelper.cs | 8 +- FunGame.Core/Api/Factory/CharacterFactory.cs | 9 +- FunGame.Core/Api/Factory/InventoryFactory.cs | 9 +- FunGame.Core/Api/Factory/ItemFactory.cs | 7 +- FunGame.Core/Api/Factory/RoomFactory.cs | 9 +- FunGame.Core/Api/Factory/SkillFactory.cs | 7 +- FunGame.Core/Api/Factory/UserFactory.cs | 6 - FunGame.Core/Api/Utility/Factory.cs | 7 +- FunGame.Core/Api/Utility/General.cs | 8 +- FunGame.Core/Api/Utility/INIHelper.cs | 6 +- FunGame.Core/Api/Utility/Implement.cs | 7 +- FunGame.Core/Api/Utility/Singleton.cs | 19 +- FunGame.Core/Entity/BaseEntity.cs | 7 +- FunGame.Core/Entity/Character/Character.cs | 7 +- FunGame.Core/Entity/Item/ActiveItem.cs | 8 +- FunGame.Core/Entity/Item/Item.cs | 8 +- FunGame.Core/Entity/Item/PassiveItem.cs | 8 +- FunGame.Core/Entity/Skill/ActiveSkill.cs | 8 +- FunGame.Core/Entity/Skill/PassiveSkill.cs | 8 +- FunGame.Core/Entity/Skill/Skill.cs | 7 +- .../Entity/Statistics/CharacterStatistics.cs | 7 +- .../Entity/Statistics/GameStatistics.cs | 7 +- .../Entity/Statistics/UserStatistics.cs | 7 +- FunGame.Core/Entity/System/Inventory.cs | 8 +- FunGame.Core/Entity/System/Room.cs | 8 +- FunGame.Core/Entity/User/User.cs | 6 - FunGame.Core/Interface/Base/ISQLHelper.cs | 7 +- FunGame.Core/Interface/Base/ISocket.cs | 8 +- .../Interface/Base/ISocketHeartBeat.cs | 8 +- .../Entity/Property/IActiveEnable.cs | 8 +- .../Entity/Relationship/IRelateCharacter.cs | 7 +- .../Entity/Relationship/IRelateUser.cs | 7 +- .../Interface/Entity/Typical/ICharacter.cs | 8 +- .../Interface/Entity/Typical/IItem.cs | 9 +- FunGame.Core/Interface/Event/EventHandlers.cs | 168 +++++++++--------- FunGame.Core/Interface/Event/Events.cs | 168 +++++++++--------- FunGame.Core/Interface/General/IServer.cs | 9 +- .../Library/Common/Event/GeneralEventArgs.cs | 8 +- .../Library/Common/Network/ClientSocket.cs | 9 +- .../Library/Common/Network/JsonObject.cs | 7 +- .../Library/Common/Network/SQLConnection.cs | 10 +- .../Library/Common/Network/ServerSocket.cs | 16 +- FunGame.Core/Library/Common/Network/Socket.cs | 19 +- .../Library/Common/Plugin/BasePlugin.cs | 8 +- FunGame.Core/Library/Constant/FunGameInfo.cs | 4 +- FunGame.Core/Library/Constant/General.cs | 6 +- .../Library/Exception/ExceptionHelper.cs | 9 +- FunGame.Core/Library/Exception/SystemError.cs | 96 +++++++--- FunGame.Core/Others/Others.cs | 8 +- FunGame.Core/Service/PluginManager.cs | 8 +- FunGame.Core/Service/RedisManager.cs | 8 +- FunGame.Core/Service/ResourceManager.cs | 8 +- FunGame.Core/Service/SQLManager.cs | 9 +- FunGame.Core/Service/SocketManager.cs | 12 +- FunGame.Core/Service/ThreadManager.cs | 7 +- .../Controller/InventoryController.cs | 8 +- FunGame.Desktop/Controller/LoginController.cs | 7 +- FunGame.Desktop/Controller/MainController.cs | 12 +- .../Controller/RegisterController.cs | 7 +- .../Controller/RoomSettingController.cs | 8 +- FunGame.Desktop/Controller/StoreController.cs | 8 +- .../Controller/UserCenterController.cs | 8 +- FunGame.Desktop/Library/Base/BaseMain.cs | 73 ++++---- .../Library/Component/ExitButton.cs | 8 +- .../Library/Component/GeneralForm.cs | 1 - .../Library/Component/MinButton.cs | 8 +- .../Library/Component/ShowMessage.cs | 11 +- FunGame.Desktop/Library/Component/TextArea.cs | 7 - .../Library/Component/TransparentRect.cs | 7 - FunGame.Desktop/Library/Config/Config.cs | 8 +- FunGame.Desktop/Library/Config/Constant.cs | 13 +- FunGame.Desktop/Library/Config/Usercfg.cs | 7 +- FunGame.Desktop/Library/Interface/ILogin.cs | 8 +- FunGame.Desktop/Library/Interface/IReg.cs | 8 +- FunGame.Desktop/Model/InventoryModel.cs | 8 +- FunGame.Desktop/Model/LoginModel.cs | 8 +- FunGame.Desktop/Model/MainModel.cs | 13 +- FunGame.Desktop/Model/RegisterModel.cs | 8 +- FunGame.Desktop/Model/RoomSettingModel.cs | 8 +- FunGame.Desktop/Model/StoreModel.cs | 8 +- FunGame.Desktop/Model/UserCenterModel.cs | 8 +- FunGame.Desktop/UI/Inventory/InventoryUI.cs | 12 +- FunGame.Desktop/UI/Main/Main.Designer.cs | 4 +- FunGame.Desktop/UI/Main/Main.cs | 30 ++-- FunGame.Desktop/UI/RoomSetting/RoomSetting.cs | 12 +- FunGame.Desktop/UI/Store/Store.cs | 12 +- FunGame.Desktop/UI/UserCenter/UserCenter.cs | 12 +- FunGame.Desktop/Utility/OpenForm.cs | 124 +++++++------ 88 files changed, 469 insertions(+), 880 deletions(-) diff --git a/FunGame.Core/Api/Data/SQLHelper.cs b/FunGame.Core/Api/Data/SQLHelper.cs index b09707d..9c62f04 100644 --- a/FunGame.Core/Api/Data/SQLHelper.cs +++ b/FunGame.Core/Api/Data/SQLHelper.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Interface.Base; +using Milimoe.FunGame.Core.Interface.Base; using Milimoe.FunGame.Core.Library.Common.Network; using Milimoe.FunGame.Core.Library.Constant; diff --git a/FunGame.Core/Api/Factory/CharacterFactory.cs b/FunGame.Core/Api/Factory/CharacterFactory.cs index c83ad8f..2ffa4ef 100644 --- a/FunGame.Core/Api/Factory/CharacterFactory.cs +++ b/FunGame.Core/Api/Factory/CharacterFactory.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Api.Factory +namespace Milimoe.FunGame.Core.Api.Factory { internal class CharacterFactory { diff --git a/FunGame.Core/Api/Factory/InventoryFactory.cs b/FunGame.Core/Api/Factory/InventoryFactory.cs index b821ba4..72fa95f 100644 --- a/FunGame.Core/Api/Factory/InventoryFactory.cs +++ b/FunGame.Core/Api/Factory/InventoryFactory.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Api.Factory +namespace Milimoe.FunGame.Core.Api.Factory { internal class InventoryFactory { diff --git a/FunGame.Core/Api/Factory/ItemFactory.cs b/FunGame.Core/Api/Factory/ItemFactory.cs index 4c80600..00c349d 100644 --- a/FunGame.Core/Api/Factory/ItemFactory.cs +++ b/FunGame.Core/Api/Factory/ItemFactory.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Api.Factory { diff --git a/FunGame.Core/Api/Factory/RoomFactory.cs b/FunGame.Core/Api/Factory/RoomFactory.cs index 6b3701b..1702332 100644 --- a/FunGame.Core/Api/Factory/RoomFactory.cs +++ b/FunGame.Core/Api/Factory/RoomFactory.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Security.Policy; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Api.Factory { diff --git a/FunGame.Core/Api/Factory/SkillFactory.cs b/FunGame.Core/Api/Factory/SkillFactory.cs index e562535..a51fa9d 100644 --- a/FunGame.Core/Api/Factory/SkillFactory.cs +++ b/FunGame.Core/Api/Factory/SkillFactory.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Api.Factory diff --git a/FunGame.Core/Api/Factory/UserFactory.cs b/FunGame.Core/Api/Factory/UserFactory.cs index fe0486d..bdaabc9 100644 --- a/FunGame.Core/Api/Factory/UserFactory.cs +++ b/FunGame.Core/Api/Factory/UserFactory.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace Milimoe.FunGame.Core.Api.Factory { internal class UserFactory diff --git a/FunGame.Core/Api/Utility/Factory.cs b/FunGame.Core/Api/Utility/Factory.cs index cf5b50a..cb5278c 100644 --- a/FunGame.Core/Api/Utility/Factory.cs +++ b/FunGame.Core/Api/Utility/Factory.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Api.Utility diff --git a/FunGame.Core/Api/Utility/General.cs b/FunGame.Core/Api/Utility/General.cs index 8017c3c..031d1c8 100644 --- a/FunGame.Core/Api/Utility/General.cs +++ b/FunGame.Core/Api/Utility/General.cs @@ -1,14 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using Milimoe.FunGame.Core.Library.Constant; using System.Net.NetworkInformation; -using System.Reflection; -using System.Runtime.InteropServices; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; // 通用工具类，客户端和服务器端都可以直接调用的工具方法都可以写在这里 namespace Milimoe.FunGame.Core.Api.Utility diff --git a/FunGame.Core/Api/Utility/INIHelper.cs b/FunGame.Core/Api/Utility/INIHelper.cs index 682125d..1521215 100644 --- a/FunGame.Core/Api/Utility/INIHelper.cs +++ b/FunGame.Core/Api/Utility/INIHelper.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using Milimoe.FunGame.Core.Library.Constant; using System.Runtime.InteropServices; using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Api.Utility { diff --git a/FunGame.Core/Api/Utility/Implement.cs b/FunGame.Core/Api/Utility/Implement.cs index 3b3c02f..e942047 100644 --- a/FunGame.Core/Api/Utility/Implement.cs +++ b/FunGame.Core/Api/Utility/Implement.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using Milimoe.FunGame.Core.Library.Constant; using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Api.Utility { diff --git a/FunGame.Core/Api/Utility/Singleton.cs b/FunGame.Core/Api/Utility/Singleton.cs index f6c2bef..6c71a06 100644 --- a/FunGame.Core/Api/Utility/Singleton.cs +++ b/FunGame.Core/Api/Utility/Singleton.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections; namespace Milimoe.FunGame.Core.Api.Utility { @@ -30,7 +25,7 @@ namespace Milimoe.FunGame.Core.Api.Utility /// /// 单例对象 /// - /// 添加单例到单例表时遇到错误 + /// 添加单例到单例表时遇到错误 public static bool Add(object single) { string type = single.GetType().ToString(); @@ -42,7 +37,7 @@ namespace Milimoe.FunGame.Core.Api.Utility } catch { - throw new Exception("添加单例到单例表时遇到错误。"); + throw new SingletonAddException(); } return true; } @@ -73,7 +68,7 @@ namespace Milimoe.FunGame.Core.Api.Utility /// /// 目标类 /// - /// 不能从单例表中获取到指定的单例 + /// 不能从单例表中获取到指定的单例 public static T? Get() { T? single = default; @@ -86,7 +81,7 @@ namespace Milimoe.FunGame.Core.Api.Utility } catch { - throw new Exception("不能从单例表中获取到指定的单例。"); + throw new SingletonGetException(); } if (single != null) return single; } @@ -98,7 +93,7 @@ namespace Milimoe.FunGame.Core.Api.Utility /// /// 目标类 /// - /// 不能从单例表中获取到指定的单例 + /// 不能从单例表中获取到指定的单例 public static object? Get(Type type) { object? single = default; @@ -110,7 +105,7 @@ namespace Milimoe.FunGame.Core.Api.Utility } catch { - throw new Exception("不能从单例表中获取到指定的单例。"); + throw new SingletonGetException(); } if (single != null) return single; } diff --git a/FunGame.Core/Entity/BaseEntity.cs b/FunGame.Core/Entity/BaseEntity.cs index 0176c3e..0429982 100644 --- a/FunGame.Core/Entity/BaseEntity.cs +++ b/FunGame.Core/Entity/BaseEntity.cs @@ -1,10 +1,5 @@ -using System; +using Milimoe.FunGame.Core.Interface.Entity; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Interface.Entity; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Character/Character.cs b/FunGame.Core/Entity/Character/Character.cs index 7e466de..561d6cc 100644 --- a/FunGame.Core/Entity/Character/Character.cs +++ b/FunGame.Core/Entity/Character/Character.cs @@ -1,10 +1,5 @@ -using System; +using Milimoe.FunGame.Core.Library.Constant; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Item/ActiveItem.cs b/FunGame.Core/Entity/Item/ActiveItem.cs index 0864712..c172ec3 100644 --- a/FunGame.Core/Entity/Item/ActiveItem.cs +++ b/FunGame.Core/Entity/Item/ActiveItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Interface.Entity; +using Milimoe.FunGame.Core.Interface.Entity; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Item/Item.cs b/FunGame.Core/Entity/Item/Item.cs index 7533219..59030fb 100644 --- a/FunGame.Core/Entity/Item/Item.cs +++ b/FunGame.Core/Entity/Item/Item.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Interface.Entity; +using Milimoe.FunGame.Core.Interface.Entity; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Item/PassiveItem.cs b/FunGame.Core/Entity/Item/PassiveItem.cs index 5c79994..0aa99b5 100644 --- a/FunGame.Core/Entity/Item/PassiveItem.cs +++ b/FunGame.Core/Entity/Item/PassiveItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Interface.Entity; +using Milimoe.FunGame.Core.Interface.Entity; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Skill/ActiveSkill.cs b/FunGame.Core/Entity/Skill/ActiveSkill.cs index 26456df..f3b3859 100644 --- a/FunGame.Core/Entity/Skill/ActiveSkill.cs +++ b/FunGame.Core/Entity/Skill/ActiveSkill.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Entity +namespace Milimoe.FunGame.Core.Entity { public class ActiveSkill : Skill { diff --git a/FunGame.Core/Entity/Skill/PassiveSkill.cs b/FunGame.Core/Entity/Skill/PassiveSkill.cs index d131461..72dc600 100644 --- a/FunGame.Core/Entity/Skill/PassiveSkill.cs +++ b/FunGame.Core/Entity/Skill/PassiveSkill.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Entity +namespace Milimoe.FunGame.Core.Entity { public class PassiveSkill : Skill { diff --git a/FunGame.Core/Entity/Skill/Skill.cs b/FunGame.Core/Entity/Skill/Skill.cs index eddcc19..43e40be 100644 --- a/FunGame.Core/Entity/Skill/Skill.cs +++ b/FunGame.Core/Entity/Skill/Skill.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Statistics/CharacterStatistics.cs b/FunGame.Core/Entity/Statistics/CharacterStatistics.cs index 31cc30c..0ec8bbc 100644 --- a/FunGame.Core/Entity/Statistics/CharacterStatistics.cs +++ b/FunGame.Core/Entity/Statistics/CharacterStatistics.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Statistics/GameStatistics.cs b/FunGame.Core/Entity/Statistics/GameStatistics.cs index 9cb8626..379a287 100644 --- a/FunGame.Core/Entity/Statistics/GameStatistics.cs +++ b/FunGame.Core/Entity/Statistics/GameStatistics.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/Statistics/UserStatistics.cs b/FunGame.Core/Entity/Statistics/UserStatistics.cs index 51a47f2..8123043 100644 --- a/FunGame.Core/Entity/Statistics/UserStatistics.cs +++ b/FunGame.Core/Entity/Statistics/UserStatistics.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/System/Inventory.cs b/FunGame.Core/Entity/System/Inventory.cs index 9657182..ed547c3 100644 --- a/FunGame.Core/Entity/System/Inventory.cs +++ b/FunGame.Core/Entity/System/Inventory.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; +using System.Collections; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/System/Room.cs b/FunGame.Core/Entity/System/Room.cs index 7311baf..ac205e5 100644 --- a/FunGame.Core/Entity/System/Room.cs +++ b/FunGame.Core/Entity/System/Room.cs @@ -1,11 +1,5 @@ -using System; +using Milimoe.FunGame.Core.Library.Constant; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Security.Policy; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Entity { diff --git a/FunGame.Core/Entity/User/User.cs b/FunGame.Core/Entity/User/User.cs index d1f2676..622a0f6 100644 --- a/FunGame.Core/Entity/User/User.cs +++ b/FunGame.Core/Entity/User/User.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace Milimoe.FunGame.Core.Entity { public class User diff --git a/FunGame.Core/Interface/Base/ISQLHelper.cs b/FunGame.Core/Interface/Base/ISQLHelper.cs index c290f32..e18a211 100644 --- a/FunGame.Core/Interface/Base/ISQLHelper.cs +++ b/FunGame.Core/Interface/Base/ISQLHelper.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Interface.Base { diff --git a/FunGame.Core/Interface/Base/ISocket.cs b/FunGame.Core/Interface/Base/ISocket.cs index 93f93df..77f2cd6 100644 --- a/FunGame.Core/Interface/Base/ISocket.cs +++ b/FunGame.Core/Interface/Base/ISocket.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Common.Network; -using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Interface.Base { diff --git a/FunGame.Core/Interface/Base/ISocketHeartBeat.cs b/FunGame.Core/Interface/Base/ISocketHeartBeat.cs index 67cb35f..6930692 100644 --- a/FunGame.Core/Interface/Base/ISocketHeartBeat.cs +++ b/FunGame.Core/Interface/Base/ISocketHeartBeat.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Interface.Base +namespace Milimoe.FunGame.Core.Interface.Base { public interface ISocketHeartBeat { diff --git a/FunGame.Core/Interface/Entity/Property/IActiveEnable.cs b/FunGame.Core/Interface/Entity/Property/IActiveEnable.cs index 2a9370a..e4dfd02 100644 --- a/FunGame.Core/Interface/Entity/Property/IActiveEnable.cs +++ b/FunGame.Core/Interface/Entity/Property/IActiveEnable.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Interface.Entity +namespace Milimoe.FunGame.Core.Interface.Entity { public interface IActiveEnable { diff --git a/FunGame.Core/Interface/Entity/Relationship/IRelateCharacter.cs b/FunGame.Core/Interface/Entity/Relationship/IRelateCharacter.cs index de0f4c0..12ddb25 100644 --- a/FunGame.Core/Interface/Entity/Relationship/IRelateCharacter.cs +++ b/FunGame.Core/Interface/Entity/Relationship/IRelateCharacter.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; namespace Milimoe.FunGame.Core.Interface.Entity { diff --git a/FunGame.Core/Interface/Entity/Relationship/IRelateUser.cs b/FunGame.Core/Interface/Entity/Relationship/IRelateUser.cs index a4e5538..82551b2 100644 --- a/FunGame.Core/Interface/Entity/Relationship/IRelateUser.cs +++ b/FunGame.Core/Interface/Entity/Relationship/IRelateUser.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; namespace Milimoe.FunGame.Core.Interface.Entity { diff --git a/FunGame.Core/Interface/Entity/Typical/ICharacter.cs b/FunGame.Core/Interface/Entity/Typical/ICharacter.cs index 2f30dc0..17d7c4c 100644 --- a/FunGame.Core/Interface/Entity/Typical/ICharacter.cs +++ b/FunGame.Core/Interface/Entity/Typical/ICharacter.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Interface.Entity +namespace Milimoe.FunGame.Core.Interface.Entity { public interface ICharacter { diff --git a/FunGame.Core/Interface/Entity/Typical/IItem.cs b/FunGame.Core/Interface/Entity/Typical/IItem.cs index cca2b73..2ce9fc6 100644 --- a/FunGame.Core/Interface/Entity/Typical/IItem.cs +++ b/FunGame.Core/Interface/Entity/Typical/IItem.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; - -namespace Milimoe.FunGame.Core.Interface.Entity +namespace Milimoe.FunGame.Core.Interface.Entity { public interface IItem : IActiveEnable, IRelateCharacter { diff --git a/FunGame.Core/Interface/Event/EventHandlers.cs b/FunGame.Core/Interface/Event/EventHandlers.cs index c3cbf37..d68ab43 100644 --- a/FunGame.Core/Interface/Event/EventHandlers.cs +++ b/FunGame.Core/Interface/Event/EventHandlers.cs @@ -16,10 +16,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IConnectEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeConnectEvent; - public event AfterEventHandler? AfterConnectEvent; - public event SucceedEventHandler? SucceedConnectEvent; - public event FailedEventHandler? FailedConnectEvent; + public event BeforeEventHandler? BeforeConnect; + public event AfterEventHandler? AfterConnect; + public event SucceedEventHandler? SucceedConnect; + public event FailedEventHandler? FailedConnect; public EventResult OnBeforeConnectEvent(GeneralEventArgs e); public EventResult OnAfterConnectEvent(GeneralEventArgs e); @@ -29,10 +29,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IDisconnectEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeDisconnectEvent; - public event AfterEventHandler? AfterDisconnectEvent; - public event SucceedEventHandler? SucceedDisconnectEvent; - public event FailedEventHandler? FailedDisconnectEvent; + public event BeforeEventHandler? BeforeDisconnect; + public event AfterEventHandler? AfterDisconnect; + public event SucceedEventHandler? SucceedDisconnect; + public event FailedEventHandler? FailedDisconnect; public EventResult OnBeforeDisconnectEvent(GeneralEventArgs e); public EventResult OnAfterDisconnectEvent(GeneralEventArgs e); @@ -42,10 +42,10 @@ namespace Milimoe.FunGame.Core.Interface public interface ILoginEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeLoginEvent; - public event AfterEventHandler? AfterLoginEvent; - public event SucceedEventHandler? SucceedLoginEvent; - public event FailedEventHandler? FailedLoginEvent; + public event BeforeEventHandler? BeforeLogin; + public event AfterEventHandler? AfterLogin; + public event SucceedEventHandler? SucceedLogin; + public event FailedEventHandler? FailedLogin; public EventResult OnBeforeLoginEvent(GeneralEventArgs e); public EventResult OnAfterLoginEvent(GeneralEventArgs e); @@ -55,10 +55,10 @@ namespace Milimoe.FunGame.Core.Interface public interface ILogoutEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeLogoutEvent; - public event AfterEventHandler? AfterLogoutEvent; - public event SucceedEventHandler? SucceedLogoutEvent; - public event FailedEventHandler? FailedLogoutEvent; + public event BeforeEventHandler? BeforeLogout; + public event AfterEventHandler? AfterLogout; + public event SucceedEventHandler? SucceedLogout; + public event FailedEventHandler? FailedLogout; public EventResult OnBeforeLogoutEvent(GeneralEventArgs e); public EventResult OnAfterLogoutEvent(GeneralEventArgs e); @@ -68,10 +68,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IRegEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeRegEvent; - public event AfterEventHandler? AfterRegEvent; - public event SucceedEventHandler? SucceedRegEvent; - public event FailedEventHandler? FailedRegEvent; + public event BeforeEventHandler? BeforeReg; + public event AfterEventHandler? AfterReg; + public event SucceedEventHandler? SucceedReg; + public event FailedEventHandler? FailedReg; public EventResult OnBeforeRegEvent(GeneralEventArgs e); public EventResult OnAfterRegEvent(GeneralEventArgs e); @@ -81,10 +81,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IIntoRoomEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeIntoRoomEvent; - public event AfterEventHandler? AfterIntoRoomEvent; - public event SucceedEventHandler? SucceedIntoRoomEvent; - public event FailedEventHandler? FailedIntoRoomEvent; + public event BeforeEventHandler? BeforeIntoRoom; + public event AfterEventHandler? AfterIntoRoom; + public event SucceedEventHandler? SucceedIntoRoom; + public event FailedEventHandler? FailedIntoRoom; public EventResult OnBeforeIntoRoomEvent(GeneralEventArgs e); public EventResult OnAfterIntoRoomEvent(GeneralEventArgs e); @@ -94,10 +94,10 @@ namespace Milimoe.FunGame.Core.Interface public interface ISendTalkEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeSendTalkEvent; - public event AfterEventHandler? AfterSendTalkEvent; - public event SucceedEventHandler? SucceedSendTalkEvent; - public event FailedEventHandler? FailedSendTalkEvent; + public event BeforeEventHandler? BeforeSendTalk; + public event AfterEventHandler? AfterSendTalk; + public event SucceedEventHandler? SucceedSendTalk; + public event FailedEventHandler? FailedSendTalk; public EventResult OnBeforeSendTalkEvent(GeneralEventArgs e); public EventResult OnAfterSendTalkEvent(GeneralEventArgs e); @@ -107,10 +107,10 @@ namespace Milimoe.FunGame.Core.Interface public interface ICreateRoomEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeCreateRoomEvent; - public event AfterEventHandler? AfterCreateRoomEvent; - public event SucceedEventHandler? SucceedCreateRoomEvent; - public event FailedEventHandler? FailedCreateRoomEvent; + public event BeforeEventHandler? BeforeCreateRoom; + public event AfterEventHandler? AfterCreateRoom; + public event SucceedEventHandler? SucceedCreateRoom; + public event FailedEventHandler? FailedCreateRoom; public EventResult OnBeforeCreateRoomEvent(GeneralEventArgs e); public EventResult OnAfterCreateRoomEvent(GeneralEventArgs e); @@ -120,10 +120,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IQuitRoomEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeQuitRoomEvent; - public event AfterEventHandler? AfterQuitRoomEvent; - public event SucceedEventHandler? SucceedQuitRoomEvent; - public event FailedEventHandler? FailedQuitRoomEvent; + public event BeforeEventHandler? BeforeQuitRoom; + public event AfterEventHandler? AfterQuitRoom; + public event SucceedEventHandler? SucceedQuitRoom; + public event FailedEventHandler? FailedQuitRoom; public EventResult OnBeforeQuitRoomEvent(GeneralEventArgs e); public EventResult OnAfterQuitRoomEvent(GeneralEventArgs e); @@ -133,10 +133,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IChangeRoomSettingEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeChangeRoomSettingEvent; - public event AfterEventHandler? AfterChangeRoomSettingEvent; - public event SucceedEventHandler? SucceedChangeRoomSettingEvent; - public event FailedEventHandler? FailedChangeRoomSettingEvent; + public event BeforeEventHandler? BeforeChangeRoomSetting; + public event AfterEventHandler? AfterChangeRoomSetting; + public event SucceedEventHandler? SucceedChangeRoomSetting; + public event FailedEventHandler? FailedChangeRoomSetting; public EventResult OnBeforeChangeRoomSettingEvent(GeneralEventArgs e); public EventResult OnAfterChangeRoomSettingEvent(GeneralEventArgs e); @@ -146,10 +146,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IStartMatchEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeStartMatchEvent; - public event AfterEventHandler? AfterStartMatchEvent; - public event SucceedEventHandler? SucceedStartMatchEvent; - public event FailedEventHandler? FailedStartMatchEvent; + public event BeforeEventHandler? BeforeStartMatch; + public event AfterEventHandler? AfterStartMatch; + public event SucceedEventHandler? SucceedStartMatch; + public event FailedEventHandler? FailedStartMatch; public EventResult OnBeforeStartMatchEvent(GeneralEventArgs e); public EventResult OnAfterStartMatchEvent(GeneralEventArgs e); @@ -159,10 +159,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IStartGameEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeStartGameEvent; - public event AfterEventHandler? AfterStartGameEvent; - public event SucceedEventHandler? SucceedStartGameEvent; - public event FailedEventHandler? FailedStartGameEvent; + public event BeforeEventHandler? BeforeStartGame; + public event AfterEventHandler? AfterStartGame; + public event SucceedEventHandler? SucceedStartGame; + public event FailedEventHandler? FailedStartGame; public EventResult OnBeforeStartGameEvent(GeneralEventArgs e); public EventResult OnAfterStartGameEvent(GeneralEventArgs e); @@ -172,10 +172,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IChangeProfileEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeChangeProfileEvent; - public event AfterEventHandler? AfterChangeProfileEvent; - public event SucceedEventHandler? SucceedChangeProfileEvent; - public event FailedEventHandler? FailedChangeProfileEvent; + public event BeforeEventHandler? BeforeChangeProfile; + public event AfterEventHandler? AfterChangeProfile; + public event SucceedEventHandler? SucceedChangeProfile; + public event FailedEventHandler? FailedChangeProfile; public EventResult OnBeforeChangeProfileEvent(GeneralEventArgs e); public EventResult OnAfterChangeProfileEvent(GeneralEventArgs e); @@ -185,10 +185,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IChangeAccountSettingEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeChangeAccountSettingEvent; - public event AfterEventHandler? AfterChangeAccountSettingEvent; - public event SucceedEventHandler? SucceedChangeAccountSettingEvent; - public event FailedEventHandler? FailedChangeAccountSettingEvent; + public event BeforeEventHandler? BeforeChangeAccountSetting; + public event AfterEventHandler? AfterChangeAccountSetting; + public event SucceedEventHandler? SucceedChangeAccountSetting; + public event FailedEventHandler? FailedChangeAccountSetting; public EventResult OnBeforeChangeAccountSettingEvent(GeneralEventArgs e); public EventResult OnAfterChangeAccountSettingEvent(GeneralEventArgs e); @@ -198,10 +198,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IOpenInventoryEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeOpenInventoryEvent; - public event AfterEventHandler? AfterOpenInventoryEvent; - public event SucceedEventHandler? SucceedOpenInventoryEvent; - public event FailedEventHandler? FailedOpenInventoryEvent; + public event BeforeEventHandler? BeforeOpenInventory; + public event AfterEventHandler? AfterOpenInventory; + public event SucceedEventHandler? SucceedOpenInventory; + public event FailedEventHandler? FailedOpenInventory; public EventResult OnBeforeOpenInventoryEvent(GeneralEventArgs e); public EventResult OnAfterOpenInventoryEvent(GeneralEventArgs e); @@ -211,10 +211,10 @@ namespace Milimoe.FunGame.Core.Interface public interface ISignInEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeSignInEvent; - public event AfterEventHandler? AfterSignInEvent; - public event SucceedEventHandler? SucceedSignInEvent; - public event FailedEventHandler? FailedSignInEvent; + public event BeforeEventHandler? BeforeSignIn; + public event AfterEventHandler? AfterSignIn; + public event SucceedEventHandler? SucceedSignIn; + public event FailedEventHandler? FailedSignIn; public EventResult OnBeforeSignInEvent(GeneralEventArgs e); public EventResult OnAfterSignInEvent(GeneralEventArgs e); @@ -224,10 +224,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IOpenStoreEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeOpenStoreEvent; - public event AfterEventHandler? AfterOpenStoreEvent; - public event SucceedEventHandler? SucceedOpenStoreEvent; - public event FailedEventHandler? FailedOpenStoreEvent; + public event BeforeEventHandler? BeforeOpenStore; + public event AfterEventHandler? AfterOpenStore; + public event SucceedEventHandler? SucceedOpenStore; + public event FailedEventHandler? FailedOpenStore; public EventResult OnBeforeOpenStoreEvent(GeneralEventArgs e); public EventResult OnAfterOpenStoreEvent(GeneralEventArgs e); @@ -237,10 +237,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IBuyItemEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeBuyItemEvent; - public event AfterEventHandler? AfterBuyItemEvent; - public event SucceedEventHandler? SucceedBuyItemEvent; - public event FailedEventHandler? FailedBuyItemEvent; + public event BeforeEventHandler? BeforeBuyItem; + public event AfterEventHandler? AfterBuyItem; + public event SucceedEventHandler? SucceedBuyItem; + public event FailedEventHandler? FailedBuyItem; public EventResult OnBeforeBuyItemEvent(GeneralEventArgs e); public EventResult OnAfterBuyItemEvent(GeneralEventArgs e); @@ -250,10 +250,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IShowRankingEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeShowRankingEvent; - public event AfterEventHandler? AfterShowRankingEvent; - public event SucceedEventHandler? SucceedShowRankingEvent; - public event FailedEventHandler? FailedShowRankingEvent; + public event BeforeEventHandler? BeforeShowRanking; + public event AfterEventHandler? AfterShowRanking; + public event SucceedEventHandler? SucceedShowRanking; + public event FailedEventHandler? FailedShowRanking; public EventResult OnBeforeShowRankingEvent(GeneralEventArgs e); public EventResult OnAfterShowRankingEvent(GeneralEventArgs e); @@ -263,10 +263,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IUseItemEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeUseItemEvent; - public event AfterEventHandler? AfterUseItemEvent; - public event SucceedEventHandler? SucceedUseItemEvent; - public event FailedEventHandler? FailedUseItemEvent; + public event BeforeEventHandler? BeforeUseItem; + public event AfterEventHandler? AfterUseItem; + public event SucceedEventHandler? SucceedUseItem; + public event FailedEventHandler? FailedUseItem; public EventResult OnBeforeUseItemEvent(GeneralEventArgs e); public EventResult OnAfterUseItemEvent(GeneralEventArgs e); @@ -276,10 +276,10 @@ namespace Milimoe.FunGame.Core.Interface public interface IEndGameEventHandler : IEventHandler { - public event BeforeEventHandler? BeforeEndGameEvent; - public event AfterEventHandler? AfterEndGameEvent; - public event SucceedEventHandler? SucceedEndGameEvent; - public event FailedEventHandler? FailedEndGameEvent; + public event BeforeEventHandler? BeforeEndGame; + public event AfterEventHandler? AfterEndGame; + public event SucceedEventHandler? SucceedEndGame; + public event FailedEventHandler? FailedEndGame; public EventResult OnBeforeEndGameEvent(GeneralEventArgs e); public EventResult OnAfterEndGameEvent(GeneralEventArgs e); diff --git a/FunGame.Core/Interface/Event/Events.cs b/FunGame.Core/Interface/Event/Events.cs index 3630558..3c07946 100644 --- a/FunGame.Core/Interface/Event/Events.cs +++ b/FunGame.Core/Interface/Event/Events.cs @@ -8,169 +8,169 @@ namespace Milimoe.FunGame.Core.Interface /// public interface IConnectEvent { - public EventResult BeforeConnect(object sender, GeneralEventArgs e); - public EventResult AfterConnect(object sender, GeneralEventArgs e); - public EventResult SucceedConnect(object sender, GeneralEventArgs e); - public EventResult FailedConnect(object sender, GeneralEventArgs e); + public EventResult BeforeConnectEvent(object sender, GeneralEventArgs e); + public EventResult AfterConnectEvent(object sender, GeneralEventArgs e); + public EventResult SucceedConnectEvent(object sender, GeneralEventArgs e); + public EventResult FailedConnectEvent(object sender, GeneralEventArgs e); } public interface IDisconnectEvent { - public EventResult BeforeDisconnect(object sender, GeneralEventArgs e); - public EventResult AfterDisconnect(object sender, GeneralEventArgs e); - public EventResult SucceedDisconnect(object sender, GeneralEventArgs e); - public EventResult FailedDisconnect(object sender, GeneralEventArgs e); + public EventResult BeforeDisconnectEvent(object sender, GeneralEventArgs e); + public EventResult AfterDisconnectEvent(object sender, GeneralEventArgs e); + public EventResult SucceedDisconnectEvent(object sender, GeneralEventArgs e); + public EventResult FailedDisconnectEvent(object sender, GeneralEventArgs e); } public interface ILoginEvent { - public EventResult BeforeLogin(object sender, GeneralEventArgs e); - public EventResult AfterLogin(object sender, GeneralEventArgs e); - public EventResult SucceedLogin(object sender, GeneralEventArgs e); - public EventResult FailedLogin(object sender, GeneralEventArgs e); + public EventResult BeforeLoginEvent(object sender, GeneralEventArgs e); + public EventResult AfterLoginEvent(object sender, GeneralEventArgs e); + public EventResult SucceedLoginEvent(object sender, GeneralEventArgs e); + public EventResult FailedLoginEvent(object sender, GeneralEventArgs e); } public interface ILogoutEvent { - public EventResult BeforeLogout(object sender, GeneralEventArgs e); - public EventResult AfterLogout(object sender, GeneralEventArgs e); - public EventResult SucceedLogout(object sender, GeneralEventArgs e); - public EventResult FailedLogout(object sender, GeneralEventArgs e); + public EventResult BeforeLogoutEvent(object sender, GeneralEventArgs e); + public EventResult AfterLogoutEvent(object sender, GeneralEventArgs e); + public EventResult SucceedLogoutEvent(object sender, GeneralEventArgs e); + public EventResult FailedLogoutEvent(object sender, GeneralEventArgs e); } public interface IRegEvent { - public EventResult BeforeReg(object sender, GeneralEventArgs e); - public EventResult AfterReg(object sender, GeneralEventArgs e); - public EventResult SucceedReg(object sender, GeneralEventArgs e); - public EventResult FailedReg(object sender, GeneralEventArgs e); + public EventResult BeforeRegEvent(object sender, GeneralEventArgs e); + public EventResult AfterRegEvent(object sender, GeneralEventArgs e); + public EventResult SucceedRegEvent(object sender, GeneralEventArgs e); + public EventResult FailedRegEvent(object sender, GeneralEventArgs e); } public interface IIntoRoomEvent { - public EventResult BeforeIntoRoom(object sender, GeneralEventArgs e); - public EventResult AfterIntoRoom(object sender, GeneralEventArgs e); - public EventResult SucceedIntoRoom(object sender, GeneralEventArgs e); - public EventResult FailedIntoRoom(object sender, GeneralEventArgs e); + public EventResult BeforeIntoRoomEvent(object sender, GeneralEventArgs e); + public EventResult AfterIntoRoomEvent(object sender, GeneralEventArgs e); + public EventResult SucceedIntoRoomEvent(object sender, GeneralEventArgs e); + public EventResult FailedIntoRoomEvent(object sender, GeneralEventArgs e); } public interface ISendTalkEvent { - public EventResult BeforeSendTalk(object sender, GeneralEventArgs e); - public EventResult AfterSendTalk(object sender, GeneralEventArgs e); - public EventResult SucceedSendTalk(object sender, GeneralEventArgs e); - public EventResult FailedSendTalk(object sender, GeneralEventArgs e); + public EventResult BeforeSendTalkEvent(object sender, GeneralEventArgs e); + public EventResult AfterSendTalkEvent(object sender, GeneralEventArgs e); + public EventResult SucceedSendTalkEvent(object sender, GeneralEventArgs e); + public EventResult FailedSendTalkEvent(object sender, GeneralEventArgs e); } public interface ICreateRoomEvent { - public EventResult BeforeCreateRoom(object sender, GeneralEventArgs e); - public EventResult AfterCreateRoom(object sender, GeneralEventArgs e); - public EventResult SucceedCreateRoom(object sender, GeneralEventArgs e); - public EventResult FailedCreateRoom(object sender, GeneralEventArgs e); + public EventResult BeforeCreateRoomEvent(object sender, GeneralEventArgs e); + public EventResult AfterCreateRoomEvent(object sender, GeneralEventArgs e); + public EventResult SucceedCreateRoomEvent(object sender, GeneralEventArgs e); + public EventResult FailedCreateRoomEvent(object sender, GeneralEventArgs e); } public interface IQuitRoomEvent { - public EventResult BeforeQuitRoom(object sender, GeneralEventArgs e); - public EventResult AfterQuitRoom(object sender, GeneralEventArgs e); - public EventResult SucceedQuitRoom(object sender, GeneralEventArgs e); - public EventResult FailedQuitRoom(object sender, GeneralEventArgs e); + public EventResult BeforeQuitRoomEvent(object sender, GeneralEventArgs e); + public EventResult AfterQuitRoomEvent(object sender, GeneralEventArgs e); + public EventResult SucceedQuitRoomEvent(object sender, GeneralEventArgs e); + public EventResult FailedQuitRoomEvent(object sender, GeneralEventArgs e); } public interface IChangeRoomSettingEvent { - public EventResult BeforeChangeRoomSetting(object sender, GeneralEventArgs e); - public EventResult AfterChangeRoomSetting(object sender, GeneralEventArgs e); - public EventResult SucceedChangeRoomSetting(object sender, GeneralEventArgs e); - public EventResult FailedChangeRoomSetting(object sender, GeneralEventArgs e); + public EventResult BeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e); + public EventResult AfterChangeRoomSettingEvent(object sender, GeneralEventArgs e); + public EventResult SucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e); + public EventResult FailedChangeRoomSettingEvent(object sender, GeneralEventArgs e); } public interface IStartMatchEvent { - public EventResult BeforeStartMatch(object sender, GeneralEventArgs e); - public EventResult AfterStartMatch(object sender, GeneralEventArgs e); - public EventResult SucceedStartMatch(object sender, GeneralEventArgs e); - public EventResult FailedStartMatch(object sender, GeneralEventArgs e); + public EventResult BeforeStartMatchEvent(object sender, GeneralEventArgs e); + public EventResult AfterStartMatchEvent(object sender, GeneralEventArgs e); + public EventResult SucceedStartMatchEvent(object sender, GeneralEventArgs e); + public EventResult FailedStartMatchEvent(object sender, GeneralEventArgs e); } public interface IStartGameEvent { - public EventResult BeforeStartGame(object sender, GeneralEventArgs e); - public EventResult AfterStartGame(object sender, GeneralEventArgs e); - public EventResult SucceedStartGame(object sender, GeneralEventArgs e); - public EventResult FailedStartGame(object sender, GeneralEventArgs e); + public EventResult BeforeStartGameEvent(object sender, GeneralEventArgs e); + public EventResult AfterStartGameEvent(object sender, GeneralEventArgs e); + public EventResult SucceedStartGameEvent(object sender, GeneralEventArgs e); + public EventResult FailedStartGameEvent(object sender, GeneralEventArgs e); } public interface IChangeProfileEvent { - public EventResult BeforeChangeProfile(object sender, GeneralEventArgs e); - public EventResult AfterChangeProfile(object sender, GeneralEventArgs e); - public EventResult SucceedChangeProfile(object sender, GeneralEventArgs e); - public EventResult FailedChangeProfile(object sender, GeneralEventArgs e); + public EventResult BeforeChangeProfileEvent(object sender, GeneralEventArgs e); + public EventResult AfterChangeProfileEvent(object sender, GeneralEventArgs e); + public EventResult SucceedChangeProfileEvent(object sender, GeneralEventArgs e); + public EventResult FailedChangeProfileEvent(object sender, GeneralEventArgs e); } public interface IChangeAccountSettingEvent { - public EventResult BeforeChangeAccountSetting(object sender, GeneralEventArgs e); - public EventResult AfterChangeAccountSetting(object sender, GeneralEventArgs e); - public EventResult SucceedChangeAccountSetting(object sender, GeneralEventArgs e); - public EventResult FailedChangeAccountSetting(object sender, GeneralEventArgs e); + public EventResult BeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e); + public EventResult AfterChangeAccountSettingEvent(object sender, GeneralEventArgs e); + public EventResult SucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e); + public EventResult FailedChangeAccountSettingEvent(object sender, GeneralEventArgs e); } public interface IOpenInventoryEvent { - public EventResult BeforeOpenInventory(object sender, GeneralEventArgs e); - public EventResult AfterOpenInventory(object sender, GeneralEventArgs e); - public EventResult SucceedOpenInventory(object sender, GeneralEventArgs e); - public EventResult FailedOpenInventory(object sender, GeneralEventArgs e); + public EventResult BeforeOpenInventoryEvent(object sender, GeneralEventArgs e); + public EventResult AfterOpenInventoryEvent(object sender, GeneralEventArgs e); + public EventResult SucceedOpenInventoryEvent(object sender, GeneralEventArgs e); + public EventResult FailedOpenInventoryEvent(object sender, GeneralEventArgs e); } public interface ISignInEvent { - public EventResult BeforeSignIn(object sender, GeneralEventArgs e); - public EventResult AfterSignIn(object sender, GeneralEventArgs e); - public EventResult SucceedSignIn(object sender, GeneralEventArgs e); - public EventResult FailedSignIn(object sender, GeneralEventArgs e); + public EventResult BeforeSignInEvent(object sender, GeneralEventArgs e); + public EventResult AfterSignInEvent(object sender, GeneralEventArgs e); + public EventResult SucceedSignInEvent(object sender, GeneralEventArgs e); + public EventResult FailedSignInEvent(object sender, GeneralEventArgs e); } public interface IOpenStoreEvent { - public EventResult BeforeOpenStore(object sender, GeneralEventArgs e); - public EventResult AfterOpenStore(object sender, GeneralEventArgs e); - public EventResult SucceedOpenStore(object sender, GeneralEventArgs e); - public EventResult FailedOpenStore(object sender, GeneralEventArgs e); + public EventResult BeforeOpenStoreEvent(object sender, GeneralEventArgs e); + public EventResult AfterOpenStoreEvent(object sender, GeneralEventArgs e); + public EventResult SucceedOpenStoreEvent(object sender, GeneralEventArgs e); + public EventResult FailedOpenStoreEvent(object sender, GeneralEventArgs e); } public interface IBuyItemEvent { - public EventResult BeforeBuyItem(object sender, GeneralEventArgs e); - public EventResult AfterBuyItem(object sender, GeneralEventArgs e); - public EventResult SucceedBuyItem(object sender, GeneralEventArgs e); - public EventResult FailedBuyItem(object sender, GeneralEventArgs e); + public EventResult BeforeBuyItemEvent(object sender, GeneralEventArgs e); + public EventResult AfterBuyItemEvent(object sender, GeneralEventArgs e); + public EventResult SucceedBuyItemEvent(object sender, GeneralEventArgs e); + public EventResult FailedBuyItemEvent(object sender, GeneralEventArgs e); } public interface IShowRankingEvent { - public EventResult BeforeShowRanking(object sender, GeneralEventArgs e); - public EventResult AfterShowRanking(object sender, GeneralEventArgs e); - public EventResult SucceedShowRanking(object sender, GeneralEventArgs e); - public EventResult FailedShowRanking(object sender, GeneralEventArgs e); + public EventResult BeforeShowRankingEvent(object sender, GeneralEventArgs e); + public EventResult AfterShowRankingEvent(object sender, GeneralEventArgs e); + public EventResult SucceedShowRankingEvent(object sender, GeneralEventArgs e); + public EventResult FailedShowRankingEvent(object sender, GeneralEventArgs e); } public interface IUseItemEvent { - public EventResult BeforeUseItem(object sender, GeneralEventArgs e); - public EventResult AfterUseItem(object sender, GeneralEventArgs e); - public EventResult SucceedUseItem(object sender, GeneralEventArgs e); - public EventResult FailedUseItem(object sender, GeneralEventArgs e); + public EventResult BeforeUseItemEvent(object sender, GeneralEventArgs e); + public EventResult AfterUseItemEvent(object sender, GeneralEventArgs e); + public EventResult SucceedUseItemEvent(object sender, GeneralEventArgs e); + public EventResult FailedUseItemEvent(object sender, GeneralEventArgs e); } public interface IEndGameEvent { - public EventResult BeforeEndGame(object sender, GeneralEventArgs e); - public EventResult AfterEndGame(object sender, GeneralEventArgs e); - public EventResult SucceedEndGame(object sender, GeneralEventArgs e); - public EventResult FailedEndGame(object sender, GeneralEventArgs e); + public EventResult BeforeEndGameEvent(object sender, GeneralEventArgs e); + public EventResult AfterEndGameEvent(object sender, GeneralEventArgs e); + public EventResult SucceedEndGameEvent(object sender, GeneralEventArgs e); + public EventResult FailedEndGameEvent(object sender, GeneralEventArgs e); } } diff --git a/FunGame.Core/Interface/General/IServer.cs b/FunGame.Core/Interface/General/IServer.cs index 1e29b04..cc19f1e 100644 --- a/FunGame.Core/Interface/General/IServer.cs +++ b/FunGame.Core/Interface/General/IServer.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Interface +namespace Milimoe.FunGame.Core.Interface { public interface IServer { diff --git a/FunGame.Core/Library/Common/Event/GeneralEventArgs.cs b/FunGame.Core/Library/Common/Event/GeneralEventArgs.cs index 64b66ed..fb20fb2 100644 --- a/FunGame.Core/Library/Common/Event/GeneralEventArgs.cs +++ b/FunGame.Core/Library/Common/Event/GeneralEventArgs.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event +namespace Milimoe.FunGame.Core.Library.Common.Event { public class GeneralEventArgs : EventArgs { diff --git a/FunGame.Core/Library/Common/Network/ClientSocket.cs b/FunGame.Core/Library/Common/Network/ClientSocket.cs index 955cf9f..d3d91b0 100644 --- a/FunGame.Core/Library/Common/Network/ClientSocket.cs +++ b/FunGame.Core/Library/Common/Network/ClientSocket.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Interface.Base; +using Milimoe.FunGame.Core.Interface.Base; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Service; @@ -63,7 +58,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Network public object[] Receive() { object[] result = SocketManager.Receive(Instance); - if (result.Length != 2) throw new System.Exception("收到错误的返回信息。"); + if (result.Length != 2) throw new SocketWrongInfoException(); return result; } diff --git a/FunGame.Core/Library/Common/Network/JsonObject.cs b/FunGame.Core/Library/Common/Network/JsonObject.cs index bc8d7be..4eb15a8 100644 --- a/FunGame.Core/Library/Common/Network/JsonObject.cs +++ b/FunGame.Core/Library/Common/Network/JsonObject.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using Milimoe.FunGame.Core.Library.Constant; using System.Text.Json; using System.Text.Json.Serialization; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Core.Library.Common.Network { diff --git a/FunGame.Core/Library/Common/Network/SQLConnection.cs b/FunGame.Core/Library/Common/Network/SQLConnection.cs index da467d5..d976617 100644 --- a/FunGame.Core/Library/Common/Network/SQLConnection.cs +++ b/FunGame.Core/Library/Common/Network/SQLConnection.cs @@ -1,12 +1,4 @@ -using Milimoe.FunGame.Core.Entity; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; - -namespace Milimoe.FunGame.Core.Library.Common.Network +namespace Milimoe.FunGame.Core.Library.Common.Network { public class SQLServerInfo { diff --git a/FunGame.Core/Library/Common/Network/ServerSocket.cs b/FunGame.Core/Library/Common/Network/ServerSocket.cs index 9c8a7b4..61d0de3 100644 --- a/FunGame.Core/Library/Common/Network/ServerSocket.cs +++ b/FunGame.Core/Library/Common/Network/ServerSocket.cs @@ -1,12 +1,6 @@ using Milimoe.FunGame.Core.Interface.Base; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Service; -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Milimoe.FunGame.Core.Library.Common.Network { @@ -52,7 +46,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Network if (MaxConnection <= 0) MaxConnection = SocketSet.MaxConnection_General; System.Net.Sockets.Socket? socket = SocketManager.StartListening(Port, MaxConnection); if (socket != null) return new ServerSocket(socket, Port); - else throw new System.Exception("无法创建监听，请重新启动服务器再试。"); + else throw new SocketCreateListenException(); } public ClientSocket Accept() @@ -64,7 +58,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Network System.Net.Sockets.Socket Client = (System.Net.Sockets.Socket)result[1]; return new ClientSocket(Client, ServerPort, ClientIP, ClientIP); } - throw new System.Exception("无法获取客户端信息。"); + throw new SocketGetClientException(); } public bool AddClient(string ClientName, Task t) @@ -79,12 +73,12 @@ namespace Milimoe.FunGame.Core.Library.Common.Network public SocketResult Send(SocketMessageType type, params object[] objs) { - throw new System.Exception("监听Socket不能用于发送信息。"); + throw new ListeningSocketCanNotSendException(); } public object[] Receive() { - throw new System.Exception("监听Socket不能用于接收信息。"); + throw new ListeningSocketCanNotSendException(); } public void Close() @@ -94,7 +88,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Network public void StartReceiving(Task t) { - throw new System.Exception("监听Socket不能用于接收信息。"); + throw new ListeningSocketCanNotSendException(); } public static string GetTypeString(SocketMessageType type) diff --git a/FunGame.Core/Library/Common/Network/Socket.cs b/FunGame.Core/Library/Common/Network/Socket.cs index 6798590..f250286 100644 --- a/FunGame.Core/Library/Common/Network/Socket.cs +++ b/FunGame.Core/Library/Common/Network/Socket.cs @@ -1,15 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Net.Sockets; -using System.Net; -using System.Security.Cryptography; -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Service; +using Milimoe.FunGame.Core.Interface.Base; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Interface.Base; +using Milimoe.FunGame.Core.Service; namespace Milimoe.FunGame.Core.Library.Common.Network { @@ -71,7 +62,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Network { System.Net.Sockets.Socket? socket = SocketManager.Connect(IP, Port); if (socket != null) return new Socket(socket, IP, Port); - else throw new System.Exception("连接到服务器失败。"); + else throw new ConnectFailedException(); } public SocketResult Send(SocketMessageType type, params object[] objs) @@ -90,7 +81,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Network public object[] Receive() { object[] result = SocketManager.Receive(); - if (result.Length != 2) throw new System.Exception("收到错误的返回信息。"); + if (result.Length != 2) throw new SocketWrongInfoException(); if ((SocketMessageType)result[0] == SocketMessageType.HeartBeat) { if (WaitHeartBeatReply != null && !WaitHeartBeatReply.IsCompleted) WaitHeartBeatReply.Wait(1); @@ -167,7 +158,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Network { // 超过三次没回应心跳，服务器连接失败。 if (_HeartBeatFaileds++ >= 3) - throw new System.Exception("ERROR：与服务器连接中断。"); + throw new LostConnectException(); } public static string GetTypeString(SocketMessageType type) diff --git a/FunGame.Core/Library/Common/Plugin/BasePlugin.cs b/FunGame.Core/Library/Common/Plugin/BasePlugin.cs index 3188caf..7517d42 100644 --- a/FunGame.Core/Library/Common/Plugin/BasePlugin.cs +++ b/FunGame.Core/Library/Common/Plugin/BasePlugin.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Plugin +namespace Milimoe.FunGame.Core.Library.Common.Plugin { public class BasePlugin { diff --git a/FunGame.Core/Library/Constant/FunGameInfo.cs b/FunGame.Core/Library/Constant/FunGameInfo.cs index 4d7338c..ce0fdbc 100644 --- a/FunGame.Core/Library/Constant/FunGameInfo.cs +++ b/FunGame.Core/Library/Constant/FunGameInfo.cs @@ -11,6 +11,8 @@ FunGame_Server } + public const string FunGame_CopyRight = @"©2023 Mili.cyou. 米粒的糖果屋"; + private const string FunGame_Core = "FunGame Core"; private const string FunGame_Core_Api = "FunGame Core Api"; private const string FunGame_Console = "FunGame Console"; @@ -31,7 +33,7 @@ FunGame.FunGame_Server => FunGame_Server, _ => "" }; - return type + " [ 版本: " + FunGame_Version + FunGame_VersionPatch + " ]\n" + (type.Equals(FunGame_Desktop) ? "©" : "(C)") + "2023 Mili.cyou. 保留所有权利\n"; + return type + " [ 版本: " + FunGame_Version + FunGame_VersionPatch + " ]\n" + (type.Equals(FunGame_Desktop) ? @"©" : "(C)") + "2023 Mili.cyou. 保留所有权利\n"; } /** diff --git a/FunGame.Core/Library/Constant/General.cs b/FunGame.Core/Library/Constant/General.cs index 4eb3e31..6f99aad 100644 --- a/FunGame.Core/Library/Constant/General.cs +++ b/FunGame.Core/Library/Constant/General.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using Milimoe.FunGame.Core.Entity; using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; namespace Milimoe.FunGame.Core.Library.Constant { diff --git a/FunGame.Core/Library/Exception/ExceptionHelper.cs b/FunGame.Core/Library/Exception/ExceptionHelper.cs index 031b072..9b54770 100644 --- a/FunGame.Core/Library/Exception/ExceptionHelper.cs +++ b/FunGame.Core/Library/Exception/ExceptionHelper.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; - -namespace Milimoe.FunGame.Core.Library.Exception +namespace Milimoe.FunGame.Core.Library.Exception { public static class ExceptionHelper { diff --git a/FunGame.Core/Library/Exception/SystemError.cs b/FunGame.Core/Library/Exception/SystemError.cs index 6371ede..e10b495 100644 --- a/FunGame.Core/Library/Exception/SystemError.cs +++ b/FunGame.Core/Library/Exception/SystemError.cs @@ -1,34 +1,82 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; - -namespace Milimoe.FunGame.Core.Library.Exception +namespace Milimoe.FunGame { public class SystemError : System.Exception { - public string Name { get; } = ""; + public override string Message => "系统错误 (#00001)"; + } - public new string StackTrace { get => base.StackTrace ?? ""; } + public class CanNotConnectException : System.Exception + { + public override string Message => "无法连接至服务器，请检查网络并重启游戏再试 (#00002)"; + } - private System.Exception e { get; } + public class TimeOutException : System.Exception + { + public override string Message => "连接超时 (#00003)"; + } - public SystemError() - { - e = new System.Exception(); - } + public class UnknownException : System.Exception + { + public override string Message => "未知错误 (#00004)"; + } - public SystemError(string Name) - { - this.Name = Name; - e = new System.Exception(Name); - } + public class ReadConfigException : System.Exception + { + public override string Message => "读取配置文件出错，参数格式不正确 (#00005)"; + } - public string GetErrorInfo() - { - return e.GetErrorInfo(); - } + public class SingletonAddException : System.Exception + { + public override string Message => "添加单例到单例表时遇到错误 (#00006)"; + } + + public class SingletonGetException : System.Exception + { + public override string Message => "不能从单例表中获取到指定的单例 (#00007)"; + } + + public class SocketWrongInfoException : System.Exception + { + public override string Message => "收到错误的返回信息 (#00008)"; + } + + public class SocketCreateListenException : System.Exception + { + public override string Message => "无法创建监听，请重新启动服务器再试 (#00009)"; + } + + public class SocketGetClientException : System.Exception + { + public override string Message => "无法获取客户端信息 (#00010)"; + } + + public class ListeningSocketCanNotSendException : System.Exception + { + public override string Message => "监听Socket不能用于发送信息 (#00011)"; + } + + public class ConnectFailedException : System.Exception + { + public override string Message => "连接到服务器失败 (#00012)"; + } + + public class LostConnectException : System.Exception + { + public override string Message => "与服务器连接中断 (#00013)"; + } + + public class FindServerFailedException : System.Exception + { + public override string Message => "查找可用的服务器失败，请重启FunGame (#00014)"; + } + + public class FormHasBeenOpenedException : System.Exception + { + public override string Message => "目标窗口可能已处于打开状态 (#00015)"; + } + + public class FormCanNotOpenException : System.Exception + { + public override string Message => "无法打开指定窗口 (#00016)"; } } diff --git a/FunGame.Core/Others/Others.cs b/FunGame.Core/Others/Others.cs index 5cba823..be9d05d 100644 --- a/FunGame.Core/Others/Others.cs +++ b/FunGame.Core/Others/Others.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Others +namespace Milimoe.FunGame.Core.Others { internal class Others { diff --git a/FunGame.Core/Service/PluginManager.cs b/FunGame.Core/Service/PluginManager.cs index 74bacb9..910df7d 100644 --- a/FunGame.Core/Service/PluginManager.cs +++ b/FunGame.Core/Service/PluginManager.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Service +namespace Milimoe.FunGame.Core.Service { internal class PluginManager { diff --git a/FunGame.Core/Service/RedisManager.cs b/FunGame.Core/Service/RedisManager.cs index df8da97..2b963df 100644 --- a/FunGame.Core/Service/RedisManager.cs +++ b/FunGame.Core/Service/RedisManager.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Service +namespace Milimoe.FunGame.Core.Service { internal class RedisManager { diff --git a/FunGame.Core/Service/ResourceManager.cs b/FunGame.Core/Service/ResourceManager.cs index 9c930af..06b4e72 100644 --- a/FunGame.Core/Service/ResourceManager.cs +++ b/FunGame.Core/Service/ResourceManager.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Service +namespace Milimoe.FunGame.Core.Service { internal class ResourceManager { diff --git a/FunGame.Core/Service/SQLManager.cs b/FunGame.Core/Service/SQLManager.cs index c7999f6..34bb309 100644 --- a/FunGame.Core/Service/SQLManager.cs +++ b/FunGame.Core/Service/SQLManager.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Api.Data; +using Milimoe.FunGame.Core.Api.Data; using Milimoe.FunGame.Core.Library.Constant; +using System.Text; namespace Milimoe.FunGame.Core.Service { diff --git a/FunGame.Core/Service/SocketManager.cs b/FunGame.Core/Service/SocketManager.cs index ce45e66..132240d 100644 --- a/FunGame.Core/Service/SocketManager.cs +++ b/FunGame.Core/Service/SocketManager.cs @@ -1,14 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Interface.Base; -using System.Collections; -using System.Net.Sockets; +using Milimoe.FunGame.Core.Library.Constant; using System.Net; -using System.Text.Json; -using Milimoe.FunGame.Core.Library.Constant; +using System.Net.Sockets; namespace Milimoe.FunGame.Core.Service { diff --git a/FunGame.Core/Service/ThreadManager.cs b/FunGame.Core/Service/ThreadManager.cs index b0d4180..4ae649a 100644 --- a/FunGame.Core/Service/ThreadManager.cs +++ b/FunGame.Core/Service/ThreadManager.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Concurrent; namespace Milimoe.FunGame.Core.Service { diff --git a/FunGame.Desktop/Controller/InventoryController.cs b/FunGame.Desktop/Controller/InventoryController.cs index 9e6ce20..eadd5d6 100644 --- a/FunGame.Desktop/Controller/InventoryController.cs +++ b/FunGame.Desktop/Controller/InventoryController.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Controller +namespace Milimoe.FunGame.Desktop.Controller { public class InventoryController { diff --git a/FunGame.Desktop/Controller/LoginController.cs b/FunGame.Desktop/Controller/LoginController.cs index b16462a..0cfcf0c 100644 --- a/FunGame.Desktop/Controller/LoginController.cs +++ b/FunGame.Desktop/Controller/LoginController.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Desktop.Library.Interface; +using Milimoe.FunGame.Desktop.Library.Interface; using Milimoe.FunGame.Desktop.Model; using Milimoe.FunGame.Desktop.UI; diff --git a/FunGame.Desktop/Controller/MainController.cs b/FunGame.Desktop/Controller/MainController.cs index 163a8e5..50233e3 100644 --- a/FunGame.Desktop/Controller/MainController.cs +++ b/FunGame.Desktop/Controller/MainController.cs @@ -1,18 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Library.Common.Event; -using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Library.Exception; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Desktop.Library; -using Milimoe.FunGame.Desktop.Library.Component; using Milimoe.FunGame.Desktop.Library.Interface; using Milimoe.FunGame.Desktop.Model; using Milimoe.FunGame.Desktop.UI; -using Milimoe.FunGame.Core.Interface; namespace Milimoe.FunGame.Desktop.Controller { diff --git a/FunGame.Desktop/Controller/RegisterController.cs b/FunGame.Desktop/Controller/RegisterController.cs index ae7fb2f..97f6618 100644 --- a/FunGame.Desktop/Controller/RegisterController.cs +++ b/FunGame.Desktop/Controller/RegisterController.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Desktop.Library.Interface; +using Milimoe.FunGame.Desktop.Library.Interface; using Milimoe.FunGame.Desktop.Model; using Milimoe.FunGame.Desktop.UI; diff --git a/FunGame.Desktop/Controller/RoomSettingController.cs b/FunGame.Desktop/Controller/RoomSettingController.cs index 8dbee2f..47dcd9d 100644 --- a/FunGame.Desktop/Controller/RoomSettingController.cs +++ b/FunGame.Desktop/Controller/RoomSettingController.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Controller +namespace Milimoe.FunGame.Desktop.Controller { public class RoomSettingController { diff --git a/FunGame.Desktop/Controller/StoreController.cs b/FunGame.Desktop/Controller/StoreController.cs index ac30433..0d04065 100644 --- a/FunGame.Desktop/Controller/StoreController.cs +++ b/FunGame.Desktop/Controller/StoreController.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Controller +namespace Milimoe.FunGame.Desktop.Controller { public class StoreController { diff --git a/FunGame.Desktop/Controller/UserCenterController.cs b/FunGame.Desktop/Controller/UserCenterController.cs index 182a6e7..024de9a 100644 --- a/FunGame.Desktop/Controller/UserCenterController.cs +++ b/FunGame.Desktop/Controller/UserCenterController.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Controller +namespace Milimoe.FunGame.Desktop.Controller { public class UserCenterController { diff --git a/FunGame.Desktop/Library/Base/BaseMain.cs b/FunGame.Desktop/Library/Base/BaseMain.cs index 6bd8fa1..9eda242 100644 --- a/FunGame.Desktop/Library/Base/BaseMain.cs +++ b/FunGame.Desktop/Library/Base/BaseMain.cs @@ -1,132 +1,131 @@ using Milimoe.FunGame.Core.Interface; using Milimoe.FunGame.Core.Library.Common.Event; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Desktop.Controller; using Milimoe.FunGame.Desktop.Library.Component; namespace Milimoe.FunGame.Desktop.Library.Base { public class BaseMain : GeneralForm, IConnectEventHandler, IDisconnectEventHandler, ILogoutEventHandler { - public event IEventHandler.BeforeEventHandler? BeforeConnectEvent; - public event IEventHandler.AfterEventHandler? AfterConnectEvent; - public event IEventHandler.SucceedEventHandler? SucceedConnectEvent; - public event IEventHandler.FailedEventHandler? FailedConnectEvent; + public event IEventHandler.BeforeEventHandler? BeforeConnect; + public event IEventHandler.AfterEventHandler? AfterConnect; + public event IEventHandler.SucceedEventHandler? SucceedConnect; + public event IEventHandler.FailedEventHandler? FailedConnect; public EventResult OnAfterConnectEvent(GeneralEventArgs e) { - if (AfterConnectEvent != null) + if (AfterConnect != null) { - return AfterConnectEvent(this, e); + return AfterConnect(this, e); } else return EventResult.NoEventImplement; } public EventResult OnBeforeConnectEvent(GeneralEventArgs e) { - if (BeforeConnectEvent != null) + if (BeforeConnect != null) { - return BeforeConnectEvent(this, e); + return BeforeConnect(this, e); } else return EventResult.NoEventImplement; } public EventResult OnSucceedConnectEvent(GeneralEventArgs e) { - if (SucceedConnectEvent != null) + if (SucceedConnect != null) { - return SucceedConnectEvent(this, e); + return SucceedConnect(this, e); } else return EventResult.NoEventImplement; } public EventResult OnFailedConnectEvent(GeneralEventArgs e) { - if (FailedConnectEvent != null) + if (FailedConnect != null) { - return FailedConnectEvent(this, e); + return FailedConnect(this, e); } else return EventResult.NoEventImplement; } - public event IEventHandler.BeforeEventHandler? BeforeDisconnectEvent; - public event IEventHandler.AfterEventHandler? AfterDisconnectEvent; - public event IEventHandler.SucceedEventHandler? SucceedDisconnectEvent; - public event IEventHandler.FailedEventHandler? FailedDisconnectEvent; + public event IEventHandler.BeforeEventHandler? BeforeDisconnect; + public event IEventHandler.AfterEventHandler? AfterDisconnect; + public event IEventHandler.SucceedEventHandler? SucceedDisconnect; + public event IEventHandler.FailedEventHandler? FailedDisconnect; public EventResult OnAfterDisconnectEvent(GeneralEventArgs e) { - if (AfterDisconnectEvent != null) + if (AfterDisconnect != null) { - return AfterDisconnectEvent(this, e); + return AfterDisconnect(this, e); } else return EventResult.NoEventImplement; } public EventResult OnBeforeDisconnectEvent(GeneralEventArgs e) { - if (BeforeDisconnectEvent != null) + if (BeforeDisconnect != null) { - return BeforeDisconnectEvent(this, e); + return BeforeDisconnect(this, e); } else return EventResult.NoEventImplement; } public EventResult OnFailedDisconnectEvent(GeneralEventArgs e) { - if (FailedDisconnectEvent != null) + if (FailedDisconnect != null) { - return FailedDisconnectEvent(this, e); + return FailedDisconnect(this, e); } else return EventResult.NoEventImplement; } public EventResult OnSucceedDisconnectEvent(GeneralEventArgs e) { - if (SucceedDisconnectEvent != null) + if (SucceedDisconnect != null) { - return SucceedDisconnectEvent(this, e); + return SucceedDisconnect(this, e); } else return EventResult.NoEventImplement; } - public event IEventHandler.BeforeEventHandler? BeforeLogoutEvent; - public event IEventHandler.AfterEventHandler? AfterLogoutEvent; - public event IEventHandler.SucceedEventHandler? SucceedLogoutEvent; - public event IEventHandler.FailedEventHandler? FailedLogoutEvent; + public event IEventHandler.BeforeEventHandler? BeforeLogout; + public event IEventHandler.AfterEventHandler? AfterLogout; + public event IEventHandler.SucceedEventHandler? SucceedLogout; + public event IEventHandler.FailedEventHandler? FailedLogout; public EventResult OnAfterLogoutEvent(GeneralEventArgs e) { - if (AfterLogoutEvent != null) + if (AfterLogout != null) { - return AfterLogoutEvent(this, e); + return AfterLogout(this, e); } else return EventResult.NoEventImplement; } public EventResult OnBeforeLogoutEvent(GeneralEventArgs e) { - if (BeforeLogoutEvent != null) + if (BeforeLogout != null) { - return BeforeLogoutEvent(this, e); + return BeforeLogout(this, e); } else return EventResult.NoEventImplement; } public EventResult OnFailedLogoutEvent(GeneralEventArgs e) { - if (FailedLogoutEvent != null) + if (FailedLogout != null) { - return FailedLogoutEvent(this, e); + return FailedLogout(this, e); } else return EventResult.NoEventImplement; } public EventResult OnSucceedLogoutEvent(GeneralEventArgs e) { - if (SucceedLogoutEvent != null) + if (SucceedLogout != null) { - return SucceedLogoutEvent(this, e); + return SucceedLogout(this, e); } else return EventResult.NoEventImplement; } diff --git a/FunGame.Desktop/Library/Component/ExitButton.cs b/FunGame.Desktop/Library/Component/ExitButton.cs index fba5a87..3ac34e2 100644 --- a/FunGame.Desktop/Library/Component/ExitButton.cs +++ b/FunGame.Desktop/Library/Component/ExitButton.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel; namespace Milimoe.FunGame.Desktop.Library.Component { diff --git a/FunGame.Desktop/Library/Component/GeneralForm.cs b/FunGame.Desktop/Library/Component/GeneralForm.cs index b1f58ab..3fd6025 100644 --- a/FunGame.Desktop/Library/Component/GeneralForm.cs +++ b/FunGame.Desktop/Library/Component/GeneralForm.cs @@ -89,7 +89,6 @@ namespace Milimoe.FunGame.Desktop.Library.Component { RunTime.UserCenter = null; } - base.Dispose(); } } } diff --git a/FunGame.Desktop/Library/Component/MinButton.cs b/FunGame.Desktop/Library/Component/MinButton.cs index 9299638..3de3d8f 100644 --- a/FunGame.Desktop/Library/Component/MinButton.cs +++ b/FunGame.Desktop/Library/Component/MinButton.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel; namespace Milimoe.FunGame.Desktop.Library.Component { diff --git a/FunGame.Desktop/Library/Component/ShowMessage.cs b/FunGame.Desktop/Library/Component/ShowMessage.cs index 8e28ec4..6e005f7 100644 --- a/FunGame.Desktop/Library/Component/ShowMessage.cs +++ b/FunGame.Desktop/Library/Component/ShowMessage.cs @@ -1,13 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Desktop.Library.Component { diff --git a/FunGame.Desktop/Library/Component/TextArea.cs b/FunGame.Desktop/Library/Component/TextArea.cs index 9ce7f6b..5fe714b 100644 --- a/FunGame.Desktop/Library/Component/TextArea.cs +++ b/FunGame.Desktop/Library/Component/TextArea.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Drawing; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace Milimoe.FunGame.Desktop.Library.Component { diff --git a/FunGame.Desktop/Library/Component/TransparentRect.cs b/FunGame.Desktop/Library/Component/TransparentRect.cs index 22645f9..2171994 100644 --- a/FunGame.Desktop/Library/Component/TransparentRect.cs +++ b/FunGame.Desktop/Library/Component/TransparentRect.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Drawing; using System.Drawing.Drawing2D; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace Milimoe.FunGame.Desktop.Library.Component { diff --git a/FunGame.Desktop/Library/Config/Config.cs b/FunGame.Desktop/Library/Config/Config.cs index 5e4e688..f4d8e7a 100644 --- a/FunGame.Desktop/Library/Config/Config.cs +++ b/FunGame.Desktop/Library/Config/Config.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Library +namespace Milimoe.FunGame.Desktop.Library { public class Config { diff --git a/FunGame.Desktop/Library/Config/Constant.cs b/FunGame.Desktop/Library/Config/Constant.cs index df58898..5e18170 100644 --- a/FunGame.Desktop/Library/Config/Constant.cs +++ b/FunGame.Desktop/Library/Config/Constant.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.AccessControl; +using Milimoe.FunGame.Core.Library.Constant; using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Library.Constant; namespace Milimoe.FunGame.Desktop.Library { @@ -42,6 +36,11 @@ namespace Milimoe.FunGame.Desktop.Library public static UI.InventoryUI? Inventory { get; set; } = null; public static UI.RoomSetting? RoomSetting { get; set; } = null; public static UI.UserCenter? UserCenter { get; set; } = null; + + public static void WritelnSystemInfo(string msg) + { + Main?.GetMessage(msg); + } } public class Constant diff --git a/FunGame.Desktop/Library/Config/Usercfg.cs b/FunGame.Desktop/Library/Config/Usercfg.cs index 693d819..1f50765 100644 --- a/FunGame.Desktop/Library/Config/Usercfg.cs +++ b/FunGame.Desktop/Library/Config/Usercfg.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; namespace Milimoe.FunGame.Desktop.Library { diff --git a/FunGame.Desktop/Library/Interface/ILogin.cs b/FunGame.Desktop/Library/Interface/ILogin.cs index 6f478eb..2816275 100644 --- a/FunGame.Desktop/Library/Interface/ILogin.cs +++ b/FunGame.Desktop/Library/Interface/ILogin.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Library.Interface +namespace Milimoe.FunGame.Desktop.Library.Interface { public interface ILogin { diff --git a/FunGame.Desktop/Library/Interface/IReg.cs b/FunGame.Desktop/Library/Interface/IReg.cs index 8c20ff8..ab0afe3 100644 --- a/FunGame.Desktop/Library/Interface/IReg.cs +++ b/FunGame.Desktop/Library/Interface/IReg.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Library.Interface +namespace Milimoe.FunGame.Desktop.Library.Interface { public interface IReg { diff --git a/FunGame.Desktop/Model/InventoryModel.cs b/FunGame.Desktop/Model/InventoryModel.cs index 17d10cc..7e1359a 100644 --- a/FunGame.Desktop/Model/InventoryModel.cs +++ b/FunGame.Desktop/Model/InventoryModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Model +namespace Milimoe.FunGame.Desktop.Model { public class InventoryModel { diff --git a/FunGame.Desktop/Model/LoginModel.cs b/FunGame.Desktop/Model/LoginModel.cs index 2ea81fb..7551cfd 100644 --- a/FunGame.Desktop/Model/LoginModel.cs +++ b/FunGame.Desktop/Model/LoginModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.Exception; using Milimoe.FunGame.Desktop.Library; using Milimoe.FunGame.Desktop.Library.Interface; diff --git a/FunGame.Desktop/Model/MainModel.cs b/FunGame.Desktop/Model/MainModel.cs index a2275b2..08f95f3 100644 --- a/FunGame.Desktop/Model/MainModel.cs +++ b/FunGame.Desktop/Model/MainModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -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.Core.Library.Common.Event; using Milimoe.FunGame.Core.Library.Constant; @@ -78,7 +73,7 @@ namespace Milimoe.FunGame.Desktop.Model { ShowMessage.ErrorMessage("查找可用的服务器失败！"); Config.FunGame_isRetrying = false; - throw new Exception("查找可用的服务器失败，请重启FunGame。"); + throw new FindServerFailedException(); } } catch (Exception e) @@ -113,7 +108,7 @@ namespace Milimoe.FunGame.Desktop.Model // 超过重连次数上限 if (Main.CurrentRetryTimes + 1 > Main.MaxRetryTimes) { - throw new Exception("无法连接至服务器，请检查网络并重启游戏再试。"); + throw new CanNotConnectException(); } // 与服务器建立连接 Socket?.Close(); @@ -141,7 +136,7 @@ namespace Milimoe.FunGame.Desktop.Model } Socket?.Close(); Config.FunGame_isRetrying = false; - throw new Exception("无法连接至服务器，请检查网络并重启游戏再试。"); + throw new CanNotConnectException(); } } else diff --git a/FunGame.Desktop/Model/RegisterModel.cs b/FunGame.Desktop/Model/RegisterModel.cs index fc46040..6c994ae 100644 --- a/FunGame.Desktop/Model/RegisterModel.cs +++ b/FunGame.Desktop/Model/RegisterModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Desktop.Library; +using Milimoe.FunGame.Desktop.Library; using Milimoe.FunGame.Desktop.Library.Interface; using Milimoe.FunGame.Desktop.UI; diff --git a/FunGame.Desktop/Model/RoomSettingModel.cs b/FunGame.Desktop/Model/RoomSettingModel.cs index 08c125d..03b2ead 100644 --- a/FunGame.Desktop/Model/RoomSettingModel.cs +++ b/FunGame.Desktop/Model/RoomSettingModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Model +namespace Milimoe.FunGame.Desktop.Model { public class RoomSettingModel { diff --git a/FunGame.Desktop/Model/StoreModel.cs b/FunGame.Desktop/Model/StoreModel.cs index b4dfad4..57caba0 100644 --- a/FunGame.Desktop/Model/StoreModel.cs +++ b/FunGame.Desktop/Model/StoreModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Model +namespace Milimoe.FunGame.Desktop.Model { public class StoreModel { diff --git a/FunGame.Desktop/Model/UserCenterModel.cs b/FunGame.Desktop/Model/UserCenterModel.cs index fd820f7..9dd592b 100644 --- a/FunGame.Desktop/Model/UserCenterModel.cs +++ b/FunGame.Desktop/Model/UserCenterModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Desktop.Model +namespace Milimoe.FunGame.Desktop.Model { public class UserCenterModel { diff --git a/FunGame.Desktop/UI/Inventory/InventoryUI.cs b/FunGame.Desktop/UI/Inventory/InventoryUI.cs index cdd7342..3063e55 100644 --- a/FunGame.Desktop/UI/Inventory/InventoryUI.cs +++ b/FunGame.Desktop/UI/Inventory/InventoryUI.cs @@ -1,14 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Milimoe.FunGame.Desktop.UI +namespace Milimoe.FunGame.Desktop.UI { public partial class InventoryUI : Form { diff --git a/FunGame.Desktop/UI/Main/Main.Designer.cs b/FunGame.Desktop/UI/Main/Main.Designer.cs index 49ea422..cddad1e 100644 --- a/FunGame.Desktop/UI/Main/Main.Designer.cs +++ b/FunGame.Desktop/UI/Main/Main.Designer.cs @@ -1,4 +1,4 @@ -using Milimoe.FunGame.Desktop.Library; +using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Desktop.Library.Component; namespace Milimoe.FunGame.Desktop.UI @@ -535,7 +535,7 @@ namespace Milimoe.FunGame.Desktop.UI this.Copyright.Size = new System.Drawing.Size(186, 23); this.Copyright.TabIndex = 97; this.Copyright.TabStop = true; - this.Copyright.Text = "©2022 Mili.cyou. 米粒的糖果屋"; + this.Copyright.Text = FunGameInfo.FunGame_CopyRight; this.Copyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.Copyright.UseCompatibleTextRendering = true; this.Copyright.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.Copyright_LinkClicked); diff --git a/FunGame.Desktop/UI/Main/Main.cs b/FunGame.Desktop/UI/Main/Main.cs index 5371a81..6e5807b 100644 --- a/FunGame.Desktop/UI/Main/Main.cs +++ b/FunGame.Desktop/UI/Main/Main.cs @@ -1,15 +1,15 @@ -using System.Diagnostics; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Interface; +using Milimoe.FunGame.Core.Library.Common.Event; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.Exception; -using Milimoe.FunGame.Core.Library.Common.Event; -using Milimoe.FunGame.Desktop.Library; -using Milimoe.FunGame.Desktop.Library.Component; using Milimoe.FunGame.Desktop.Controller; +using Milimoe.FunGame.Desktop.Library; using Milimoe.FunGame.Desktop.Library.Base; +using Milimoe.FunGame.Desktop.Library.Component; using Milimoe.FunGame.Desktop.Utility; +using System.Diagnostics; namespace Milimoe.FunGame.Desktop.UI { @@ -78,10 +78,10 @@ namespace Milimoe.FunGame.Desktop.UI protected override void BindEvent() { base.BindEvent(); - AfterConnectEvent += AfterConnect; - BeforeConnectEvent += BeforeConnect; - FailedConnectEvent += FailedConnect; - SucceedConnectEvent += SucceedConnect; + AfterConnect += AfterConnectEvent; + BeforeConnect += BeforeConnectEvent; + FailedConnect += FailedConnectEvent; + SucceedConnect += SucceedConnectEvent; } #endregion @@ -281,10 +281,10 @@ namespace Milimoe.FunGame.Desktop.UI string isAutoLogin = INIHelper.ReadINI("Config", "AutoLogin"); if (isAutoConncet != null && !isAutoConncet.Equals("") && (isAutoConncet.Equals("false") || isAutoConncet.Equals("true"))) Config.FunGame_isAutoConnect = Convert.ToBoolean(isAutoConncet); - else throw new Exception("读取配置文件出错，参数格式不正确"); + else throw new ReadConfigException(); if (isAutoLogin != null && !isAutoLogin.Equals("") && (isAutoLogin.Equals("false") || isAutoLogin.Equals("true"))) Config.FunGame_isAutoLogin = Convert.ToBoolean(isAutoLogin); - else throw new Exception("读取配置文件出错，参数格式不正确"); + else throw new ReadConfigException(); } else { @@ -293,7 +293,7 @@ namespace Milimoe.FunGame.Desktop.UI GetFunGameConfig(); } } - catch (Exception e) + catch (System.Exception e) { WritelnGameInfo(e.GetErrorInfo()); } @@ -1136,7 +1136,7 @@ namespace Milimoe.FunGame.Desktop.UI /// /// /// - public EventResult BeforeConnect(object sender, GeneralEventArgs e) + public EventResult BeforeConnectEvent(object sender, GeneralEventArgs e) { return EventResult.Success; } @@ -1147,7 +1147,7 @@ namespace Milimoe.FunGame.Desktop.UI /// /// /// - public EventResult AfterConnect(object sender, GeneralEventArgs e) + public EventResult AfterConnectEvent(object sender, GeneralEventArgs e) { return EventResult.Success; } @@ -1158,7 +1158,7 @@ namespace Milimoe.FunGame.Desktop.UI /// /// /// - public EventResult FailedConnect(object sender, GeneralEventArgs e) + public EventResult FailedConnectEvent(object sender, GeneralEventArgs e) { return EventResult.Success; } @@ -1169,7 +1169,7 @@ namespace Milimoe.FunGame.Desktop.UI /// /// /// - public EventResult SucceedConnect(object sender, GeneralEventArgs e) + public EventResult SucceedConnectEvent(object sender, GeneralEventArgs e) { if (MainController != null && Config.FunGame_isAutoLogin) { diff --git a/FunGame.Desktop/UI/RoomSetting/RoomSetting.cs b/FunGame.Desktop/UI/RoomSetting/RoomSetting.cs index 3d60907..da43391 100644 --- a/FunGame.Desktop/UI/RoomSetting/RoomSetting.cs +++ b/FunGame.Desktop/UI/RoomSetting/RoomSetting.cs @@ -1,14 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Milimoe.FunGame.Desktop.UI +namespace Milimoe.FunGame.Desktop.UI { public partial class RoomSetting : Form { diff --git a/FunGame.Desktop/UI/Store/Store.cs b/FunGame.Desktop/UI/Store/Store.cs index 82ad4a5..9bf65b9 100644 --- a/FunGame.Desktop/UI/Store/Store.cs +++ b/FunGame.Desktop/UI/Store/Store.cs @@ -1,14 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Milimoe.FunGame.Desktop.UI +namespace Milimoe.FunGame.Desktop.UI { public partial class StoreUI : Form { diff --git a/FunGame.Desktop/UI/UserCenter/UserCenter.cs b/FunGame.Desktop/UI/UserCenter/UserCenter.cs index 43fd35d..ea5cb72 100644 --- a/FunGame.Desktop/UI/UserCenter/UserCenter.cs +++ b/FunGame.Desktop/UI/UserCenter/UserCenter.cs @@ -1,14 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Milimoe.FunGame.Desktop.UI +namespace Milimoe.FunGame.Desktop.UI { public partial class UserCenter : Form { diff --git a/FunGame.Desktop/Utility/OpenForm.cs b/FunGame.Desktop/Utility/OpenForm.cs index b820483..c8d406e 100644 --- a/FunGame.Desktop/Utility/OpenForm.cs +++ b/FunGame.Desktop/Utility/OpenForm.cs @@ -1,5 +1,6 @@ using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Exception; using Milimoe.FunGame.Desktop.Library; using Milimoe.FunGame.Desktop.UI; @@ -7,68 +8,89 @@ namespace Milimoe.FunGame.Desktop.Utility { public class OpenForm { - public static void SingleForm(FormType type, OpenFormType opentype = OpenFormType.General) + /// + /// + /// + /// 窗体类型 + /// 打开类型 + /// 构造参数 + /// 目标窗口可能已处于打开状态 + public static void SingleForm(FormType type, OpenFormType opentype = OpenFormType.General, params object[]? objs) { - Form form = new(); - bool IsExist = false; - switch (type) + try { - case FormType.Register: - form = new Register(); - IsExist = RunTime.Register != null; - RunTime.Register = (Register)form; - break; - case FormType.Login: - form = new Login(); - IsExist = RunTime.Login != null; - RunTime.Login = (Login)form; - break; - case FormType.Inventory: - form = new InventoryUI(); - IsExist = RunTime.Inventory != null; - RunTime.Inventory = (InventoryUI)form; - break; - case FormType.RoomSetting: - form = new RoomSetting(); - IsExist = RunTime.RoomSetting != null; - RunTime.RoomSetting = (RoomSetting)form; - break; - case FormType.Store: - form = new StoreUI(); - IsExist = RunTime.Store != null; - RunTime.Store = (StoreUI)form; - break; - case FormType.UserCenter: - form = new UserCenter(); - IsExist = RunTime.UserCenter != null; - RunTime.UserCenter = (UserCenter)form; - break; - case FormType.Main: - form = new Main(); - IsExist = RunTime.Main != null; - RunTime.Main = (Main)form; - break; - default: - break; + Form form = new(); + bool IsExist = false; + switch (type) + { + case FormType.Register: + form = new Register(); + IsExist = RunTime.Register != null; + RunTime.Register = (Register)form; + break; + case FormType.Login: + form = new Login(); + IsExist = RunTime.Login != null; + RunTime.Login = (Login)form; + break; + case FormType.Inventory: + form = new InventoryUI(); + IsExist = RunTime.Inventory != null; + RunTime.Inventory = (InventoryUI)form; + break; + case FormType.RoomSetting: + form = new RoomSetting(); + IsExist = RunTime.RoomSetting != null; + RunTime.RoomSetting = (RoomSetting)form; + break; + case FormType.Store: + form = new StoreUI(); + IsExist = RunTime.Store != null; + RunTime.Store = (StoreUI)form; + break; + case FormType.UserCenter: + form = new UserCenter(); + IsExist = RunTime.UserCenter != null; + RunTime.UserCenter = (UserCenter)form; + break; + case FormType.Main: + form = new Main(); + IsExist = RunTime.Main != null; + RunTime.Main = (Main)form; + break; + default: + break; + } + if (Singleton.IsExist(form) || IsExist) + { + throw new FormHasBeenOpenedException(); + } + else + { + NewSingleForm(form, opentype); + } } - if (Singleton.IsExist(form) || IsExist) + catch (Exception e) { - throw new Exception("目标窗口可能已处于打开状态。"); - } - else - { - NewSingleForm(form, opentype); + RunTime.WritelnSystemInfo(e.GetErrorInfo()); } } private static void NewSingleForm(Form form, OpenFormType opentype) { - if (Singleton.Add(form)) + try { - if (opentype == OpenFormType.Dialog) form.ShowDialog(); - else form.Show(); + if (Singleton.Add(form)) + { + if (opentype == OpenFormType.Dialog) form.ShowDialog(); + else form.Show(); + } + else throw new FormCanNotOpenException(); + } + catch (Exception e) + { + RunTime.WritelnSystemInfo(e.GetErrorInfo()); } - else throw new Exception("无法打开指定窗口。"); } } }