diff --git a/Api/Utility/PluginLoader.cs b/Api/Utility/PluginLoader.cs index 5c32578..40684a9 100644 --- a/Api/Utility/PluginLoader.cs +++ b/Api/Utility/PluginLoader.cs @@ -68,22 +68,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedConnectEvent(object sender, ConnectEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedConnectEvent(sender, e); - }); - } - - public void OnFailedConnectEvent(object sender, ConnectEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedConnectEvent(sender, e); - }); - } - public void OnBeforeDisconnectEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -100,22 +84,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedDisconnectEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedDisconnectEvent(sender, e); - }); - } - - public void OnFailedDisconnectEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedDisconnectEvent(sender, e); - }); - } - public void OnBeforeLoginEvent(object sender, LoginEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -132,22 +100,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedLoginEvent(object sender, LoginEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedLoginEvent(sender, e); - }); - } - - public void OnFailedLoginEvent(object sender, LoginEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedLoginEvent(sender, e); - }); - } - public void OnBeforeLogoutEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -164,22 +116,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedLogoutEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedLogoutEvent(sender, e); - }); - } - - public void OnFailedLogoutEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedLogoutEvent(sender, e); - }); - } - public void OnBeforeRegEvent(object sender, RegisterEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -196,22 +132,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedRegEvent(object sender, RegisterEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedRegEvent(sender, e); - }); - } - - public void OnFailedRegEvent(object sender, RegisterEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedRegEvent(sender, e); - }); - } - public void OnBeforeIntoRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -228,22 +148,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedIntoRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedIntoRoomEvent(sender, e); - }); - } - - public void OnFailedIntoRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedIntoRoomEvent(sender, e); - }); - } - public void OnBeforeSendTalkEvent(object sender, SendTalkEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -260,22 +164,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedSendTalkEvent(object sender, SendTalkEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedSendTalkEvent(sender, e); - }); - } - - public void OnFailedSendTalkEvent(object sender, SendTalkEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedSendTalkEvent(sender, e); - }); - } - public void OnBeforeCreateRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -292,22 +180,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedCreateRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedCreateRoomEvent(sender, e); - }); - } - - public void OnFailedCreateRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedCreateRoomEvent(sender, e); - }); - } - public void OnBeforeQuitRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -324,22 +196,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedQuitRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedQuitRoomEvent(sender, e); - }); - } - - public void OnFailedQuitRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedQuitRoomEvent(sender, e); - }); - } - public void OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -356,22 +212,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeRoomSettingEvent(sender, e); - }); - } - - public void OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeRoomSettingEvent(sender, e); - }); - } - public void OnBeforeStartMatchEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -388,22 +228,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedStartMatchEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedStartMatchEvent(sender, e); - }); - } - - public void OnFailedStartMatchEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedStartMatchEvent(sender, e); - }); - } - public void OnBeforeStartGameEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -420,22 +244,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedStartGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedStartGameEvent(sender, e); - }); - } - - public void OnFailedStartGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedStartGameEvent(sender, e); - }); - } - public void OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -452,22 +260,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeProfileEvent(sender, e); - }); - } - - public void OnFailedChangeProfileEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeProfileEvent(sender, e); - }); - } - public void OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -484,22 +276,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeAccountSettingEvent(sender, e); - }); - } - - public void OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeAccountSettingEvent(sender, e); - }); - } - public void OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -516,22 +292,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedOpenInventoryEvent(sender, e); - }); - } - - public void OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedOpenInventoryEvent(sender, e); - }); - } - public void OnBeforeSignInEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -548,22 +308,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedSignInEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedSignInEvent(sender, e); - }); - } - - public void OnFailedSignInEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedSignInEvent(sender, e); - }); - } - public void OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -580,22 +324,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedOpenStoreEvent(sender, e); - }); - } - - public void OnFailedOpenStoreEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedOpenStoreEvent(sender, e); - }); - } - public void OnBeforeBuyItemEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -612,22 +340,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedBuyItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedBuyItemEvent(sender, e); - }); - } - - public void OnFailedBuyItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedBuyItemEvent(sender, e); - }); - } - public void OnBeforeShowRankingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -644,22 +356,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedShowRankingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedShowRankingEvent(sender, e); - }); - } - - public void OnFailedShowRankingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedShowRankingEvent(sender, e); - }); - } - public void OnBeforeUseItemEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -676,22 +372,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedUseItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedUseItemEvent(sender, e); - }); - } - - public void OnFailedUseItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedUseItemEvent(sender, e); - }); - } - public void OnBeforeEndGameEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -707,21 +387,5 @@ namespace Milimoe.FunGame.Core.Api.Utility plugin.OnAfterEndGameEvent(sender, e); }); } - - public void OnSucceedEndGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedEndGameEvent(sender, e); - }); - } - - public void OnFailedEndGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedEndGameEvent(sender, e); - }); - } } } diff --git a/Api/Utility/ServerPluginLoader.cs b/Api/Utility/ServerPluginLoader.cs index 5a47ec2..4ec721c 100644 --- a/Api/Utility/ServerPluginLoader.cs +++ b/Api/Utility/ServerPluginLoader.cs @@ -68,22 +68,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedConnectEvent(object sender, ConnectEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedConnectEvent(sender, e); - }); - } - - public void OnFailedConnectEvent(object sender, ConnectEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedConnectEvent(sender, e); - }); - } - public void OnBeforeDisconnectEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -100,22 +84,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedDisconnectEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedDisconnectEvent(sender, e); - }); - } - - public void OnFailedDisconnectEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedDisconnectEvent(sender, e); - }); - } - public void OnBeforeLoginEvent(object sender, LoginEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -132,22 +100,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedLoginEvent(object sender, LoginEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedLoginEvent(sender, e); - }); - } - - public void OnFailedLoginEvent(object sender, LoginEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedLoginEvent(sender, e); - }); - } - public void OnBeforeLogoutEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -164,22 +116,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedLogoutEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedLogoutEvent(sender, e); - }); - } - - public void OnFailedLogoutEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedLogoutEvent(sender, e); - }); - } - public void OnBeforeRegEvent(object sender, RegisterEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -196,22 +132,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedRegEvent(object sender, RegisterEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedRegEvent(sender, e); - }); - } - - public void OnFailedRegEvent(object sender, RegisterEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedRegEvent(sender, e); - }); - } - public void OnBeforeIntoRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -228,22 +148,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedIntoRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedIntoRoomEvent(sender, e); - }); - } - - public void OnFailedIntoRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedIntoRoomEvent(sender, e); - }); - } - public void OnBeforeSendTalkEvent(object sender, SendTalkEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -260,22 +164,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedSendTalkEvent(object sender, SendTalkEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedSendTalkEvent(sender, e); - }); - } - - public void OnFailedSendTalkEvent(object sender, SendTalkEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedSendTalkEvent(sender, e); - }); - } - public void OnBeforeCreateRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -292,22 +180,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedCreateRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedCreateRoomEvent(sender, e); - }); - } - - public void OnFailedCreateRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedCreateRoomEvent(sender, e); - }); - } - public void OnBeforeQuitRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -324,22 +196,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedQuitRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedQuitRoomEvent(sender, e); - }); - } - - public void OnFailedQuitRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedQuitRoomEvent(sender, e); - }); - } - public void OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -356,22 +212,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeRoomSettingEvent(sender, e); - }); - } - - public void OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeRoomSettingEvent(sender, e); - }); - } - public void OnBeforeStartMatchEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -388,22 +228,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedStartMatchEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedStartMatchEvent(sender, e); - }); - } - - public void OnFailedStartMatchEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedStartMatchEvent(sender, e); - }); - } - public void OnBeforeStartGameEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -420,22 +244,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedStartGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedStartGameEvent(sender, e); - }); - } - - public void OnFailedStartGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedStartGameEvent(sender, e); - }); - } - public void OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -452,22 +260,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeProfileEvent(sender, e); - }); - } - - public void OnFailedChangeProfileEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeProfileEvent(sender, e); - }); - } - public void OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -484,22 +276,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeAccountSettingEvent(sender, e); - }); - } - - public void OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeAccountSettingEvent(sender, e); - }); - } - public void OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -516,22 +292,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedOpenInventoryEvent(sender, e); - }); - } - - public void OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedOpenInventoryEvent(sender, e); - }); - } - public void OnBeforeSignInEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -548,22 +308,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedSignInEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedSignInEvent(sender, e); - }); - } - - public void OnFailedSignInEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedSignInEvent(sender, e); - }); - } - public void OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -580,22 +324,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedOpenStoreEvent(sender, e); - }); - } - - public void OnFailedOpenStoreEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedOpenStoreEvent(sender, e); - }); - } - public void OnBeforeBuyItemEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -612,22 +340,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedBuyItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedBuyItemEvent(sender, e); - }); - } - - public void OnFailedBuyItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedBuyItemEvent(sender, e); - }); - } - public void OnBeforeShowRankingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -644,22 +356,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedShowRankingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedShowRankingEvent(sender, e); - }); - } - - public void OnFailedShowRankingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedShowRankingEvent(sender, e); - }); - } - public void OnBeforeUseItemEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -676,22 +372,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedUseItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedUseItemEvent(sender, e); - }); - } - - public void OnFailedUseItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedUseItemEvent(sender, e); - }); - } - public void OnBeforeEndGameEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -707,21 +387,5 @@ namespace Milimoe.FunGame.Core.Api.Utility plugin.OnAfterEndGameEvent(sender, e); }); } - - public void OnSucceedEndGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedEndGameEvent(sender, e); - }); - } - - public void OnFailedEndGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedEndGameEvent(sender, e); - }); - } } } diff --git a/Api/Utility/WebAPIPluginLoader.cs b/Api/Utility/WebAPIPluginLoader.cs index 135f898..4df184c 100644 --- a/Api/Utility/WebAPIPluginLoader.cs +++ b/Api/Utility/WebAPIPluginLoader.cs @@ -68,22 +68,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedConnectEvent(object sender, ConnectEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedConnectEvent(sender, e); - }); - } - - public void OnFailedConnectEvent(object sender, ConnectEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedConnectEvent(sender, e); - }); - } - public void OnBeforeDisconnectEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -100,22 +84,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedDisconnectEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedDisconnectEvent(sender, e); - }); - } - - public void OnFailedDisconnectEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedDisconnectEvent(sender, e); - }); - } - public void OnBeforeLoginEvent(object sender, LoginEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -132,22 +100,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedLoginEvent(object sender, LoginEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedLoginEvent(sender, e); - }); - } - - public void OnFailedLoginEvent(object sender, LoginEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedLoginEvent(sender, e); - }); - } - public void OnBeforeLogoutEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -164,22 +116,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedLogoutEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedLogoutEvent(sender, e); - }); - } - - public void OnFailedLogoutEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedLogoutEvent(sender, e); - }); - } - public void OnBeforeRegEvent(object sender, RegisterEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -196,22 +132,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedRegEvent(object sender, RegisterEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedRegEvent(sender, e); - }); - } - - public void OnFailedRegEvent(object sender, RegisterEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedRegEvent(sender, e); - }); - } - public void OnBeforeIntoRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -228,22 +148,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedIntoRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedIntoRoomEvent(sender, e); - }); - } - - public void OnFailedIntoRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedIntoRoomEvent(sender, e); - }); - } - public void OnBeforeSendTalkEvent(object sender, SendTalkEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -260,22 +164,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedSendTalkEvent(object sender, SendTalkEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedSendTalkEvent(sender, e); - }); - } - - public void OnFailedSendTalkEvent(object sender, SendTalkEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedSendTalkEvent(sender, e); - }); - } - public void OnBeforeCreateRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -292,22 +180,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedCreateRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedCreateRoomEvent(sender, e); - }); - } - - public void OnFailedCreateRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedCreateRoomEvent(sender, e); - }); - } - public void OnBeforeQuitRoomEvent(object sender, RoomEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -324,22 +196,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedQuitRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedQuitRoomEvent(sender, e); - }); - } - - public void OnFailedQuitRoomEvent(object sender, RoomEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedQuitRoomEvent(sender, e); - }); - } - public void OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -356,22 +212,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeRoomSettingEvent(sender, e); - }); - } - - public void OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeRoomSettingEvent(sender, e); - }); - } - public void OnBeforeStartMatchEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -388,22 +228,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedStartMatchEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedStartMatchEvent(sender, e); - }); - } - - public void OnFailedStartMatchEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedStartMatchEvent(sender, e); - }); - } - public void OnBeforeStartGameEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -420,22 +244,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedStartGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedStartGameEvent(sender, e); - }); - } - - public void OnFailedStartGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedStartGameEvent(sender, e); - }); - } - public void OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -452,22 +260,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeProfileEvent(sender, e); - }); - } - - public void OnFailedChangeProfileEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeProfileEvent(sender, e); - }); - } - public void OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -484,22 +276,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedChangeAccountSettingEvent(sender, e); - }); - } - - public void OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedChangeAccountSettingEvent(sender, e); - }); - } - public void OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -516,22 +292,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedOpenInventoryEvent(sender, e); - }); - } - - public void OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedOpenInventoryEvent(sender, e); - }); - } - public void OnBeforeSignInEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -548,22 +308,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedSignInEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedSignInEvent(sender, e); - }); - } - - public void OnFailedSignInEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedSignInEvent(sender, e); - }); - } - public void OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -580,22 +324,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedOpenStoreEvent(sender, e); - }); - } - - public void OnFailedOpenStoreEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedOpenStoreEvent(sender, e); - }); - } - public void OnBeforeBuyItemEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -612,22 +340,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedBuyItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedBuyItemEvent(sender, e); - }); - } - - public void OnFailedBuyItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedBuyItemEvent(sender, e); - }); - } - public void OnBeforeShowRankingEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -644,22 +356,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedShowRankingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedShowRankingEvent(sender, e); - }); - } - - public void OnFailedShowRankingEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedShowRankingEvent(sender, e); - }); - } - public void OnBeforeUseItemEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -676,22 +372,6 @@ namespace Milimoe.FunGame.Core.Api.Utility }); } - public void OnSucceedUseItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedUseItemEvent(sender, e); - }); - } - - public void OnFailedUseItemEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedUseItemEvent(sender, e); - }); - } - public void OnBeforeEndGameEvent(object sender, GeneralEventArgs e) { Parallel.ForEach(Plugins.Values, plugin => @@ -707,21 +387,5 @@ namespace Milimoe.FunGame.Core.Api.Utility plugin.OnAfterEndGameEvent(sender, e); }); } - - public void OnSucceedEndGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnSucceedEndGameEvent(sender, e); - }); - } - - public void OnFailedEndGameEvent(object sender, GeneralEventArgs e) - { - Parallel.ForEach(Plugins.Values, plugin => - { - plugin.OnFailedEndGameEvent(sender, e); - }); - } } } diff --git a/Interface/Event/EventHandlers.cs b/Interface/Event/EventHandlers.cs index c45d36f..06456ab 100644 --- a/Interface/Event/EventHandlers.cs +++ b/Interface/Event/EventHandlers.cs @@ -9,315 +9,215 @@ namespace Milimoe.FunGame.Core.Interface { public delegate void BeforeEventHandler(object sender, GeneralEventArgs e); public delegate void AfterEventHandler(object sender, GeneralEventArgs e); - public delegate void SucceedEventHandler(object sender, GeneralEventArgs e); - public delegate void FailedEventHandler(object sender, GeneralEventArgs e); } public interface IConnectEventHandler : IEventHandler { public new delegate void BeforeEventHandler(object sender, ConnectEventArgs e); public new delegate void AfterEventHandler(object sender, ConnectEventArgs e); - public new delegate void SucceedEventHandler(object sender, ConnectEventArgs e); - public new delegate void FailedEventHandler(object sender, ConnectEventArgs e); public event BeforeEventHandler? BeforeConnect; public event AfterEventHandler? AfterConnect; - public event SucceedEventHandler? SucceedConnect; - public event FailedEventHandler? FailedConnect; public void OnBeforeConnectEvent(object sender, ConnectEventArgs e); public void OnAfterConnectEvent(object sender, ConnectEventArgs e); - public void OnSucceedConnectEvent(object sender, ConnectEventArgs e); - public void OnFailedConnectEvent(object sender, ConnectEventArgs e); } public interface IDisconnectEventHandler : IEventHandler { public event BeforeEventHandler? BeforeDisconnect; public event AfterEventHandler? AfterDisconnect; - public event SucceedEventHandler? SucceedDisconnect; - public event FailedEventHandler? FailedDisconnect; public void OnBeforeDisconnectEvent(object sender, GeneralEventArgs e); public void OnAfterDisconnectEvent(object sender, GeneralEventArgs e); - public void OnSucceedDisconnectEvent(object sender, GeneralEventArgs e); - public void OnFailedDisconnectEvent(object sender, GeneralEventArgs e); } public interface ILoginEventHandler : IEventHandler { public new delegate void BeforeEventHandler(object sender, LoginEventArgs e); public new delegate void AfterEventHandler(object sender, LoginEventArgs e); - public new delegate void SucceedEventHandler(object sender, LoginEventArgs e); - public new delegate void FailedEventHandler(object sender, LoginEventArgs e); public event BeforeEventHandler? BeforeLogin; public event AfterEventHandler? AfterLogin; - public event SucceedEventHandler? SucceedLogin; - public event FailedEventHandler? FailedLogin; public void OnBeforeLoginEvent(object sender, LoginEventArgs e); public void OnAfterLoginEvent(object sender, LoginEventArgs e); - public void OnSucceedLoginEvent(object sender, LoginEventArgs e); - public void OnFailedLoginEvent(object sender, LoginEventArgs e); } public interface ILogoutEventHandler : IEventHandler { public event BeforeEventHandler? BeforeLogout; public event AfterEventHandler? AfterLogout; - public event SucceedEventHandler? SucceedLogout; - public event FailedEventHandler? FailedLogout; public void OnBeforeLogoutEvent(object sender, GeneralEventArgs e); public void OnAfterLogoutEvent(object sender, GeneralEventArgs e); - public void OnSucceedLogoutEvent(object sender, GeneralEventArgs e); - public void OnFailedLogoutEvent(object sender, GeneralEventArgs e); } public interface IRegEventHandler : IEventHandler { public new delegate void BeforeEventHandler(object sender, RegisterEventArgs e); public new delegate void AfterEventHandler(object sender, RegisterEventArgs e); - public new delegate void SucceedEventHandler(object sender, RegisterEventArgs e); - public new delegate void FailedEventHandler(object sender, RegisterEventArgs e); public event BeforeEventHandler? BeforeReg; public event AfterEventHandler? AfterReg; - public event SucceedEventHandler? SucceedReg; - public event FailedEventHandler? FailedReg; public void OnBeforeRegEvent(object sender, RegisterEventArgs e); public void OnAfterRegEvent(object sender, RegisterEventArgs e); - public void OnSucceedRegEvent(object sender, RegisterEventArgs e); - public void OnFailedRegEvent(object sender, RegisterEventArgs e); } public interface IIntoRoomEventHandler : IEventHandler { public new delegate void BeforeEventHandler(object sender, RoomEventArgs e); public new delegate void AfterEventHandler(object sender, RoomEventArgs e); - public new delegate void SucceedEventHandler(object sender, RoomEventArgs e); - public new delegate void FailedEventHandler(object sender, RoomEventArgs e); public event BeforeEventHandler? BeforeIntoRoom; public event AfterEventHandler? AfterIntoRoom; - public event SucceedEventHandler? SucceedIntoRoom; - public event FailedEventHandler? FailedIntoRoom; public void OnBeforeIntoRoomEvent(object sender, RoomEventArgs e); public void OnAfterIntoRoomEvent(object sender, RoomEventArgs e); - public void OnSucceedIntoRoomEvent(object sender, RoomEventArgs e); - public void OnFailedIntoRoomEvent(object sender, RoomEventArgs e); } public interface ISendTalkEventHandler : IEventHandler { public new delegate void BeforeEventHandler(object sender, SendTalkEventArgs e); public new delegate void AfterEventHandler(object sender, SendTalkEventArgs e); - public new delegate void SucceedEventHandler(object sender, SendTalkEventArgs e); - public new delegate void FailedEventHandler(object sender, SendTalkEventArgs e); public event BeforeEventHandler? BeforeSendTalk; public event AfterEventHandler? AfterSendTalk; - public event SucceedEventHandler? SucceedSendTalk; - public event FailedEventHandler? FailedSendTalk; public void OnBeforeSendTalkEvent(object sender, SendTalkEventArgs e); public void OnAfterSendTalkEvent(object sender, SendTalkEventArgs e); - public void OnSucceedSendTalkEvent(object sender, SendTalkEventArgs e); - public void OnFailedSendTalkEvent(object sender, SendTalkEventArgs e); } public interface ICreateRoomEventHandler : IEventHandler { public new delegate void BeforeEventHandler(object sender, RoomEventArgs e); public new delegate void AfterEventHandler(object sender, RoomEventArgs e); - public new delegate void SucceedEventHandler(object sender, RoomEventArgs e); - public new delegate void FailedEventHandler(object sender, RoomEventArgs e); public event BeforeEventHandler? BeforeCreateRoom; public event AfterEventHandler? AfterCreateRoom; - public event SucceedEventHandler? SucceedCreateRoom; - public event FailedEventHandler? FailedCreateRoom; public void OnBeforeCreateRoomEvent(object sender, RoomEventArgs e); public void OnAfterCreateRoomEvent(object sender, RoomEventArgs e); - public void OnSucceedCreateRoomEvent(object sender, RoomEventArgs e); - public void OnFailedCreateRoomEvent(object sender, RoomEventArgs e); } public interface IQuitRoomEventHandler : IEventHandler { public new delegate void BeforeEventHandler(object sender, RoomEventArgs e); public new delegate void AfterEventHandler(object sender, RoomEventArgs e); - public new delegate void SucceedEventHandler(object sender, RoomEventArgs e); - public new delegate void FailedEventHandler(object sender, RoomEventArgs e); public event BeforeEventHandler? BeforeQuitRoom; public event AfterEventHandler? AfterQuitRoom; - public event SucceedEventHandler? SucceedQuitRoom; - public event FailedEventHandler? FailedQuitRoom; public void OnBeforeQuitRoomEvent(object sender, RoomEventArgs e); public void OnAfterQuitRoomEvent(object sender, RoomEventArgs e); - public void OnSucceedQuitRoomEvent(object sender, RoomEventArgs e); - public void OnFailedQuitRoomEvent(object sender, RoomEventArgs e); } public interface IChangeRoomSettingEventHandler : IEventHandler { public event BeforeEventHandler? BeforeChangeRoomSetting; public event AfterEventHandler? AfterChangeRoomSetting; - public event SucceedEventHandler? SucceedChangeRoomSetting; - public event FailedEventHandler? FailedChangeRoomSetting; public void OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e); public void OnAfterChangeRoomSettingEvent(object sender, GeneralEventArgs e); - public void OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e); - public void OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e); } public interface IStartMatchEventHandler : IEventHandler { public event BeforeEventHandler? BeforeStartMatch; public event AfterEventHandler? AfterStartMatch; - public event SucceedEventHandler? SucceedStartMatch; - public event FailedEventHandler? FailedStartMatch; public void OnBeforeStartMatchEvent(object sender, GeneralEventArgs e); public void OnAfterStartMatchEvent(object sender, GeneralEventArgs e); - public void OnSucceedStartMatchEvent(object sender, GeneralEventArgs e); - public void OnFailedStartMatchEvent(object sender, GeneralEventArgs e); } public interface IStartGameEventHandler : IEventHandler { public event BeforeEventHandler? BeforeStartGame; public event AfterEventHandler? AfterStartGame; - public event SucceedEventHandler? SucceedStartGame; - public event FailedEventHandler? FailedStartGame; public void OnBeforeStartGameEvent(object sender, GeneralEventArgs e); public void OnAfterStartGameEvent(object sender, GeneralEventArgs e); - public void OnSucceedStartGameEvent(object sender, GeneralEventArgs e); - public void OnFailedStartGameEvent(object sender, GeneralEventArgs e); } public interface IChangeProfileEventHandler : IEventHandler { public event BeforeEventHandler? BeforeChangeProfile; public event AfterEventHandler? AfterChangeProfile; - public event SucceedEventHandler? SucceedChangeProfile; - public event FailedEventHandler? FailedChangeProfile; public void OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e); public void OnAfterChangeProfileEvent(object sender, GeneralEventArgs e); - public void OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e); - public void OnFailedChangeProfileEvent(object sender, GeneralEventArgs e); } public interface IChangeAccountSettingEventHandler : IEventHandler { public event BeforeEventHandler? BeforeChangeAccountSetting; public event AfterEventHandler? AfterChangeAccountSetting; - public event SucceedEventHandler? SucceedChangeAccountSetting; - public event FailedEventHandler? FailedChangeAccountSetting; public void OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e); public void OnAfterChangeAccountSettingEvent(object sender, GeneralEventArgs e); - public void OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e); - public void OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e); } public interface IOpenInventoryEventHandler : IEventHandler { public event BeforeEventHandler? BeforeOpenInventory; public event AfterEventHandler? AfterOpenInventory; - public event SucceedEventHandler? SucceedOpenInventory; - public event FailedEventHandler? FailedOpenInventory; public void OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e); public void OnAfterOpenInventoryEvent(object sender, GeneralEventArgs e); - public void OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e); - public void OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e); } public interface ISignInEventHandler : IEventHandler { public event BeforeEventHandler? BeforeSignIn; public event AfterEventHandler? AfterSignIn; - public event SucceedEventHandler? SucceedSignIn; - public event FailedEventHandler? FailedSignIn; public void OnBeforeSignInEvent(object sender, GeneralEventArgs e); public void OnAfterSignInEvent(object sender, GeneralEventArgs e); - public void OnSucceedSignInEvent(object sender, GeneralEventArgs e); - public void OnFailedSignInEvent(object sender, GeneralEventArgs e); } public interface IOpenStoreEventHandler : IEventHandler { public event BeforeEventHandler? BeforeOpenStore; public event AfterEventHandler? AfterOpenStore; - public event SucceedEventHandler? SucceedOpenStore; - public event FailedEventHandler? FailedOpenStore; public void OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e); public void OnAfterOpenStoreEvent(object sender, GeneralEventArgs e); - public void OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e); - public void OnFailedOpenStoreEvent(object sender, GeneralEventArgs e); } public interface IBuyItemEventHandler : IEventHandler { public event BeforeEventHandler? BeforeBuyItem; public event AfterEventHandler? AfterBuyItem; - public event SucceedEventHandler? SucceedBuyItem; - public event FailedEventHandler? FailedBuyItem; public void OnBeforeBuyItemEvent(object sender, GeneralEventArgs e); public void OnAfterBuyItemEvent(object sender, GeneralEventArgs e); - public void OnSucceedBuyItemEvent(object sender, GeneralEventArgs e); - public void OnFailedBuyItemEvent(object sender, GeneralEventArgs e); } public interface IShowRankingEventHandler : IEventHandler { public event BeforeEventHandler? BeforeShowRanking; public event AfterEventHandler? AfterShowRanking; - public event SucceedEventHandler? SucceedShowRanking; - public event FailedEventHandler? FailedShowRanking; public void OnBeforeShowRankingEvent(object sender, GeneralEventArgs e); public void OnAfterShowRankingEvent(object sender, GeneralEventArgs e); - public void OnSucceedShowRankingEvent(object sender, GeneralEventArgs e); - public void OnFailedShowRankingEvent(object sender, GeneralEventArgs e); } public interface IUseItemEventHandler : IEventHandler { public event BeforeEventHandler? BeforeUseItem; public event AfterEventHandler? AfterUseItem; - public event SucceedEventHandler? SucceedUseItem; - public event FailedEventHandler? FailedUseItem; public void OnBeforeUseItemEvent(object sender, GeneralEventArgs e); public void OnAfterUseItemEvent(object sender, GeneralEventArgs e); - public void OnSucceedUseItemEvent(object sender, GeneralEventArgs e); - public void OnFailedUseItemEvent(object sender, GeneralEventArgs e); } public interface IEndGameEventHandler : IEventHandler { public event BeforeEventHandler? BeforeEndGame; public event AfterEventHandler? AfterEndGame; - public event SucceedEventHandler? SucceedEndGame; - public event FailedEventHandler? FailedEndGame; public void OnBeforeEndGameEvent(object sender, GeneralEventArgs e); public void OnAfterEndGameEvent(object sender, GeneralEventArgs e); - public void OnSucceedEndGameEvent(object sender, GeneralEventArgs e); - public void OnFailedEndGameEvent(object sender, GeneralEventArgs e); } } diff --git a/Interface/Event/Events.cs b/Interface/Event/Events.cs index eaee217..edc589b 100644 --- a/Interface/Event/Events.cs +++ b/Interface/Event/Events.cs @@ -7,167 +7,125 @@ namespace Milimoe.FunGame.Core.Interface { public void BeforeConnectEvent(object sender, ConnectEventArgs e); public void AfterConnectEvent(object sender, ConnectEventArgs e); - public void SucceedConnectEvent(object sender, ConnectEventArgs e); - public void FailedConnectEvent(object sender, ConnectEventArgs e); } public interface IDisconnectEvent { public void BeforeDisconnectEvent(object sender, GeneralEventArgs e); public void AfterDisconnectEvent(object sender, GeneralEventArgs e); - public void SucceedDisconnectEvent(object sender, GeneralEventArgs e); - public void FailedDisconnectEvent(object sender, GeneralEventArgs e); } public interface ILoginEvent { public void BeforeLoginEvent(object sender, LoginEventArgs e); public void AfterLoginEvent(object sender, LoginEventArgs e); - public void SucceedLoginEvent(object sender, LoginEventArgs e); - public void FailedLoginEvent(object sender, LoginEventArgs e); } public interface ILogoutEvent { public void BeforeLogoutEvent(object sender, GeneralEventArgs e); public void AfterLogoutEvent(object sender, GeneralEventArgs e); - public void SucceedLogoutEvent(object sender, GeneralEventArgs e); - public void FailedLogoutEvent(object sender, GeneralEventArgs e); } public interface IRegEvent { public void BeforeRegEvent(object sender, RegisterEventArgs e); public void AfterRegEvent(object sender, RegisterEventArgs e); - public void SucceedRegEvent(object sender, RegisterEventArgs e); - public void FailedRegEvent(object sender, RegisterEventArgs e); } public interface IIntoRoomEvent { public void BeforeIntoRoomEvent(object sender, RoomEventArgs e); public void AfterIntoRoomEvent(object sender, RoomEventArgs e); - public void SucceedIntoRoomEvent(object sender, RoomEventArgs e); - public void FailedIntoRoomEvent(object sender, RoomEventArgs e); } public interface ISendTalkEvent { public void BeforeSendTalkEvent(object sender, SendTalkEventArgs e); public void AfterSendTalkEvent(object sender, SendTalkEventArgs e); - public void SucceedSendTalkEvent(object sender, SendTalkEventArgs e); - public void FailedSendTalkEvent(object sender, SendTalkEventArgs e); } public interface ICreateRoomEvent { public void BeforeCreateRoomEvent(object sender, RoomEventArgs e); public void AfterCreateRoomEvent(object sender, RoomEventArgs e); - public void SucceedCreateRoomEvent(object sender, RoomEventArgs e); - public void FailedCreateRoomEvent(object sender, RoomEventArgs e); } public interface IQuitRoomEvent { public void BeforeQuitRoomEvent(object sender, RoomEventArgs e); public void AfterQuitRoomEvent(object sender, RoomEventArgs e); - public void SucceedQuitRoomEvent(object sender, RoomEventArgs e); - public void FailedQuitRoomEvent(object sender, RoomEventArgs e); } public interface IChangeRoomSettingEvent { public void BeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e); public void AfterChangeRoomSettingEvent(object sender, GeneralEventArgs e); - public void SucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e); - public void FailedChangeRoomSettingEvent(object sender, GeneralEventArgs e); } public interface IStartMatchEvent { public void BeforeStartMatchEvent(object sender, GeneralEventArgs e); public void AfterStartMatchEvent(object sender, GeneralEventArgs e); - public void SucceedStartMatchEvent(object sender, GeneralEventArgs e); - public void FailedStartMatchEvent(object sender, GeneralEventArgs e); } public interface IStartGameEvent { public void BeforeStartGameEvent(object sender, GeneralEventArgs e); public void AfterStartGameEvent(object sender, GeneralEventArgs e); - public void SucceedStartGameEvent(object sender, GeneralEventArgs e); - public void FailedStartGameEvent(object sender, GeneralEventArgs e); } public interface IChangeProfileEvent { public void BeforeChangeProfileEvent(object sender, GeneralEventArgs e); public void AfterChangeProfileEvent(object sender, GeneralEventArgs e); - public void SucceedChangeProfileEvent(object sender, GeneralEventArgs e); - public void FailedChangeProfileEvent(object sender, GeneralEventArgs e); } public interface IChangeAccountSettingEvent { public void BeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e); public void AfterChangeAccountSettingEvent(object sender, GeneralEventArgs e); - public void SucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e); - public void FailedChangeAccountSettingEvent(object sender, GeneralEventArgs e); } public interface IOpenInventoryEvent { public void BeforeOpenInventoryEvent(object sender, GeneralEventArgs e); public void AfterOpenInventoryEvent(object sender, GeneralEventArgs e); - public void SucceedOpenInventoryEvent(object sender, GeneralEventArgs e); - public void FailedOpenInventoryEvent(object sender, GeneralEventArgs e); } public interface ISignInEvent { public void BeforeSignInEvent(object sender, GeneralEventArgs e); public void AfterSignInEvent(object sender, GeneralEventArgs e); - public void SucceedSignInEvent(object sender, GeneralEventArgs e); - public void FailedSignInEvent(object sender, GeneralEventArgs e); } public interface IOpenStoreEvent { public void BeforeOpenStoreEvent(object sender, GeneralEventArgs e); public void AfterOpenStoreEvent(object sender, GeneralEventArgs e); - public void SucceedOpenStoreEvent(object sender, GeneralEventArgs e); - public void FailedOpenStoreEvent(object sender, GeneralEventArgs e); } public interface IBuyItemEvent { public void BeforeBuyItemEvent(object sender, GeneralEventArgs e); public void AfterBuyItemEvent(object sender, GeneralEventArgs e); - public void SucceedBuyItemEvent(object sender, GeneralEventArgs e); - public void FailedBuyItemEvent(object sender, GeneralEventArgs e); } public interface IShowRankingEvent { public void BeforeShowRankingEvent(object sender, GeneralEventArgs e); public void AfterShowRankingEvent(object sender, GeneralEventArgs e); - public void SucceedShowRankingEvent(object sender, GeneralEventArgs e); - public void FailedShowRankingEvent(object sender, GeneralEventArgs e); } public interface IUseItemEvent { public void BeforeUseItemEvent(object sender, GeneralEventArgs e); public void AfterUseItemEvent(object sender, GeneralEventArgs e); - public void SucceedUseItemEvent(object sender, GeneralEventArgs e); - public void FailedUseItemEvent(object sender, GeneralEventArgs e); } public interface IEndGameEvent { public void BeforeEndGameEvent(object sender, GeneralEventArgs e); public void AfterEndGameEvent(object sender, GeneralEventArgs e); - public void SucceedEndGameEvent(object sender, GeneralEventArgs e); - public void FailedEndGameEvent(object sender, GeneralEventArgs e); } } diff --git a/Library/Common/Addon/Example/ExamplePlugin.cs b/Library/Common/Addon/Example/ExamplePlugin.cs index 5b43418..7a7985c 100644 --- a/Library/Common/Addon/Example/ExamplePlugin.cs +++ b/Library/Common/Addon/Example/ExamplePlugin.cs @@ -27,15 +27,5 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon.Example // 如果这里设置Cancel = true，将终止登录 e.Cancel = true; } - - public void FailedLoginEvent(object sender, LoginEventArgs e) - { - - } - - public void SucceedLoginEvent(object sender, LoginEventArgs e) - { - - } } } diff --git a/Library/Common/Addon/Plugin.cs b/Library/Common/Addon/Plugin.cs index f958681..08240f3 100644 --- a/Library/Common/Addon/Plugin.cs +++ b/Library/Common/Addon/Plugin.cs @@ -125,8 +125,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IConnectEvent bind = (IConnectEvent)this; BeforeConnect += bind.BeforeConnectEvent; AfterConnect += bind.AfterConnectEvent; - SucceedConnect += bind.SucceedConnectEvent; - FailedConnect += bind.FailedConnectEvent; } if (this is IDisconnectEvent) @@ -134,8 +132,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IDisconnectEvent bind = (IDisconnectEvent)this; BeforeDisconnect += bind.BeforeDisconnectEvent; AfterDisconnect += bind.AfterDisconnectEvent; - SucceedDisconnect += bind.SucceedDisconnectEvent; - FailedDisconnect += bind.FailedDisconnectEvent; } if (this is ILoginEvent) @@ -143,8 +139,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ILoginEvent bind = (ILoginEvent)this; BeforeLogin += bind.BeforeLoginEvent; AfterLogin += bind.AfterLoginEvent; - SucceedLogin += bind.SucceedLoginEvent; - FailedLogin += bind.FailedLoginEvent; } if (this is ILogoutEvent) @@ -152,8 +146,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ILogoutEvent bind = (ILogoutEvent)this; BeforeLogout += bind.BeforeLogoutEvent; AfterLogout += bind.AfterLogoutEvent; - SucceedLogout += bind.SucceedLogoutEvent; - FailedLogout += bind.FailedLogoutEvent; } if (this is IRegEvent) @@ -161,8 +153,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IRegEvent bind = (IRegEvent)this; BeforeReg += bind.BeforeRegEvent; AfterReg += bind.AfterRegEvent; - SucceedReg += bind.SucceedRegEvent; - FailedReg += bind.FailedRegEvent; } if (this is IIntoRoomEvent) @@ -170,8 +160,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IIntoRoomEvent bind = (IIntoRoomEvent)this; BeforeIntoRoom += bind.BeforeIntoRoomEvent; AfterIntoRoom += bind.AfterIntoRoomEvent; - SucceedIntoRoom += bind.SucceedIntoRoomEvent; - FailedIntoRoom += bind.FailedIntoRoomEvent; } if (this is ISendTalkEvent) @@ -179,8 +167,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ISendTalkEvent bind = (ISendTalkEvent)this; BeforeSendTalk += bind.BeforeSendTalkEvent; AfterSendTalk += bind.AfterSendTalkEvent; - SucceedSendTalk += bind.SucceedSendTalkEvent; - FailedSendTalk += bind.FailedSendTalkEvent; } if (this is ICreateRoomEvent) @@ -188,8 +174,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ICreateRoomEvent bind = (ICreateRoomEvent)this; BeforeCreateRoom += bind.BeforeCreateRoomEvent; AfterCreateRoom += bind.AfterCreateRoomEvent; - SucceedCreateRoom += bind.SucceedCreateRoomEvent; - FailedCreateRoom += bind.FailedCreateRoomEvent; } if (this is IQuitRoomEvent) @@ -197,8 +181,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IQuitRoomEvent bind = (IQuitRoomEvent)this; BeforeQuitRoom += bind.BeforeQuitRoomEvent; AfterQuitRoom += bind.AfterQuitRoomEvent; - SucceedQuitRoom += bind.SucceedQuitRoomEvent; - FailedQuitRoom += bind.FailedQuitRoomEvent; } if (this is IChangeRoomSettingEvent) @@ -206,8 +188,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeRoomSettingEvent bind = (IChangeRoomSettingEvent)this; BeforeChangeRoomSetting += bind.BeforeChangeRoomSettingEvent; AfterChangeRoomSetting += bind.AfterChangeRoomSettingEvent; - SucceedChangeRoomSetting += bind.SucceedChangeRoomSettingEvent; - FailedChangeRoomSetting += bind.FailedChangeRoomSettingEvent; } if (this is IStartMatchEvent) @@ -215,8 +195,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IStartMatchEvent bind = (IStartMatchEvent)this; BeforeStartMatch += bind.BeforeStartMatchEvent; AfterStartMatch += bind.AfterStartMatchEvent; - SucceedStartMatch += bind.SucceedStartMatchEvent; - FailedStartMatch += bind.FailedStartMatchEvent; } if (this is IStartGameEvent) @@ -224,8 +202,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IStartGameEvent bind = (IStartGameEvent)this; BeforeStartGame += bind.BeforeStartGameEvent; AfterStartGame += bind.AfterStartGameEvent; - SucceedStartGame += bind.SucceedStartGameEvent; - FailedStartGame += bind.FailedStartGameEvent; } if (this is IChangeProfileEvent) @@ -233,8 +209,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeProfileEvent bind = (IChangeProfileEvent)this; BeforeChangeProfile += bind.BeforeChangeProfileEvent; AfterChangeProfile += bind.AfterChangeProfileEvent; - SucceedChangeProfile += bind.SucceedChangeProfileEvent; - FailedChangeProfile += bind.FailedChangeProfileEvent; } if (this is IChangeAccountSettingEvent) @@ -242,8 +216,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeAccountSettingEvent bind = (IChangeAccountSettingEvent)this; BeforeChangeAccountSetting += bind.BeforeChangeAccountSettingEvent; AfterChangeAccountSetting += bind.AfterChangeAccountSettingEvent; - SucceedChangeAccountSetting += bind.SucceedChangeAccountSettingEvent; - FailedChangeAccountSetting += bind.FailedChangeAccountSettingEvent; } if (this is IOpenInventoryEvent) @@ -251,8 +223,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IOpenInventoryEvent bind = (IOpenInventoryEvent)this; BeforeOpenInventory += bind.BeforeOpenInventoryEvent; AfterOpenInventory += bind.AfterOpenInventoryEvent; - SucceedOpenInventory += bind.SucceedOpenInventoryEvent; - FailedOpenInventory += bind.FailedOpenInventoryEvent; } if (this is ISignInEvent) @@ -260,8 +230,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ISignInEvent bind = (ISignInEvent)this; BeforeSignIn += bind.BeforeSignInEvent; AfterSignIn += bind.AfterSignInEvent; - SucceedSignIn += bind.SucceedSignInEvent; - FailedSignIn += bind.FailedSignInEvent; } if (this is IOpenStoreEvent) @@ -269,8 +237,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IOpenStoreEvent bind = (IOpenStoreEvent)this; BeforeOpenStore += bind.BeforeOpenStoreEvent; AfterOpenStore += bind.AfterOpenStoreEvent; - SucceedOpenStore += bind.SucceedOpenStoreEvent; - FailedOpenStore += bind.FailedOpenStoreEvent; } if (this is IBuyItemEvent) @@ -278,8 +244,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IBuyItemEvent bind = (IBuyItemEvent)this; BeforeBuyItem += bind.BeforeBuyItemEvent; AfterBuyItem += bind.AfterBuyItemEvent; - SucceedBuyItem += bind.SucceedBuyItemEvent; - FailedBuyItem += bind.FailedBuyItemEvent; } if (this is IShowRankingEvent) @@ -287,8 +251,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IShowRankingEvent bind = (IShowRankingEvent)this; BeforeShowRanking += bind.BeforeShowRankingEvent; AfterShowRanking += bind.AfterShowRankingEvent; - SucceedShowRanking += bind.SucceedShowRankingEvent; - FailedShowRanking += bind.FailedShowRankingEvent; } if (this is IUseItemEvent) @@ -296,8 +258,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IUseItemEvent bind = (IUseItemEvent)this; BeforeUseItem += bind.BeforeUseItemEvent; AfterUseItem += bind.AfterUseItemEvent; - SucceedUseItem += bind.SucceedUseItemEvent; - FailedUseItem += bind.FailedUseItemEvent; } if (this is IEndGameEvent) @@ -305,95 +265,51 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IEndGameEvent bind = (IEndGameEvent)this; BeforeEndGame += bind.BeforeEndGameEvent; AfterEndGame += bind.AfterEndGameEvent; - SucceedEndGame += bind.SucceedEndGameEvent; - FailedEndGame += bind.FailedEndGameEvent; } } public event IConnectEventHandler.BeforeEventHandler? BeforeConnect; public event IConnectEventHandler.AfterEventHandler? AfterConnect; - public event IConnectEventHandler.SucceedEventHandler? SucceedConnect; - public event IConnectEventHandler.FailedEventHandler? FailedConnect; public event IEventHandler.BeforeEventHandler? BeforeDisconnect; public event IEventHandler.AfterEventHandler? AfterDisconnect; - public event IEventHandler.SucceedEventHandler? SucceedDisconnect; - public event IEventHandler.FailedEventHandler? FailedDisconnect; public event ILoginEventHandler.BeforeEventHandler? BeforeLogin; public event ILoginEventHandler.AfterEventHandler? AfterLogin; - public event ILoginEventHandler.SucceedEventHandler? SucceedLogin; - public event ILoginEventHandler.FailedEventHandler? FailedLogin; public event IEventHandler.BeforeEventHandler? BeforeLogout; public event IEventHandler.AfterEventHandler? AfterLogout; - public event IEventHandler.SucceedEventHandler? SucceedLogout; - public event IEventHandler.FailedEventHandler? FailedLogout; public event IRegEventHandler.BeforeEventHandler? BeforeReg; public event IRegEventHandler.AfterEventHandler? AfterReg; - public event IRegEventHandler.SucceedEventHandler? SucceedReg; - public event IRegEventHandler.FailedEventHandler? FailedReg; public event IIntoRoomEventHandler.BeforeEventHandler? BeforeIntoRoom; public event IIntoRoomEventHandler.AfterEventHandler? AfterIntoRoom; - public event IIntoRoomEventHandler.SucceedEventHandler? SucceedIntoRoom; - public event IIntoRoomEventHandler.FailedEventHandler? FailedIntoRoom; public event ISendTalkEventHandler.BeforeEventHandler? BeforeSendTalk; public event ISendTalkEventHandler.AfterEventHandler? AfterSendTalk; - public event ISendTalkEventHandler.SucceedEventHandler? SucceedSendTalk; - public event ISendTalkEventHandler.FailedEventHandler? FailedSendTalk; public event ICreateRoomEventHandler.BeforeEventHandler? BeforeCreateRoom; public event ICreateRoomEventHandler.AfterEventHandler? AfterCreateRoom; - public event ICreateRoomEventHandler.SucceedEventHandler? SucceedCreateRoom; - public event ICreateRoomEventHandler.FailedEventHandler? FailedCreateRoom; public event IQuitRoomEventHandler.BeforeEventHandler? BeforeQuitRoom; public event IQuitRoomEventHandler.AfterEventHandler? AfterQuitRoom; - public event IQuitRoomEventHandler.SucceedEventHandler? SucceedQuitRoom; - public event IQuitRoomEventHandler.FailedEventHandler? FailedQuitRoom; public event IEventHandler.BeforeEventHandler? BeforeChangeRoomSetting; public event IEventHandler.AfterEventHandler? AfterChangeRoomSetting; - public event IEventHandler.SucceedEventHandler? SucceedChangeRoomSetting; - public event IEventHandler.FailedEventHandler? FailedChangeRoomSetting; public event IEventHandler.BeforeEventHandler? BeforeStartMatch; public event IEventHandler.AfterEventHandler? AfterStartMatch; - public event IEventHandler.SucceedEventHandler? SucceedStartMatch; - public event IEventHandler.FailedEventHandler? FailedStartMatch; public event IEventHandler.BeforeEventHandler? BeforeStartGame; public event IEventHandler.AfterEventHandler? AfterStartGame; - public event IEventHandler.SucceedEventHandler? SucceedStartGame; - public event IEventHandler.FailedEventHandler? FailedStartGame; public event IEventHandler.BeforeEventHandler? BeforeChangeProfile; public event IEventHandler.AfterEventHandler? AfterChangeProfile; - public event IEventHandler.SucceedEventHandler? SucceedChangeProfile; - public event IEventHandler.FailedEventHandler? FailedChangeProfile; public event IEventHandler.BeforeEventHandler? BeforeChangeAccountSetting; public event IEventHandler.AfterEventHandler? AfterChangeAccountSetting; - public event IEventHandler.SucceedEventHandler? SucceedChangeAccountSetting; - public event IEventHandler.FailedEventHandler? FailedChangeAccountSetting; public event IEventHandler.BeforeEventHandler? BeforeOpenInventory; public event IEventHandler.AfterEventHandler? AfterOpenInventory; - public event IEventHandler.SucceedEventHandler? SucceedOpenInventory; - public event IEventHandler.FailedEventHandler? FailedOpenInventory; public event IEventHandler.BeforeEventHandler? BeforeSignIn; public event IEventHandler.AfterEventHandler? AfterSignIn; - public event IEventHandler.SucceedEventHandler? SucceedSignIn; - public event IEventHandler.FailedEventHandler? FailedSignIn; public event IEventHandler.BeforeEventHandler? BeforeOpenStore; public event IEventHandler.AfterEventHandler? AfterOpenStore; - public event IEventHandler.SucceedEventHandler? SucceedOpenStore; - public event IEventHandler.FailedEventHandler? FailedOpenStore; public event IEventHandler.BeforeEventHandler? BeforeBuyItem; public event IEventHandler.AfterEventHandler? AfterBuyItem; - public event IEventHandler.SucceedEventHandler? SucceedBuyItem; - public event IEventHandler.FailedEventHandler? FailedBuyItem; public event IEventHandler.BeforeEventHandler? BeforeShowRanking; public event IEventHandler.AfterEventHandler? AfterShowRanking; - public event IEventHandler.SucceedEventHandler? SucceedShowRanking; - public event IEventHandler.FailedEventHandler? FailedShowRanking; public event IEventHandler.BeforeEventHandler? BeforeUseItem; public event IEventHandler.AfterEventHandler? AfterUseItem; - public event IEventHandler.SucceedEventHandler? SucceedUseItem; - public event IEventHandler.FailedEventHandler? FailedUseItem; public event IEventHandler.BeforeEventHandler? BeforeEndGame; public event IEventHandler.AfterEventHandler? AfterEndGame; - public event IEventHandler.SucceedEventHandler? SucceedEndGame; - public event IEventHandler.FailedEventHandler? FailedEndGame; public void OnBeforeConnectEvent(object sender, ConnectEventArgs e) { @@ -405,16 +321,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterConnect?.Invoke(sender, e); } - public void OnSucceedConnectEvent(object sender, ConnectEventArgs e) - { - SucceedConnect?.Invoke(sender, e); - } - - public void OnFailedConnectEvent(object sender, ConnectEventArgs e) - { - FailedConnect?.Invoke(sender, e); - } - public void OnBeforeDisconnectEvent(object sender, GeneralEventArgs e) { BeforeDisconnect?.Invoke(sender, e); @@ -425,16 +331,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterDisconnect?.Invoke(sender, e); } - public void OnSucceedDisconnectEvent(object sender, GeneralEventArgs e) - { - SucceedDisconnect?.Invoke(sender, e); - } - - public void OnFailedDisconnectEvent(object sender, GeneralEventArgs e) - { - FailedDisconnect?.Invoke(sender, e); - } - public void OnBeforeLoginEvent(object sender, LoginEventArgs e) { BeforeLogin?.Invoke(sender, e); @@ -445,16 +341,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterLogin?.Invoke(sender, e); } - public void OnSucceedLoginEvent(object sender, LoginEventArgs e) - { - SucceedLogin?.Invoke(sender, e); - } - - public void OnFailedLoginEvent(object sender, LoginEventArgs e) - { - FailedLogin?.Invoke(sender, e); - } - public void OnBeforeLogoutEvent(object sender, GeneralEventArgs e) { BeforeLogout?.Invoke(sender, e); @@ -465,16 +351,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterLogout?.Invoke(sender, e); } - public void OnSucceedLogoutEvent(object sender, GeneralEventArgs e) - { - SucceedLogout?.Invoke(sender, e); - } - - public void OnFailedLogoutEvent(object sender, GeneralEventArgs e) - { - FailedLogout?.Invoke(sender, e); - } - public void OnBeforeRegEvent(object sender, RegisterEventArgs e) { BeforeReg?.Invoke(sender, e); @@ -485,16 +361,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterReg?.Invoke(sender, e); } - public void OnSucceedRegEvent(object sender, RegisterEventArgs e) - { - SucceedReg?.Invoke(sender, e); - } - - public void OnFailedRegEvent(object sender, RegisterEventArgs e) - { - FailedReg?.Invoke(sender, e); - } - public void OnBeforeIntoRoomEvent(object sender, RoomEventArgs e) { BeforeIntoRoom?.Invoke(sender, e); @@ -505,16 +371,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterIntoRoom?.Invoke(sender, e); } - public void OnSucceedIntoRoomEvent(object sender, RoomEventArgs e) - { - SucceedIntoRoom?.Invoke(sender, e); - } - - public void OnFailedIntoRoomEvent(object sender, RoomEventArgs e) - { - FailedIntoRoom?.Invoke(sender, e); - } - public void OnBeforeSendTalkEvent(object sender, SendTalkEventArgs e) { BeforeSendTalk?.Invoke(sender, e); @@ -525,16 +381,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterSendTalk?.Invoke(sender, e); } - public void OnSucceedSendTalkEvent(object sender, SendTalkEventArgs e) - { - SucceedSendTalk?.Invoke(sender, e); - } - - public void OnFailedSendTalkEvent(object sender, SendTalkEventArgs e) - { - FailedSendTalk?.Invoke(sender, e); - } - public void OnBeforeCreateRoomEvent(object sender, RoomEventArgs e) { BeforeCreateRoom?.Invoke(sender, e); @@ -545,16 +391,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterCreateRoom?.Invoke(sender, e); } - public void OnSucceedCreateRoomEvent(object sender, RoomEventArgs e) - { - SucceedCreateRoom?.Invoke(sender, e); - } - - public void OnFailedCreateRoomEvent(object sender, RoomEventArgs e) - { - FailedCreateRoom?.Invoke(sender, e); - } - public void OnBeforeQuitRoomEvent(object sender, RoomEventArgs e) { BeforeQuitRoom?.Invoke(sender, e); @@ -565,16 +401,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterQuitRoom?.Invoke(sender, e); } - public void OnSucceedQuitRoomEvent(object sender, RoomEventArgs e) - { - SucceedQuitRoom?.Invoke(sender, e); - } - - public void OnFailedQuitRoomEvent(object sender, RoomEventArgs e) - { - FailedQuitRoom?.Invoke(sender, e); - } - public void OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e) { BeforeChangeRoomSetting?.Invoke(sender, e); @@ -585,16 +411,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeRoomSetting?.Invoke(sender, e); } - public void OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - SucceedChangeRoomSetting?.Invoke(sender, e); - } - - public void OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - FailedChangeRoomSetting?.Invoke(sender, e); - } - public void OnBeforeStartMatchEvent(object sender, GeneralEventArgs e) { BeforeStartMatch?.Invoke(sender, e); @@ -605,16 +421,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterStartMatch?.Invoke(sender, e); } - public void OnSucceedStartMatchEvent(object sender, GeneralEventArgs e) - { - SucceedStartMatch?.Invoke(sender, e); - } - - public void OnFailedStartMatchEvent(object sender, GeneralEventArgs e) - { - FailedStartMatch?.Invoke(sender, e); - } - public void OnBeforeStartGameEvent(object sender, GeneralEventArgs e) { BeforeStartGame?.Invoke(sender, e); @@ -625,16 +431,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterStartGame?.Invoke(sender, e); } - public void OnSucceedStartGameEvent(object sender, GeneralEventArgs e) - { - SucceedStartGame?.Invoke(sender, e); - } - - public void OnFailedStartGameEvent(object sender, GeneralEventArgs e) - { - FailedStartGame?.Invoke(sender, e); - } - public void OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e) { BeforeChangeProfile?.Invoke(sender, e); @@ -645,16 +441,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeProfile?.Invoke(sender, e); } - public void OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e) - { - SucceedChangeProfile?.Invoke(sender, e); - } - - public void OnFailedChangeProfileEvent(object sender, GeneralEventArgs e) - { - FailedChangeProfile?.Invoke(sender, e); - } - public void OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e) { BeforeChangeAccountSetting?.Invoke(sender, e); @@ -665,16 +451,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeAccountSetting?.Invoke(sender, e); } - public void OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - SucceedChangeAccountSetting?.Invoke(sender, e); - } - - public void OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - FailedChangeAccountSetting?.Invoke(sender, e); - } - public void OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e) { BeforeOpenInventory?.Invoke(sender, e); @@ -685,16 +461,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterOpenInventory?.Invoke(sender, e); } - public void OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - SucceedOpenInventory?.Invoke(sender, e); - } - - public void OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - FailedOpenInventory?.Invoke(sender, e); - } - public void OnBeforeSignInEvent(object sender, GeneralEventArgs e) { BeforeSignIn?.Invoke(sender, e); @@ -705,16 +471,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterSignIn?.Invoke(sender, e); } - public void OnSucceedSignInEvent(object sender, GeneralEventArgs e) - { - SucceedSignIn?.Invoke(sender, e); - } - - public void OnFailedSignInEvent(object sender, GeneralEventArgs e) - { - FailedSignIn?.Invoke(sender, e); - } - public void OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e) { BeforeOpenStore?.Invoke(sender, e); @@ -725,16 +481,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterOpenStore?.Invoke(sender, e); } - public void OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e) - { - SucceedOpenStore?.Invoke(sender, e); - } - - public void OnFailedOpenStoreEvent(object sender, GeneralEventArgs e) - { - FailedOpenStore?.Invoke(sender, e); - } - public void OnBeforeBuyItemEvent(object sender, GeneralEventArgs e) { BeforeBuyItem?.Invoke(sender, e); @@ -745,16 +491,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterBuyItem?.Invoke(sender, e); } - public void OnSucceedBuyItemEvent(object sender, GeneralEventArgs e) - { - SucceedBuyItem?.Invoke(sender, e); - } - - public void OnFailedBuyItemEvent(object sender, GeneralEventArgs e) - { - FailedBuyItem?.Invoke(sender, e); - } - public void OnBeforeShowRankingEvent(object sender, GeneralEventArgs e) { BeforeShowRanking?.Invoke(sender, e); @@ -765,16 +501,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterShowRanking?.Invoke(sender, e); } - public void OnSucceedShowRankingEvent(object sender, GeneralEventArgs e) - { - SucceedShowRanking?.Invoke(sender, e); - } - - public void OnFailedShowRankingEvent(object sender, GeneralEventArgs e) - { - FailedShowRanking?.Invoke(sender, e); - } - public void OnBeforeUseItemEvent(object sender, GeneralEventArgs e) { BeforeUseItem?.Invoke(sender, e); @@ -785,16 +511,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterUseItem?.Invoke(sender, e); } - public void OnSucceedUseItemEvent(object sender, GeneralEventArgs e) - { - SucceedUseItem?.Invoke(sender, e); - } - - public void OnFailedUseItemEvent(object sender, GeneralEventArgs e) - { - FailedUseItem?.Invoke(sender, e); - } - public void OnBeforeEndGameEvent(object sender, GeneralEventArgs e) { BeforeEndGame?.Invoke(sender, e); @@ -804,15 +520,5 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon { AfterEndGame?.Invoke(sender, e); } - - public void OnSucceedEndGameEvent(object sender, GeneralEventArgs e) - { - SucceedEndGame?.Invoke(sender, e); - } - - public void OnFailedEndGameEvent(object sender, GeneralEventArgs e) - { - FailedEndGame?.Invoke(sender, e); - } } } diff --git a/Library/Common/Addon/ServerPlugin.cs b/Library/Common/Addon/ServerPlugin.cs index 0024076..034dbb7 100644 --- a/Library/Common/Addon/ServerPlugin.cs +++ b/Library/Common/Addon/ServerPlugin.cs @@ -109,8 +109,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IConnectEvent bind = (IConnectEvent)this; BeforeConnect += bind.BeforeConnectEvent; AfterConnect += bind.AfterConnectEvent; - SucceedConnect += bind.SucceedConnectEvent; - FailedConnect += bind.FailedConnectEvent; } if (this is IDisconnectEvent) @@ -118,8 +116,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IDisconnectEvent bind = (IDisconnectEvent)this; BeforeDisconnect += bind.BeforeDisconnectEvent; AfterDisconnect += bind.AfterDisconnectEvent; - SucceedDisconnect += bind.SucceedDisconnectEvent; - FailedDisconnect += bind.FailedDisconnectEvent; } if (this is ILoginEvent) @@ -127,8 +123,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ILoginEvent bind = (ILoginEvent)this; BeforeLogin += bind.BeforeLoginEvent; AfterLogin += bind.AfterLoginEvent; - SucceedLogin += bind.SucceedLoginEvent; - FailedLogin += bind.FailedLoginEvent; } if (this is ILogoutEvent) @@ -136,8 +130,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ILogoutEvent bind = (ILogoutEvent)this; BeforeLogout += bind.BeforeLogoutEvent; AfterLogout += bind.AfterLogoutEvent; - SucceedLogout += bind.SucceedLogoutEvent; - FailedLogout += bind.FailedLogoutEvent; } if (this is IRegEvent) @@ -145,8 +137,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IRegEvent bind = (IRegEvent)this; BeforeReg += bind.BeforeRegEvent; AfterReg += bind.AfterRegEvent; - SucceedReg += bind.SucceedRegEvent; - FailedReg += bind.FailedRegEvent; } if (this is IIntoRoomEvent) @@ -154,8 +144,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IIntoRoomEvent bind = (IIntoRoomEvent)this; BeforeIntoRoom += bind.BeforeIntoRoomEvent; AfterIntoRoom += bind.AfterIntoRoomEvent; - SucceedIntoRoom += bind.SucceedIntoRoomEvent; - FailedIntoRoom += bind.FailedIntoRoomEvent; } if (this is ISendTalkEvent) @@ -163,8 +151,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ISendTalkEvent bind = (ISendTalkEvent)this; BeforeSendTalk += bind.BeforeSendTalkEvent; AfterSendTalk += bind.AfterSendTalkEvent; - SucceedSendTalk += bind.SucceedSendTalkEvent; - FailedSendTalk += bind.FailedSendTalkEvent; } if (this is ICreateRoomEvent) @@ -172,8 +158,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ICreateRoomEvent bind = (ICreateRoomEvent)this; BeforeCreateRoom += bind.BeforeCreateRoomEvent; AfterCreateRoom += bind.AfterCreateRoomEvent; - SucceedCreateRoom += bind.SucceedCreateRoomEvent; - FailedCreateRoom += bind.FailedCreateRoomEvent; } if (this is IQuitRoomEvent) @@ -181,8 +165,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IQuitRoomEvent bind = (IQuitRoomEvent)this; BeforeQuitRoom += bind.BeforeQuitRoomEvent; AfterQuitRoom += bind.AfterQuitRoomEvent; - SucceedQuitRoom += bind.SucceedQuitRoomEvent; - FailedQuitRoom += bind.FailedQuitRoomEvent; } if (this is IChangeRoomSettingEvent) @@ -190,8 +172,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeRoomSettingEvent bind = (IChangeRoomSettingEvent)this; BeforeChangeRoomSetting += bind.BeforeChangeRoomSettingEvent; AfterChangeRoomSetting += bind.AfterChangeRoomSettingEvent; - SucceedChangeRoomSetting += bind.SucceedChangeRoomSettingEvent; - FailedChangeRoomSetting += bind.FailedChangeRoomSettingEvent; } if (this is IStartMatchEvent) @@ -199,8 +179,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IStartMatchEvent bind = (IStartMatchEvent)this; BeforeStartMatch += bind.BeforeStartMatchEvent; AfterStartMatch += bind.AfterStartMatchEvent; - SucceedStartMatch += bind.SucceedStartMatchEvent; - FailedStartMatch += bind.FailedStartMatchEvent; } if (this is IStartGameEvent) @@ -208,8 +186,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IStartGameEvent bind = (IStartGameEvent)this; BeforeStartGame += bind.BeforeStartGameEvent; AfterStartGame += bind.AfterStartGameEvent; - SucceedStartGame += bind.SucceedStartGameEvent; - FailedStartGame += bind.FailedStartGameEvent; } if (this is IChangeProfileEvent) @@ -217,8 +193,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeProfileEvent bind = (IChangeProfileEvent)this; BeforeChangeProfile += bind.BeforeChangeProfileEvent; AfterChangeProfile += bind.AfterChangeProfileEvent; - SucceedChangeProfile += bind.SucceedChangeProfileEvent; - FailedChangeProfile += bind.FailedChangeProfileEvent; } if (this is IChangeAccountSettingEvent) @@ -226,8 +200,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeAccountSettingEvent bind = (IChangeAccountSettingEvent)this; BeforeChangeAccountSetting += bind.BeforeChangeAccountSettingEvent; AfterChangeAccountSetting += bind.AfterChangeAccountSettingEvent; - SucceedChangeAccountSetting += bind.SucceedChangeAccountSettingEvent; - FailedChangeAccountSetting += bind.FailedChangeAccountSettingEvent; } if (this is IOpenInventoryEvent) @@ -235,8 +207,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IOpenInventoryEvent bind = (IOpenInventoryEvent)this; BeforeOpenInventory += bind.BeforeOpenInventoryEvent; AfterOpenInventory += bind.AfterOpenInventoryEvent; - SucceedOpenInventory += bind.SucceedOpenInventoryEvent; - FailedOpenInventory += bind.FailedOpenInventoryEvent; } if (this is ISignInEvent) @@ -244,8 +214,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ISignInEvent bind = (ISignInEvent)this; BeforeSignIn += bind.BeforeSignInEvent; AfterSignIn += bind.AfterSignInEvent; - SucceedSignIn += bind.SucceedSignInEvent; - FailedSignIn += bind.FailedSignInEvent; } if (this is IOpenStoreEvent) @@ -253,8 +221,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IOpenStoreEvent bind = (IOpenStoreEvent)this; BeforeOpenStore += bind.BeforeOpenStoreEvent; AfterOpenStore += bind.AfterOpenStoreEvent; - SucceedOpenStore += bind.SucceedOpenStoreEvent; - FailedOpenStore += bind.FailedOpenStoreEvent; } if (this is IBuyItemEvent) @@ -262,8 +228,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IBuyItemEvent bind = (IBuyItemEvent)this; BeforeBuyItem += bind.BeforeBuyItemEvent; AfterBuyItem += bind.AfterBuyItemEvent; - SucceedBuyItem += bind.SucceedBuyItemEvent; - FailedBuyItem += bind.FailedBuyItemEvent; } if (this is IShowRankingEvent) @@ -271,8 +235,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IShowRankingEvent bind = (IShowRankingEvent)this; BeforeShowRanking += bind.BeforeShowRankingEvent; AfterShowRanking += bind.AfterShowRankingEvent; - SucceedShowRanking += bind.SucceedShowRankingEvent; - FailedShowRanking += bind.FailedShowRankingEvent; } if (this is IUseItemEvent) @@ -280,8 +242,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IUseItemEvent bind = (IUseItemEvent)this; BeforeUseItem += bind.BeforeUseItemEvent; AfterUseItem += bind.AfterUseItemEvent; - SucceedUseItem += bind.SucceedUseItemEvent; - FailedUseItem += bind.FailedUseItemEvent; } if (this is IEndGameEvent) @@ -289,95 +249,51 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IEndGameEvent bind = (IEndGameEvent)this; BeforeEndGame += bind.BeforeEndGameEvent; AfterEndGame += bind.AfterEndGameEvent; - SucceedEndGame += bind.SucceedEndGameEvent; - FailedEndGame += bind.FailedEndGameEvent; } } public event IConnectEventHandler.BeforeEventHandler? BeforeConnect; public event IConnectEventHandler.AfterEventHandler? AfterConnect; - public event IConnectEventHandler.SucceedEventHandler? SucceedConnect; - public event IConnectEventHandler.FailedEventHandler? FailedConnect; public event IEventHandler.BeforeEventHandler? BeforeDisconnect; public event IEventHandler.AfterEventHandler? AfterDisconnect; - public event IEventHandler.SucceedEventHandler? SucceedDisconnect; - public event IEventHandler.FailedEventHandler? FailedDisconnect; public event ILoginEventHandler.BeforeEventHandler? BeforeLogin; public event ILoginEventHandler.AfterEventHandler? AfterLogin; - public event ILoginEventHandler.SucceedEventHandler? SucceedLogin; - public event ILoginEventHandler.FailedEventHandler? FailedLogin; public event IEventHandler.BeforeEventHandler? BeforeLogout; public event IEventHandler.AfterEventHandler? AfterLogout; - public event IEventHandler.SucceedEventHandler? SucceedLogout; - public event IEventHandler.FailedEventHandler? FailedLogout; public event IRegEventHandler.BeforeEventHandler? BeforeReg; public event IRegEventHandler.AfterEventHandler? AfterReg; - public event IRegEventHandler.SucceedEventHandler? SucceedReg; - public event IRegEventHandler.FailedEventHandler? FailedReg; public event IIntoRoomEventHandler.BeforeEventHandler? BeforeIntoRoom; public event IIntoRoomEventHandler.AfterEventHandler? AfterIntoRoom; - public event IIntoRoomEventHandler.SucceedEventHandler? SucceedIntoRoom; - public event IIntoRoomEventHandler.FailedEventHandler? FailedIntoRoom; public event ISendTalkEventHandler.BeforeEventHandler? BeforeSendTalk; public event ISendTalkEventHandler.AfterEventHandler? AfterSendTalk; - public event ISendTalkEventHandler.SucceedEventHandler? SucceedSendTalk; - public event ISendTalkEventHandler.FailedEventHandler? FailedSendTalk; public event ICreateRoomEventHandler.BeforeEventHandler? BeforeCreateRoom; public event ICreateRoomEventHandler.AfterEventHandler? AfterCreateRoom; - public event ICreateRoomEventHandler.SucceedEventHandler? SucceedCreateRoom; - public event ICreateRoomEventHandler.FailedEventHandler? FailedCreateRoom; public event IQuitRoomEventHandler.BeforeEventHandler? BeforeQuitRoom; public event IQuitRoomEventHandler.AfterEventHandler? AfterQuitRoom; - public event IQuitRoomEventHandler.SucceedEventHandler? SucceedQuitRoom; - public event IQuitRoomEventHandler.FailedEventHandler? FailedQuitRoom; public event IEventHandler.BeforeEventHandler? BeforeChangeRoomSetting; public event IEventHandler.AfterEventHandler? AfterChangeRoomSetting; - public event IEventHandler.SucceedEventHandler? SucceedChangeRoomSetting; - public event IEventHandler.FailedEventHandler? FailedChangeRoomSetting; public event IEventHandler.BeforeEventHandler? BeforeStartMatch; public event IEventHandler.AfterEventHandler? AfterStartMatch; - public event IEventHandler.SucceedEventHandler? SucceedStartMatch; - public event IEventHandler.FailedEventHandler? FailedStartMatch; public event IEventHandler.BeforeEventHandler? BeforeStartGame; public event IEventHandler.AfterEventHandler? AfterStartGame; - public event IEventHandler.SucceedEventHandler? SucceedStartGame; - public event IEventHandler.FailedEventHandler? FailedStartGame; public event IEventHandler.BeforeEventHandler? BeforeChangeProfile; public event IEventHandler.AfterEventHandler? AfterChangeProfile; - public event IEventHandler.SucceedEventHandler? SucceedChangeProfile; - public event IEventHandler.FailedEventHandler? FailedChangeProfile; public event IEventHandler.BeforeEventHandler? BeforeChangeAccountSetting; public event IEventHandler.AfterEventHandler? AfterChangeAccountSetting; - public event IEventHandler.SucceedEventHandler? SucceedChangeAccountSetting; - public event IEventHandler.FailedEventHandler? FailedChangeAccountSetting; public event IEventHandler.BeforeEventHandler? BeforeOpenInventory; public event IEventHandler.AfterEventHandler? AfterOpenInventory; - public event IEventHandler.SucceedEventHandler? SucceedOpenInventory; - public event IEventHandler.FailedEventHandler? FailedOpenInventory; public event IEventHandler.BeforeEventHandler? BeforeSignIn; public event IEventHandler.AfterEventHandler? AfterSignIn; - public event IEventHandler.SucceedEventHandler? SucceedSignIn; - public event IEventHandler.FailedEventHandler? FailedSignIn; public event IEventHandler.BeforeEventHandler? BeforeOpenStore; public event IEventHandler.AfterEventHandler? AfterOpenStore; - public event IEventHandler.SucceedEventHandler? SucceedOpenStore; - public event IEventHandler.FailedEventHandler? FailedOpenStore; public event IEventHandler.BeforeEventHandler? BeforeBuyItem; public event IEventHandler.AfterEventHandler? AfterBuyItem; - public event IEventHandler.SucceedEventHandler? SucceedBuyItem; - public event IEventHandler.FailedEventHandler? FailedBuyItem; public event IEventHandler.BeforeEventHandler? BeforeShowRanking; public event IEventHandler.AfterEventHandler? AfterShowRanking; - public event IEventHandler.SucceedEventHandler? SucceedShowRanking; - public event IEventHandler.FailedEventHandler? FailedShowRanking; public event IEventHandler.BeforeEventHandler? BeforeUseItem; public event IEventHandler.AfterEventHandler? AfterUseItem; - public event IEventHandler.SucceedEventHandler? SucceedUseItem; - public event IEventHandler.FailedEventHandler? FailedUseItem; public event IEventHandler.BeforeEventHandler? BeforeEndGame; public event IEventHandler.AfterEventHandler? AfterEndGame; - public event IEventHandler.SucceedEventHandler? SucceedEndGame; - public event IEventHandler.FailedEventHandler? FailedEndGame; public void OnBeforeConnectEvent(object sender, ConnectEventArgs e) { @@ -389,16 +305,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterConnect?.Invoke(sender, e); } - public void OnSucceedConnectEvent(object sender, ConnectEventArgs e) - { - SucceedConnect?.Invoke(sender, e); - } - - public void OnFailedConnectEvent(object sender, ConnectEventArgs e) - { - FailedConnect?.Invoke(sender, e); - } - public void OnBeforeDisconnectEvent(object sender, GeneralEventArgs e) { BeforeDisconnect?.Invoke(sender, e); @@ -409,16 +315,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterDisconnect?.Invoke(sender, e); } - public void OnSucceedDisconnectEvent(object sender, GeneralEventArgs e) - { - SucceedDisconnect?.Invoke(sender, e); - } - - public void OnFailedDisconnectEvent(object sender, GeneralEventArgs e) - { - FailedDisconnect?.Invoke(sender, e); - } - public void OnBeforeLoginEvent(object sender, LoginEventArgs e) { BeforeLogin?.Invoke(sender, e); @@ -429,16 +325,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterLogin?.Invoke(sender, e); } - public void OnSucceedLoginEvent(object sender, LoginEventArgs e) - { - SucceedLogin?.Invoke(sender, e); - } - - public void OnFailedLoginEvent(object sender, LoginEventArgs e) - { - FailedLogin?.Invoke(sender, e); - } - public void OnBeforeLogoutEvent(object sender, GeneralEventArgs e) { BeforeLogout?.Invoke(sender, e); @@ -449,16 +335,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterLogout?.Invoke(sender, e); } - public void OnSucceedLogoutEvent(object sender, GeneralEventArgs e) - { - SucceedLogout?.Invoke(sender, e); - } - - public void OnFailedLogoutEvent(object sender, GeneralEventArgs e) - { - FailedLogout?.Invoke(sender, e); - } - public void OnBeforeRegEvent(object sender, RegisterEventArgs e) { BeforeReg?.Invoke(sender, e); @@ -469,16 +345,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterReg?.Invoke(sender, e); } - public void OnSucceedRegEvent(object sender, RegisterEventArgs e) - { - SucceedReg?.Invoke(sender, e); - } - - public void OnFailedRegEvent(object sender, RegisterEventArgs e) - { - FailedReg?.Invoke(sender, e); - } - public void OnBeforeIntoRoomEvent(object sender, RoomEventArgs e) { BeforeIntoRoom?.Invoke(sender, e); @@ -489,16 +355,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterIntoRoom?.Invoke(sender, e); } - public void OnSucceedIntoRoomEvent(object sender, RoomEventArgs e) - { - SucceedIntoRoom?.Invoke(sender, e); - } - - public void OnFailedIntoRoomEvent(object sender, RoomEventArgs e) - { - FailedIntoRoom?.Invoke(sender, e); - } - public void OnBeforeSendTalkEvent(object sender, SendTalkEventArgs e) { BeforeSendTalk?.Invoke(sender, e); @@ -509,16 +365,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterSendTalk?.Invoke(sender, e); } - public void OnSucceedSendTalkEvent(object sender, SendTalkEventArgs e) - { - SucceedSendTalk?.Invoke(sender, e); - } - - public void OnFailedSendTalkEvent(object sender, SendTalkEventArgs e) - { - FailedSendTalk?.Invoke(sender, e); - } - public void OnBeforeCreateRoomEvent(object sender, RoomEventArgs e) { BeforeCreateRoom?.Invoke(sender, e); @@ -529,16 +375,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterCreateRoom?.Invoke(sender, e); } - public void OnSucceedCreateRoomEvent(object sender, RoomEventArgs e) - { - SucceedCreateRoom?.Invoke(sender, e); - } - - public void OnFailedCreateRoomEvent(object sender, RoomEventArgs e) - { - FailedCreateRoom?.Invoke(sender, e); - } - public void OnBeforeQuitRoomEvent(object sender, RoomEventArgs e) { BeforeQuitRoom?.Invoke(sender, e); @@ -549,16 +385,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterQuitRoom?.Invoke(sender, e); } - public void OnSucceedQuitRoomEvent(object sender, RoomEventArgs e) - { - SucceedQuitRoom?.Invoke(sender, e); - } - - public void OnFailedQuitRoomEvent(object sender, RoomEventArgs e) - { - FailedQuitRoom?.Invoke(sender, e); - } - public void OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e) { BeforeChangeRoomSetting?.Invoke(sender, e); @@ -569,16 +395,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeRoomSetting?.Invoke(sender, e); } - public void OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - SucceedChangeRoomSetting?.Invoke(sender, e); - } - - public void OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - FailedChangeRoomSetting?.Invoke(sender, e); - } - public void OnBeforeStartMatchEvent(object sender, GeneralEventArgs e) { BeforeStartMatch?.Invoke(sender, e); @@ -589,16 +405,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterStartMatch?.Invoke(sender, e); } - public void OnSucceedStartMatchEvent(object sender, GeneralEventArgs e) - { - SucceedStartMatch?.Invoke(sender, e); - } - - public void OnFailedStartMatchEvent(object sender, GeneralEventArgs e) - { - FailedStartMatch?.Invoke(sender, e); - } - public void OnBeforeStartGameEvent(object sender, GeneralEventArgs e) { BeforeStartGame?.Invoke(sender, e); @@ -609,16 +415,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterStartGame?.Invoke(sender, e); } - public void OnSucceedStartGameEvent(object sender, GeneralEventArgs e) - { - SucceedStartGame?.Invoke(sender, e); - } - - public void OnFailedStartGameEvent(object sender, GeneralEventArgs e) - { - FailedStartGame?.Invoke(sender, e); - } - public void OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e) { BeforeChangeProfile?.Invoke(sender, e); @@ -629,16 +425,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeProfile?.Invoke(sender, e); } - public void OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e) - { - SucceedChangeProfile?.Invoke(sender, e); - } - - public void OnFailedChangeProfileEvent(object sender, GeneralEventArgs e) - { - FailedChangeProfile?.Invoke(sender, e); - } - public void OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e) { BeforeChangeAccountSetting?.Invoke(sender, e); @@ -649,16 +435,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeAccountSetting?.Invoke(sender, e); } - public void OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - SucceedChangeAccountSetting?.Invoke(sender, e); - } - - public void OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - FailedChangeAccountSetting?.Invoke(sender, e); - } - public void OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e) { BeforeOpenInventory?.Invoke(sender, e); @@ -669,16 +445,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterOpenInventory?.Invoke(sender, e); } - public void OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - SucceedOpenInventory?.Invoke(sender, e); - } - - public void OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - FailedOpenInventory?.Invoke(sender, e); - } - public void OnBeforeSignInEvent(object sender, GeneralEventArgs e) { BeforeSignIn?.Invoke(sender, e); @@ -689,16 +455,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterSignIn?.Invoke(sender, e); } - public void OnSucceedSignInEvent(object sender, GeneralEventArgs e) - { - SucceedSignIn?.Invoke(sender, e); - } - - public void OnFailedSignInEvent(object sender, GeneralEventArgs e) - { - FailedSignIn?.Invoke(sender, e); - } - public void OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e) { BeforeOpenStore?.Invoke(sender, e); @@ -709,16 +465,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterOpenStore?.Invoke(sender, e); } - public void OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e) - { - SucceedOpenStore?.Invoke(sender, e); - } - - public void OnFailedOpenStoreEvent(object sender, GeneralEventArgs e) - { - FailedOpenStore?.Invoke(sender, e); - } - public void OnBeforeBuyItemEvent(object sender, GeneralEventArgs e) { BeforeBuyItem?.Invoke(sender, e); @@ -729,16 +475,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterBuyItem?.Invoke(sender, e); } - public void OnSucceedBuyItemEvent(object sender, GeneralEventArgs e) - { - SucceedBuyItem?.Invoke(sender, e); - } - - public void OnFailedBuyItemEvent(object sender, GeneralEventArgs e) - { - FailedBuyItem?.Invoke(sender, e); - } - public void OnBeforeShowRankingEvent(object sender, GeneralEventArgs e) { BeforeShowRanking?.Invoke(sender, e); @@ -749,16 +485,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterShowRanking?.Invoke(sender, e); } - public void OnSucceedShowRankingEvent(object sender, GeneralEventArgs e) - { - SucceedShowRanking?.Invoke(sender, e); - } - - public void OnFailedShowRankingEvent(object sender, GeneralEventArgs e) - { - FailedShowRanking?.Invoke(sender, e); - } - public void OnBeforeUseItemEvent(object sender, GeneralEventArgs e) { BeforeUseItem?.Invoke(sender, e); @@ -769,16 +495,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterUseItem?.Invoke(sender, e); } - public void OnSucceedUseItemEvent(object sender, GeneralEventArgs e) - { - SucceedUseItem?.Invoke(sender, e); - } - - public void OnFailedUseItemEvent(object sender, GeneralEventArgs e) - { - FailedUseItem?.Invoke(sender, e); - } - public void OnBeforeEndGameEvent(object sender, GeneralEventArgs e) { BeforeEndGame?.Invoke(sender, e); @@ -788,15 +504,5 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon { AfterEndGame?.Invoke(sender, e); } - - public void OnSucceedEndGameEvent(object sender, GeneralEventArgs e) - { - SucceedEndGame?.Invoke(sender, e); - } - - public void OnFailedEndGameEvent(object sender, GeneralEventArgs e) - { - FailedEndGame?.Invoke(sender, e); - } } } diff --git a/Library/Common/Addon/WebAPIPlugin.cs b/Library/Common/Addon/WebAPIPlugin.cs index 79af614..8d6fb1c 100644 --- a/Library/Common/Addon/WebAPIPlugin.cs +++ b/Library/Common/Addon/WebAPIPlugin.cs @@ -109,8 +109,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IConnectEvent bind = (IConnectEvent)this; BeforeConnect += bind.BeforeConnectEvent; AfterConnect += bind.AfterConnectEvent; - SucceedConnect += bind.SucceedConnectEvent; - FailedConnect += bind.FailedConnectEvent; } if (this is IDisconnectEvent) @@ -118,8 +116,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IDisconnectEvent bind = (IDisconnectEvent)this; BeforeDisconnect += bind.BeforeDisconnectEvent; AfterDisconnect += bind.AfterDisconnectEvent; - SucceedDisconnect += bind.SucceedDisconnectEvent; - FailedDisconnect += bind.FailedDisconnectEvent; } if (this is ILoginEvent) @@ -127,8 +123,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ILoginEvent bind = (ILoginEvent)this; BeforeLogin += bind.BeforeLoginEvent; AfterLogin += bind.AfterLoginEvent; - SucceedLogin += bind.SucceedLoginEvent; - FailedLogin += bind.FailedLoginEvent; } if (this is ILogoutEvent) @@ -136,8 +130,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ILogoutEvent bind = (ILogoutEvent)this; BeforeLogout += bind.BeforeLogoutEvent; AfterLogout += bind.AfterLogoutEvent; - SucceedLogout += bind.SucceedLogoutEvent; - FailedLogout += bind.FailedLogoutEvent; } if (this is IRegEvent) @@ -145,8 +137,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IRegEvent bind = (IRegEvent)this; BeforeReg += bind.BeforeRegEvent; AfterReg += bind.AfterRegEvent; - SucceedReg += bind.SucceedRegEvent; - FailedReg += bind.FailedRegEvent; } if (this is IIntoRoomEvent) @@ -154,8 +144,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IIntoRoomEvent bind = (IIntoRoomEvent)this; BeforeIntoRoom += bind.BeforeIntoRoomEvent; AfterIntoRoom += bind.AfterIntoRoomEvent; - SucceedIntoRoom += bind.SucceedIntoRoomEvent; - FailedIntoRoom += bind.FailedIntoRoomEvent; } if (this is ISendTalkEvent) @@ -163,8 +151,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ISendTalkEvent bind = (ISendTalkEvent)this; BeforeSendTalk += bind.BeforeSendTalkEvent; AfterSendTalk += bind.AfterSendTalkEvent; - SucceedSendTalk += bind.SucceedSendTalkEvent; - FailedSendTalk += bind.FailedSendTalkEvent; } if (this is ICreateRoomEvent) @@ -172,8 +158,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ICreateRoomEvent bind = (ICreateRoomEvent)this; BeforeCreateRoom += bind.BeforeCreateRoomEvent; AfterCreateRoom += bind.AfterCreateRoomEvent; - SucceedCreateRoom += bind.SucceedCreateRoomEvent; - FailedCreateRoom += bind.FailedCreateRoomEvent; } if (this is IQuitRoomEvent) @@ -181,8 +165,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IQuitRoomEvent bind = (IQuitRoomEvent)this; BeforeQuitRoom += bind.BeforeQuitRoomEvent; AfterQuitRoom += bind.AfterQuitRoomEvent; - SucceedQuitRoom += bind.SucceedQuitRoomEvent; - FailedQuitRoom += bind.FailedQuitRoomEvent; } if (this is IChangeRoomSettingEvent) @@ -190,8 +172,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeRoomSettingEvent bind = (IChangeRoomSettingEvent)this; BeforeChangeRoomSetting += bind.BeforeChangeRoomSettingEvent; AfterChangeRoomSetting += bind.AfterChangeRoomSettingEvent; - SucceedChangeRoomSetting += bind.SucceedChangeRoomSettingEvent; - FailedChangeRoomSetting += bind.FailedChangeRoomSettingEvent; } if (this is IStartMatchEvent) @@ -199,8 +179,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IStartMatchEvent bind = (IStartMatchEvent)this; BeforeStartMatch += bind.BeforeStartMatchEvent; AfterStartMatch += bind.AfterStartMatchEvent; - SucceedStartMatch += bind.SucceedStartMatchEvent; - FailedStartMatch += bind.FailedStartMatchEvent; } if (this is IStartGameEvent) @@ -208,8 +186,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IStartGameEvent bind = (IStartGameEvent)this; BeforeStartGame += bind.BeforeStartGameEvent; AfterStartGame += bind.AfterStartGameEvent; - SucceedStartGame += bind.SucceedStartGameEvent; - FailedStartGame += bind.FailedStartGameEvent; } if (this is IChangeProfileEvent) @@ -217,8 +193,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeProfileEvent bind = (IChangeProfileEvent)this; BeforeChangeProfile += bind.BeforeChangeProfileEvent; AfterChangeProfile += bind.AfterChangeProfileEvent; - SucceedChangeProfile += bind.SucceedChangeProfileEvent; - FailedChangeProfile += bind.FailedChangeProfileEvent; } if (this is IChangeAccountSettingEvent) @@ -226,8 +200,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IChangeAccountSettingEvent bind = (IChangeAccountSettingEvent)this; BeforeChangeAccountSetting += bind.BeforeChangeAccountSettingEvent; AfterChangeAccountSetting += bind.AfterChangeAccountSettingEvent; - SucceedChangeAccountSetting += bind.SucceedChangeAccountSettingEvent; - FailedChangeAccountSetting += bind.FailedChangeAccountSettingEvent; } if (this is IOpenInventoryEvent) @@ -235,8 +207,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IOpenInventoryEvent bind = (IOpenInventoryEvent)this; BeforeOpenInventory += bind.BeforeOpenInventoryEvent; AfterOpenInventory += bind.AfterOpenInventoryEvent; - SucceedOpenInventory += bind.SucceedOpenInventoryEvent; - FailedOpenInventory += bind.FailedOpenInventoryEvent; } if (this is ISignInEvent) @@ -244,8 +214,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon ISignInEvent bind = (ISignInEvent)this; BeforeSignIn += bind.BeforeSignInEvent; AfterSignIn += bind.AfterSignInEvent; - SucceedSignIn += bind.SucceedSignInEvent; - FailedSignIn += bind.FailedSignInEvent; } if (this is IOpenStoreEvent) @@ -253,8 +221,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IOpenStoreEvent bind = (IOpenStoreEvent)this; BeforeOpenStore += bind.BeforeOpenStoreEvent; AfterOpenStore += bind.AfterOpenStoreEvent; - SucceedOpenStore += bind.SucceedOpenStoreEvent; - FailedOpenStore += bind.FailedOpenStoreEvent; } if (this is IBuyItemEvent) @@ -262,8 +228,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IBuyItemEvent bind = (IBuyItemEvent)this; BeforeBuyItem += bind.BeforeBuyItemEvent; AfterBuyItem += bind.AfterBuyItemEvent; - SucceedBuyItem += bind.SucceedBuyItemEvent; - FailedBuyItem += bind.FailedBuyItemEvent; } if (this is IShowRankingEvent) @@ -271,8 +235,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IShowRankingEvent bind = (IShowRankingEvent)this; BeforeShowRanking += bind.BeforeShowRankingEvent; AfterShowRanking += bind.AfterShowRankingEvent; - SucceedShowRanking += bind.SucceedShowRankingEvent; - FailedShowRanking += bind.FailedShowRankingEvent; } if (this is IUseItemEvent) @@ -280,8 +242,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IUseItemEvent bind = (IUseItemEvent)this; BeforeUseItem += bind.BeforeUseItemEvent; AfterUseItem += bind.AfterUseItemEvent; - SucceedUseItem += bind.SucceedUseItemEvent; - FailedUseItem += bind.FailedUseItemEvent; } if (this is IEndGameEvent) @@ -289,95 +249,51 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon IEndGameEvent bind = (IEndGameEvent)this; BeforeEndGame += bind.BeforeEndGameEvent; AfterEndGame += bind.AfterEndGameEvent; - SucceedEndGame += bind.SucceedEndGameEvent; - FailedEndGame += bind.FailedEndGameEvent; } } public event IConnectEventHandler.BeforeEventHandler? BeforeConnect; public event IConnectEventHandler.AfterEventHandler? AfterConnect; - public event IConnectEventHandler.SucceedEventHandler? SucceedConnect; - public event IConnectEventHandler.FailedEventHandler? FailedConnect; public event IEventHandler.BeforeEventHandler? BeforeDisconnect; public event IEventHandler.AfterEventHandler? AfterDisconnect; - public event IEventHandler.SucceedEventHandler? SucceedDisconnect; - public event IEventHandler.FailedEventHandler? FailedDisconnect; public event ILoginEventHandler.BeforeEventHandler? BeforeLogin; public event ILoginEventHandler.AfterEventHandler? AfterLogin; - public event ILoginEventHandler.SucceedEventHandler? SucceedLogin; - public event ILoginEventHandler.FailedEventHandler? FailedLogin; public event IEventHandler.BeforeEventHandler? BeforeLogout; public event IEventHandler.AfterEventHandler? AfterLogout; - public event IEventHandler.SucceedEventHandler? SucceedLogout; - public event IEventHandler.FailedEventHandler? FailedLogout; public event IRegEventHandler.BeforeEventHandler? BeforeReg; public event IRegEventHandler.AfterEventHandler? AfterReg; - public event IRegEventHandler.SucceedEventHandler? SucceedReg; - public event IRegEventHandler.FailedEventHandler? FailedReg; public event IIntoRoomEventHandler.BeforeEventHandler? BeforeIntoRoom; public event IIntoRoomEventHandler.AfterEventHandler? AfterIntoRoom; - public event IIntoRoomEventHandler.SucceedEventHandler? SucceedIntoRoom; - public event IIntoRoomEventHandler.FailedEventHandler? FailedIntoRoom; public event ISendTalkEventHandler.BeforeEventHandler? BeforeSendTalk; public event ISendTalkEventHandler.AfterEventHandler? AfterSendTalk; - public event ISendTalkEventHandler.SucceedEventHandler? SucceedSendTalk; - public event ISendTalkEventHandler.FailedEventHandler? FailedSendTalk; public event ICreateRoomEventHandler.BeforeEventHandler? BeforeCreateRoom; public event ICreateRoomEventHandler.AfterEventHandler? AfterCreateRoom; - public event ICreateRoomEventHandler.SucceedEventHandler? SucceedCreateRoom; - public event ICreateRoomEventHandler.FailedEventHandler? FailedCreateRoom; public event IQuitRoomEventHandler.BeforeEventHandler? BeforeQuitRoom; public event IQuitRoomEventHandler.AfterEventHandler? AfterQuitRoom; - public event IQuitRoomEventHandler.SucceedEventHandler? SucceedQuitRoom; - public event IQuitRoomEventHandler.FailedEventHandler? FailedQuitRoom; public event IEventHandler.BeforeEventHandler? BeforeChangeRoomSetting; public event IEventHandler.AfterEventHandler? AfterChangeRoomSetting; - public event IEventHandler.SucceedEventHandler? SucceedChangeRoomSetting; - public event IEventHandler.FailedEventHandler? FailedChangeRoomSetting; public event IEventHandler.BeforeEventHandler? BeforeStartMatch; public event IEventHandler.AfterEventHandler? AfterStartMatch; - public event IEventHandler.SucceedEventHandler? SucceedStartMatch; - public event IEventHandler.FailedEventHandler? FailedStartMatch; public event IEventHandler.BeforeEventHandler? BeforeStartGame; public event IEventHandler.AfterEventHandler? AfterStartGame; - public event IEventHandler.SucceedEventHandler? SucceedStartGame; - public event IEventHandler.FailedEventHandler? FailedStartGame; public event IEventHandler.BeforeEventHandler? BeforeChangeProfile; public event IEventHandler.AfterEventHandler? AfterChangeProfile; - public event IEventHandler.SucceedEventHandler? SucceedChangeProfile; - public event IEventHandler.FailedEventHandler? FailedChangeProfile; public event IEventHandler.BeforeEventHandler? BeforeChangeAccountSetting; public event IEventHandler.AfterEventHandler? AfterChangeAccountSetting; - public event IEventHandler.SucceedEventHandler? SucceedChangeAccountSetting; - public event IEventHandler.FailedEventHandler? FailedChangeAccountSetting; public event IEventHandler.BeforeEventHandler? BeforeOpenInventory; public event IEventHandler.AfterEventHandler? AfterOpenInventory; - public event IEventHandler.SucceedEventHandler? SucceedOpenInventory; - public event IEventHandler.FailedEventHandler? FailedOpenInventory; public event IEventHandler.BeforeEventHandler? BeforeSignIn; public event IEventHandler.AfterEventHandler? AfterSignIn; - public event IEventHandler.SucceedEventHandler? SucceedSignIn; - public event IEventHandler.FailedEventHandler? FailedSignIn; public event IEventHandler.BeforeEventHandler? BeforeOpenStore; public event IEventHandler.AfterEventHandler? AfterOpenStore; - public event IEventHandler.SucceedEventHandler? SucceedOpenStore; - public event IEventHandler.FailedEventHandler? FailedOpenStore; public event IEventHandler.BeforeEventHandler? BeforeBuyItem; public event IEventHandler.AfterEventHandler? AfterBuyItem; - public event IEventHandler.SucceedEventHandler? SucceedBuyItem; - public event IEventHandler.FailedEventHandler? FailedBuyItem; public event IEventHandler.BeforeEventHandler? BeforeShowRanking; public event IEventHandler.AfterEventHandler? AfterShowRanking; - public event IEventHandler.SucceedEventHandler? SucceedShowRanking; - public event IEventHandler.FailedEventHandler? FailedShowRanking; public event IEventHandler.BeforeEventHandler? BeforeUseItem; public event IEventHandler.AfterEventHandler? AfterUseItem; - public event IEventHandler.SucceedEventHandler? SucceedUseItem; - public event IEventHandler.FailedEventHandler? FailedUseItem; public event IEventHandler.BeforeEventHandler? BeforeEndGame; public event IEventHandler.AfterEventHandler? AfterEndGame; - public event IEventHandler.SucceedEventHandler? SucceedEndGame; - public event IEventHandler.FailedEventHandler? FailedEndGame; public void OnBeforeConnectEvent(object sender, ConnectEventArgs e) { @@ -389,16 +305,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterConnect?.Invoke(sender, e); } - public void OnSucceedConnectEvent(object sender, ConnectEventArgs e) - { - SucceedConnect?.Invoke(sender, e); - } - - public void OnFailedConnectEvent(object sender, ConnectEventArgs e) - { - FailedConnect?.Invoke(sender, e); - } - public void OnBeforeDisconnectEvent(object sender, GeneralEventArgs e) { BeforeDisconnect?.Invoke(sender, e); @@ -409,16 +315,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterDisconnect?.Invoke(sender, e); } - public void OnSucceedDisconnectEvent(object sender, GeneralEventArgs e) - { - SucceedDisconnect?.Invoke(sender, e); - } - - public void OnFailedDisconnectEvent(object sender, GeneralEventArgs e) - { - FailedDisconnect?.Invoke(sender, e); - } - public void OnBeforeLoginEvent(object sender, LoginEventArgs e) { BeforeLogin?.Invoke(sender, e); @@ -429,16 +325,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterLogin?.Invoke(sender, e); } - public void OnSucceedLoginEvent(object sender, LoginEventArgs e) - { - SucceedLogin?.Invoke(sender, e); - } - - public void OnFailedLoginEvent(object sender, LoginEventArgs e) - { - FailedLogin?.Invoke(sender, e); - } - public void OnBeforeLogoutEvent(object sender, GeneralEventArgs e) { BeforeLogout?.Invoke(sender, e); @@ -449,16 +335,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterLogout?.Invoke(sender, e); } - public void OnSucceedLogoutEvent(object sender, GeneralEventArgs e) - { - SucceedLogout?.Invoke(sender, e); - } - - public void OnFailedLogoutEvent(object sender, GeneralEventArgs e) - { - FailedLogout?.Invoke(sender, e); - } - public void OnBeforeRegEvent(object sender, RegisterEventArgs e) { BeforeReg?.Invoke(sender, e); @@ -469,16 +345,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterReg?.Invoke(sender, e); } - public void OnSucceedRegEvent(object sender, RegisterEventArgs e) - { - SucceedReg?.Invoke(sender, e); - } - - public void OnFailedRegEvent(object sender, RegisterEventArgs e) - { - FailedReg?.Invoke(sender, e); - } - public void OnBeforeIntoRoomEvent(object sender, RoomEventArgs e) { BeforeIntoRoom?.Invoke(sender, e); @@ -489,16 +355,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterIntoRoom?.Invoke(sender, e); } - public void OnSucceedIntoRoomEvent(object sender, RoomEventArgs e) - { - SucceedIntoRoom?.Invoke(sender, e); - } - - public void OnFailedIntoRoomEvent(object sender, RoomEventArgs e) - { - FailedIntoRoom?.Invoke(sender, e); - } - public void OnBeforeSendTalkEvent(object sender, SendTalkEventArgs e) { BeforeSendTalk?.Invoke(sender, e); @@ -509,16 +365,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterSendTalk?.Invoke(sender, e); } - public void OnSucceedSendTalkEvent(object sender, SendTalkEventArgs e) - { - SucceedSendTalk?.Invoke(sender, e); - } - - public void OnFailedSendTalkEvent(object sender, SendTalkEventArgs e) - { - FailedSendTalk?.Invoke(sender, e); - } - public void OnBeforeCreateRoomEvent(object sender, RoomEventArgs e) { BeforeCreateRoom?.Invoke(sender, e); @@ -529,16 +375,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterCreateRoom?.Invoke(sender, e); } - public void OnSucceedCreateRoomEvent(object sender, RoomEventArgs e) - { - SucceedCreateRoom?.Invoke(sender, e); - } - - public void OnFailedCreateRoomEvent(object sender, RoomEventArgs e) - { - FailedCreateRoom?.Invoke(sender, e); - } - public void OnBeforeQuitRoomEvent(object sender, RoomEventArgs e) { BeforeQuitRoom?.Invoke(sender, e); @@ -549,16 +385,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterQuitRoom?.Invoke(sender, e); } - public void OnSucceedQuitRoomEvent(object sender, RoomEventArgs e) - { - SucceedQuitRoom?.Invoke(sender, e); - } - - public void OnFailedQuitRoomEvent(object sender, RoomEventArgs e) - { - FailedQuitRoom?.Invoke(sender, e); - } - public void OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e) { BeforeChangeRoomSetting?.Invoke(sender, e); @@ -569,16 +395,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeRoomSetting?.Invoke(sender, e); } - public void OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - SucceedChangeRoomSetting?.Invoke(sender, e); - } - - public void OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e) - { - FailedChangeRoomSetting?.Invoke(sender, e); - } - public void OnBeforeStartMatchEvent(object sender, GeneralEventArgs e) { BeforeStartMatch?.Invoke(sender, e); @@ -589,16 +405,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterStartMatch?.Invoke(sender, e); } - public void OnSucceedStartMatchEvent(object sender, GeneralEventArgs e) - { - SucceedStartMatch?.Invoke(sender, e); - } - - public void OnFailedStartMatchEvent(object sender, GeneralEventArgs e) - { - FailedStartMatch?.Invoke(sender, e); - } - public void OnBeforeStartGameEvent(object sender, GeneralEventArgs e) { BeforeStartGame?.Invoke(sender, e); @@ -609,16 +415,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterStartGame?.Invoke(sender, e); } - public void OnSucceedStartGameEvent(object sender, GeneralEventArgs e) - { - SucceedStartGame?.Invoke(sender, e); - } - - public void OnFailedStartGameEvent(object sender, GeneralEventArgs e) - { - FailedStartGame?.Invoke(sender, e); - } - public void OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e) { BeforeChangeProfile?.Invoke(sender, e); @@ -629,16 +425,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeProfile?.Invoke(sender, e); } - public void OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e) - { - SucceedChangeProfile?.Invoke(sender, e); - } - - public void OnFailedChangeProfileEvent(object sender, GeneralEventArgs e) - { - FailedChangeProfile?.Invoke(sender, e); - } - public void OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e) { BeforeChangeAccountSetting?.Invoke(sender, e); @@ -649,16 +435,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterChangeAccountSetting?.Invoke(sender, e); } - public void OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - SucceedChangeAccountSetting?.Invoke(sender, e); - } - - public void OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e) - { - FailedChangeAccountSetting?.Invoke(sender, e); - } - public void OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e) { BeforeOpenInventory?.Invoke(sender, e); @@ -669,16 +445,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterOpenInventory?.Invoke(sender, e); } - public void OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - SucceedOpenInventory?.Invoke(sender, e); - } - - public void OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e) - { - FailedOpenInventory?.Invoke(sender, e); - } - public void OnBeforeSignInEvent(object sender, GeneralEventArgs e) { BeforeSignIn?.Invoke(sender, e); @@ -689,16 +455,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterSignIn?.Invoke(sender, e); } - public void OnSucceedSignInEvent(object sender, GeneralEventArgs e) - { - SucceedSignIn?.Invoke(sender, e); - } - - public void OnFailedSignInEvent(object sender, GeneralEventArgs e) - { - FailedSignIn?.Invoke(sender, e); - } - public void OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e) { BeforeOpenStore?.Invoke(sender, e); @@ -709,16 +465,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterOpenStore?.Invoke(sender, e); } - public void OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e) - { - SucceedOpenStore?.Invoke(sender, e); - } - - public void OnFailedOpenStoreEvent(object sender, GeneralEventArgs e) - { - FailedOpenStore?.Invoke(sender, e); - } - public void OnBeforeBuyItemEvent(object sender, GeneralEventArgs e) { BeforeBuyItem?.Invoke(sender, e); @@ -729,16 +475,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterBuyItem?.Invoke(sender, e); } - public void OnSucceedBuyItemEvent(object sender, GeneralEventArgs e) - { - SucceedBuyItem?.Invoke(sender, e); - } - - public void OnFailedBuyItemEvent(object sender, GeneralEventArgs e) - { - FailedBuyItem?.Invoke(sender, e); - } - public void OnBeforeShowRankingEvent(object sender, GeneralEventArgs e) { BeforeShowRanking?.Invoke(sender, e); @@ -749,16 +485,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterShowRanking?.Invoke(sender, e); } - public void OnSucceedShowRankingEvent(object sender, GeneralEventArgs e) - { - SucceedShowRanking?.Invoke(sender, e); - } - - public void OnFailedShowRankingEvent(object sender, GeneralEventArgs e) - { - FailedShowRanking?.Invoke(sender, e); - } - public void OnBeforeUseItemEvent(object sender, GeneralEventArgs e) { BeforeUseItem?.Invoke(sender, e); @@ -769,16 +495,6 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon AfterUseItem?.Invoke(sender, e); } - public void OnSucceedUseItemEvent(object sender, GeneralEventArgs e) - { - SucceedUseItem?.Invoke(sender, e); - } - - public void OnFailedUseItemEvent(object sender, GeneralEventArgs e) - { - FailedUseItem?.Invoke(sender, e); - } - public void OnBeforeEndGameEvent(object sender, GeneralEventArgs e) { BeforeEndGame?.Invoke(sender, e); @@ -788,15 +504,5 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon { AfterEndGame?.Invoke(sender, e); } - - public void OnSucceedEndGameEvent(object sender, GeneralEventArgs e) - { - SucceedEndGame?.Invoke(sender, e); - } - - public void OnFailedEndGameEvent(object sender, GeneralEventArgs e) - { - FailedEndGame?.Invoke(sender, e); - } } } diff --git a/Library/Common/Event/GeneralEventArgs.cs b/Library/Common/Event/GeneralEventArgs.cs index f3e212b..d6fc7dc 100644 --- a/Library/Common/Event/GeneralEventArgs.cs +++ b/Library/Common/Event/GeneralEventArgs.cs @@ -2,22 +2,23 @@ { public class GeneralEventArgs : EventArgs { + public bool Success { get; set; } = true; public string EventMsg { get; set; } = ""; public Dictionary Parameters { get; set; } = []; public bool Cancel { get; set; } = false; - public GeneralEventArgs(string EventMsg, Dictionary Parameters) + public GeneralEventArgs(string msg, Dictionary args) { - this.EventMsg = EventMsg; - this.Parameters = Parameters; + EventMsg = msg; + Parameters = args; } - public GeneralEventArgs(params object[] Parameters) + public GeneralEventArgs(params object[] args) { int count = 0; - foreach (object obj in Parameters) + foreach (object obj in args) { - this.Parameters[count++.ToString()] = obj; + Parameters[count++.ToString()] = obj; } } } @@ -27,7 +28,7 @@ public T? Instance { get; set; } public GeneralEvent() { - Instance = (T?)Activator.CreateInstance(typeof(T?)); + Instance = Activator.CreateInstance(); } } }