diff --git a/FunGame.Core/Interface/Event/Events.cs b/FunGame.Core/Interface/Event/Events.cs index eed01f9..69e956c 100644 --- a/FunGame.Core/Interface/Event/Events.cs +++ b/FunGame.Core/Interface/Event/Events.cs @@ -22,6 +22,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterConnectEvent; public event SucceedEvent SucceedConnectEvent; public event FailedEvent FailedConnectEvent; + + public EventResult OnBeforeConnectEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterConnectEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedConnectEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedConnectEvent(object sender, GeneralEventArgs e); } public interface IDisconnectEvent : IEvent @@ -30,6 +35,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterDisconnectEvent; public event SucceedEvent SucceedDisconnectEvent; public event FailedEvent FailedDisconnectEvent; + + public EventResult OnBeforeDisconnectEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterDisconnectEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedDisconnectEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedDisconnectEvent(object sender, GeneralEventArgs e); } public interface ILoginEvent : IEvent @@ -38,6 +48,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterLoginEvent; public event SucceedEvent SucceedLoginEvent; public event FailedEvent FailedLoginEvent; + + public EventResult OnBeforeLoginEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterLoginEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedLoginEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedLoginEvent(object sender, GeneralEventArgs e); } public interface ILogoutEvent : IEvent @@ -46,6 +61,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterLogoutEvent; public event SucceedEvent SucceedLogoutEvent; public event FailedEvent FailedLogoutEvent; + + public EventResult OnBeforeLogoutEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterLogoutEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedLogoutEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedLogoutEvent(object sender, GeneralEventArgs e); } public interface IRegEvent : IEvent @@ -54,6 +74,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterRegEvent; public event SucceedEvent SucceedRegEvent; public event FailedEvent FailedRegEvent; + + public EventResult OnBeforeRegEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterRegEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedRegEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedRegEvent(object sender, GeneralEventArgs e); } public interface IIntoRoomEvent : IEvent @@ -62,6 +87,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterIntoRoomEvent; public event SucceedEvent SucceedIntoRoomEvent; public event FailedEvent FailedIntoRoomEvent; + + public EventResult OnBeforeIntoRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterIntoRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedIntoRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedIntoRoomEvent(object sender, GeneralEventArgs e); } public interface ISendTalkEvent : IEvent @@ -70,6 +100,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterSendTalkEvent; public event SucceedEvent SucceedSendTalkEvent; public event FailedEvent FailedSendTalkEvent; + + public EventResult OnBeforeSendTalkEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterSendTalkEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedSendTalkEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedSendTalkEvent(object sender, GeneralEventArgs e); } public interface ICreateRoomEvent : IEvent @@ -78,6 +113,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterCreateRoomEvent; public event SucceedEvent SucceedCreateRoomEvent; public event FailedEvent FailedCreateRoomEvent; + + public EventResult OnBeforeCreateRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterCreateRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedCreateRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedCreateRoomEvent(object sender, GeneralEventArgs e); } public interface IQuitRoomEvent : IEvent @@ -86,6 +126,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterQuitRoomEvent; public event SucceedEvent SucceedQuitRoomEvent; public event FailedEvent FailedQuitRoomEvent; + + public EventResult OnBeforeQuitRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterQuitRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedQuitRoomEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedQuitRoomEvent(object sender, GeneralEventArgs e); } public interface IChangeRoomSettingEvent : IEvent @@ -94,6 +139,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterChangeRoomSettingEvent; public event SucceedEvent SucceedChangeRoomSettingEvent; public event FailedEvent FailedChangeRoomSettingEvent; + + public EventResult OnBeforeChangeRoomSettingEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterChangeRoomSettingEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedChangeRoomSettingEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedChangeRoomSettingEvent(object sender, GeneralEventArgs e); } public interface IStartMatchEvent : IEvent @@ -102,6 +152,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterStartMatchEvent; public event SucceedEvent SucceedStartMatchEvent; public event FailedEvent FailedStartMatchEvent; + + public EventResult OnBeforeStartMatchEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterStartMatchEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedStartMatchEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedStartMatchEvent(object sender, GeneralEventArgs e); } public interface IStartGameEvent : IEvent @@ -110,6 +165,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterStartGameEvent; public event SucceedEvent SucceedStartGameEvent; public event FailedEvent FailedStartGameEvent; + + public EventResult OnBeforeStartGameEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterStartGameEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedStartGameEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedStartGameEvent(object sender, GeneralEventArgs e); } public interface IChangeProfileEvent : IEvent @@ -118,6 +178,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterChangeProfileEvent; public event SucceedEvent SucceedChangeProfileEvent; public event FailedEvent FailedChangeProfileEvent; + + public EventResult OnBeforeChangeProfileEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterChangeProfileEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedChangeProfileEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedChangeProfileEvent(object sender, GeneralEventArgs e); } public interface IChangeAccountSettingEvent : IEvent @@ -126,6 +191,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterChangeAccountSettingEvent; public event SucceedEvent SucceedChangeAccountSettingEvent; public event FailedEvent FailedChangeAccountSettingEvent; + + public EventResult OnBeforeChangeAccountSettingEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterChangeAccountSettingEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedChangeAccountSettingEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedChangeAccountSettingEvent(object sender, GeneralEventArgs e); } public interface IOpenInventoryEvent : IEvent @@ -134,6 +204,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterOpenInventoryEvent; public event SucceedEvent SucceedOpenInventoryEvent; public event FailedEvent FailedOpenInventoryEvent; + + public EventResult OnBeforeOpenInventoryEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterOpenInventoryEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedOpenInventoryEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedOpenInventoryEvent(object sender, GeneralEventArgs e); } public interface ISignInEvent : IEvent @@ -142,6 +217,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterSignInEvent; public event SucceedEvent SucceedSignInEvent; public event FailedEvent FailedSignInEvent; + + public EventResult OnBeforeSignInEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterSignInEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedSignInEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedSignInEvent(object sender, GeneralEventArgs e); } public interface IOpenStoreEvent : IEvent @@ -150,6 +230,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterOpenStoreEvent; public event SucceedEvent SucceedOpenStoreEvent; public event FailedEvent FailedOpenStoreEvent; + + public EventResult OnBeforeOpenStoreEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterOpenStoreEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedOpenStoreEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedOpenStoreEvent(object sender, GeneralEventArgs e); } public interface IBuyItemEvent : IEvent @@ -158,6 +243,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterBuyItemEvent; public event SucceedEvent SucceedBuyItemEvent; public event FailedEvent FailedBuyItemEvent; + + public EventResult OnBeforeBuyItemEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterBuyItemEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedBuyItemEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedBuyItemEvent(object sender, GeneralEventArgs e); } public interface IShowRankingEvent : IEvent @@ -166,6 +256,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterShowRankingEvent; public event SucceedEvent SucceedShowRankingEvent; public event FailedEvent FailedShowRankingEvent; + + public EventResult OnBeforeShowRankingEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterShowRankingEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedShowRankingEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedShowRankingEvent(object sender, GeneralEventArgs e); } public interface IUseItemEvent : IEvent @@ -174,6 +269,11 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterUseItemEvent; public event SucceedEvent SucceedUseItemEvent; public event FailedEvent FailedUseItemEvent; + + public EventResult OnBeforeUseItemEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterUseItemEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedUseItemEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedUseItemEvent(object sender, GeneralEventArgs e); } public interface IEndGameEvent : IEvent @@ -182,5 +282,10 @@ namespace Milimoe.FunGame.Core.Interface public event AfterEvent AfterEndGameEvent; public event SucceedEvent SucceedEndGameEvent; public event FailedEvent FailedEndGameEvent; + + public EventResult OnBeforeEndGameEvent(object sender, GeneralEventArgs e); + public EventResult OnAfterEndGameEvent(object sender, GeneralEventArgs e); + public EventResult OnSucceedEndGameEvent(object sender, GeneralEventArgs e); + public EventResult OnFailedEndGameEvent(object sender, GeneralEventArgs e); } } diff --git a/FunGame.Core/Library/Common/Event/BuyItemEvent.cs b/FunGame.Core/Library/Common/Event/BuyItemEvent.cs deleted file mode 100644 index 9ca06a4..0000000 --- a/FunGame.Core/Library/Common/Event/BuyItemEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class BuyItemEvent : IBuyItemEvent - { - public event IEvent.BeforeEvent? BeforeBuyItemEvent; - public event IEvent.AfterEvent? AfterBuyItemEvent; - public event IEvent.SucceedEvent? SucceedBuyItemEvent; - public event IEvent.FailedEvent? FailedBuyItemEvent; - - public virtual EventResult OnBeforeBuyItemEvent(GeneralEventArgs e) - { - if (BeforeBuyItemEvent != null) - { - return BeforeBuyItemEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterBuyItemEvent(GeneralEventArgs e) - { - if (AfterBuyItemEvent != null) - { - return AfterBuyItemEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedBuyItemEvent(GeneralEventArgs e) - { - if (SucceedBuyItemEvent != null) - { - return SucceedBuyItemEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedBuyItemEvent(GeneralEventArgs e) - { - if (FailedBuyItemEvent != null) - { - return FailedBuyItemEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/ChangeAccountSettingEvent.cs b/FunGame.Core/Library/Common/Event/ChangeAccountSettingEvent.cs deleted file mode 100644 index 10e7a03..0000000 --- a/FunGame.Core/Library/Common/Event/ChangeAccountSettingEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class ChangeAccountSettingEvent : IChangeAccountSettingEvent - { - public event IEvent.BeforeEvent? BeforeChangeAccountSettingEvent; - public event IEvent.AfterEvent? AfterChangeAccountSettingEvent; - public event IEvent.SucceedEvent? SucceedChangeAccountSettingEvent; - public event IEvent.FailedEvent? FailedChangeAccountSettingEvent; - - public virtual EventResult OnBeforeChangeAccountSettingEvent(GeneralEventArgs e) - { - if (BeforeChangeAccountSettingEvent != null) - { - return BeforeChangeAccountSettingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterChangeAccountSettingEvent(GeneralEventArgs e) - { - if (AfterChangeAccountSettingEvent != null) - { - return AfterChangeAccountSettingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedChangeAccountSettingEvent(GeneralEventArgs e) - { - if (SucceedChangeAccountSettingEvent != null) - { - return SucceedChangeAccountSettingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedChangeAccountSettingEvent(GeneralEventArgs e) - { - if (FailedChangeAccountSettingEvent != null) - { - return FailedChangeAccountSettingEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/ChangeProfileEvent.cs b/FunGame.Core/Library/Common/Event/ChangeProfileEvent.cs deleted file mode 100644 index e622235..0000000 --- a/FunGame.Core/Library/Common/Event/ChangeProfileEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class ChangeProfileEvent : IChangeProfileEvent - { - public event IEvent.BeforeEvent? BeforeChangeProfileEvent; - public event IEvent.AfterEvent? AfterChangeProfileEvent; - public event IEvent.SucceedEvent? SucceedChangeProfileEvent; - public event IEvent.FailedEvent? FailedChangeProfileEvent; - - public virtual EventResult OnBeforeChangeProfileEvent(GeneralEventArgs e) - { - if (BeforeChangeProfileEvent != null) - { - return BeforeChangeProfileEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterChangeProfileEvent(GeneralEventArgs e) - { - if (AfterChangeProfileEvent != null) - { - return AfterChangeProfileEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedChangeProfileEvent(GeneralEventArgs e) - { - if (SucceedChangeProfileEvent != null) - { - return SucceedChangeProfileEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedChangeProfileEvent(GeneralEventArgs e) - { - if (FailedChangeProfileEvent != null) - { - return FailedChangeProfileEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/ChangeRoomSettingEvent.cs b/FunGame.Core/Library/Common/Event/ChangeRoomSettingEvent.cs deleted file mode 100644 index 24af93e..0000000 --- a/FunGame.Core/Library/Common/Event/ChangeRoomSettingEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class ChangeRoomSettingEvent : IChangeRoomSettingEvent - { - public event IEvent.BeforeEvent? BeforeChangeRoomSettingEvent; - public event IEvent.AfterEvent? AfterChangeRoomSettingEvent; - public event IEvent.SucceedEvent? SucceedChangeRoomSettingEvent; - public event IEvent.FailedEvent? FailedChangeRoomSettingEvent; - - public virtual EventResult OnBeforeChangeRoomSettingEvent(GeneralEventArgs e) - { - if (BeforeChangeRoomSettingEvent != null) - { - return BeforeChangeRoomSettingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterChangeRoomSettingEvent(GeneralEventArgs e) - { - if (AfterChangeRoomSettingEvent != null) - { - return AfterChangeRoomSettingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedChangeRoomSettingEvent(GeneralEventArgs e) - { - if (SucceedChangeRoomSettingEvent != null) - { - return SucceedChangeRoomSettingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedChangeRoomSettingEvent(GeneralEventArgs e) - { - if (FailedChangeRoomSettingEvent != null) - { - return FailedChangeRoomSettingEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/ConnectEvent.cs b/FunGame.Core/Library/Common/Event/ConnectEvent.cs deleted file mode 100644 index e67ffa2..0000000 --- a/FunGame.Core/Library/Common/Event/ConnectEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class ConnectEvent : IConnectEvent - { - public event IEvent.BeforeEvent? BeforeConnectEvent; - public event IEvent.AfterEvent? AfterConnectEvent; - public event IEvent.SucceedEvent? SucceedConnectEvent; - public event IEvent.FailedEvent? FailedConnectEvent; - - public virtual EventResult OnBeforeConnectEvent(GeneralEventArgs e) - { - if (BeforeConnectEvent != null) - { - return BeforeConnectEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterConnectEvent(GeneralEventArgs e) - { - if (AfterConnectEvent != null) - { - return AfterConnectEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedConnectEvent(GeneralEventArgs e) - { - if (SucceedConnectEvent != null) - { - return SucceedConnectEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedConnectEvent(GeneralEventArgs e) - { - if (FailedConnectEvent != null) - { - return FailedConnectEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/CreateRoomEvent.cs b/FunGame.Core/Library/Common/Event/CreateRoomEvent.cs deleted file mode 100644 index 95f43dd..0000000 --- a/FunGame.Core/Library/Common/Event/CreateRoomEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class CreateRoomEvent : ICreateRoomEvent - { - public event IEvent.BeforeEvent? BeforeCreateRoomEvent; - public event IEvent.AfterEvent? AfterCreateRoomEvent; - public event IEvent.SucceedEvent? SucceedCreateRoomEvent; - public event IEvent.FailedEvent? FailedCreateRoomEvent; - - public virtual EventResult OnBeforeCreateRoomEvent(GeneralEventArgs e) - { - if (BeforeCreateRoomEvent != null) - { - return BeforeCreateRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterCreateRoomEvent(GeneralEventArgs e) - { - if (AfterCreateRoomEvent != null) - { - return AfterCreateRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedCreateRoomEvent(GeneralEventArgs e) - { - if (SucceedCreateRoomEvent != null) - { - return SucceedCreateRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedCreateRoomEvent(GeneralEventArgs e) - { - if (FailedCreateRoomEvent != null) - { - return FailedCreateRoomEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/DisconnectEvent.cs b/FunGame.Core/Library/Common/Event/DisconnectEvent.cs deleted file mode 100644 index aacd68d..0000000 --- a/FunGame.Core/Library/Common/Event/DisconnectEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class DisconnectEvent : IDisconnectEvent - { - public event IEvent.BeforeEvent? BeforeDisconnectEvent; - public event IEvent.AfterEvent? AfterDisconnectEvent; - public event IEvent.SucceedEvent? SucceedDisconnectEvent; - public event IEvent.FailedEvent? FailedDisconnectEvent; - - public virtual EventResult OnBeforeDisconnectEvent(GeneralEventArgs e) - { - if (BeforeDisconnectEvent != null) - { - return BeforeDisconnectEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterDisconnectEvent(GeneralEventArgs e) - { - if (AfterDisconnectEvent != null) - { - return AfterDisconnectEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedDisconnectEvent(GeneralEventArgs e) - { - if (SucceedDisconnectEvent != null) - { - return SucceedDisconnectEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedDisconnectEvent(GeneralEventArgs e) - { - if (FailedDisconnectEvent != null) - { - return FailedDisconnectEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/EndGameEvent.cs b/FunGame.Core/Library/Common/Event/EndGameEvent.cs deleted file mode 100644 index f065dd0..0000000 --- a/FunGame.Core/Library/Common/Event/EndGameEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class EndGameEvent : IEndGameEvent - { - public event IEvent.BeforeEvent? BeforeEndGameEvent; - public event IEvent.AfterEvent? AfterEndGameEvent; - public event IEvent.SucceedEvent? SucceedEndGameEvent; - public event IEvent.FailedEvent? FailedEndGameEvent; - - public virtual EventResult OnBeforeEndGameEvent(GeneralEventArgs e) - { - if (BeforeEndGameEvent != null) - { - return BeforeEndGameEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterEndGameEvent(GeneralEventArgs e) - { - if (AfterEndGameEvent != null) - { - return AfterEndGameEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedEndGameEvent(GeneralEventArgs e) - { - if (SucceedEndGameEvent != null) - { - return SucceedEndGameEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedEndGameEvent(GeneralEventArgs e) - { - if (FailedEndGameEvent != null) - { - return FailedEndGameEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/IntoRoomEvent.cs b/FunGame.Core/Library/Common/Event/IntoRoomEvent.cs deleted file mode 100644 index 65def32..0000000 --- a/FunGame.Core/Library/Common/Event/IntoRoomEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class IntoRoomEvent : IIntoRoomEvent - { - public event IEvent.BeforeEvent? BeforeIntoRoomEvent; - public event IEvent.AfterEvent? AfterIntoRoomEvent; - public event IEvent.SucceedEvent? SucceedIntoRoomEvent; - public event IEvent.FailedEvent? FailedIntoRoomEvent; - - public virtual EventResult OnBeforeIntoRoomEvent(GeneralEventArgs e) - { - if (BeforeIntoRoomEvent != null) - { - return BeforeIntoRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterIntoRoomEvent(GeneralEventArgs e) - { - if (AfterIntoRoomEvent != null) - { - return AfterIntoRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedIntoRoomEvent(GeneralEventArgs e) - { - if (SucceedIntoRoomEvent != null) - { - return SucceedIntoRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedIntoRoomEvent(GeneralEventArgs e) - { - if (FailedIntoRoomEvent != null) - { - return FailedIntoRoomEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/LoginEvent.cs b/FunGame.Core/Library/Common/Event/LoginEvent.cs deleted file mode 100644 index 31cb261..0000000 --- a/FunGame.Core/Library/Common/Event/LoginEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class LoginEvent : ILoginEvent - { - public event IEvent.BeforeEvent? BeforeLoginEvent; - public event IEvent.AfterEvent? AfterLoginEvent; - public event IEvent.SucceedEvent? SucceedLoginEvent; - public event IEvent.FailedEvent? FailedLoginEvent; - - public virtual EventResult OnBeforeLoginEvent(GeneralEventArgs e) - { - if (BeforeLoginEvent != null) - { - return BeforeLoginEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterLoginEvent(GeneralEventArgs e) - { - if (AfterLoginEvent != null) - { - return AfterLoginEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedLoginEvent(GeneralEventArgs e) - { - if (SucceedLoginEvent != null) - { - return SucceedLoginEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedLoginEvent(GeneralEventArgs e) - { - if (FailedLoginEvent != null) - { - return FailedLoginEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/LogoutEvent.cs b/FunGame.Core/Library/Common/Event/LogoutEvent.cs deleted file mode 100644 index fcdc569..0000000 --- a/FunGame.Core/Library/Common/Event/LogoutEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class LogoutEvent : ILogoutEvent - { - public event IEvent.BeforeEvent? BeforeLogoutEvent; - public event IEvent.AfterEvent? AfterLogoutEvent; - public event IEvent.SucceedEvent? SucceedLogoutEvent; - public event IEvent.FailedEvent? FailedLogoutEvent; - - public virtual EventResult OnBeforeLogoutEvent(GeneralEventArgs e) - { - if (BeforeLogoutEvent != null) - { - return BeforeLogoutEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterLogoutEvent(GeneralEventArgs e) - { - if (AfterLogoutEvent != null) - { - return AfterLogoutEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedLogoutEvent(GeneralEventArgs e) - { - if (SucceedLogoutEvent != null) - { - return SucceedLogoutEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedLogoutEvent(GeneralEventArgs e) - { - if (FailedLogoutEvent != null) - { - return FailedLogoutEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/OpenInventoryEvent.cs b/FunGame.Core/Library/Common/Event/OpenInventoryEvent.cs deleted file mode 100644 index ce2d1ec..0000000 --- a/FunGame.Core/Library/Common/Event/OpenInventoryEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class OpenInventoryEvent : IOpenInventoryEvent - { - public event IEvent.BeforeEvent? BeforeOpenInventoryEvent; - public event IEvent.AfterEvent? AfterOpenInventoryEvent; - public event IEvent.SucceedEvent? SucceedOpenInventoryEvent; - public event IEvent.FailedEvent? FailedOpenInventoryEvent; - - public virtual EventResult OnBeforeOpenInventoryEvent(GeneralEventArgs e) - { - if (BeforeOpenInventoryEvent != null) - { - return BeforeOpenInventoryEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterOpenInventoryEvent(GeneralEventArgs e) - { - if (AfterOpenInventoryEvent != null) - { - return AfterOpenInventoryEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedOpenInventoryEvent(GeneralEventArgs e) - { - if (SucceedOpenInventoryEvent != null) - { - return SucceedOpenInventoryEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedOpenInventoryEvent(GeneralEventArgs e) - { - if (FailedOpenInventoryEvent != null) - { - return FailedOpenInventoryEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/OpenStoreEvent.cs b/FunGame.Core/Library/Common/Event/OpenStoreEvent.cs deleted file mode 100644 index fc5b5fd..0000000 --- a/FunGame.Core/Library/Common/Event/OpenStoreEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class OpenStoreEvent : IOpenStoreEvent - { - public event IEvent.BeforeEvent? BeforeOpenStoreEvent; - public event IEvent.AfterEvent? AfterOpenStoreEvent; - public event IEvent.SucceedEvent? SucceedOpenStoreEvent; - public event IEvent.FailedEvent? FailedOpenStoreEvent; - - public virtual EventResult OnBeforeOpenStoreEvent(GeneralEventArgs e) - { - if (BeforeOpenStoreEvent != null) - { - return BeforeOpenStoreEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterOpenStoreEvent(GeneralEventArgs e) - { - if (AfterOpenStoreEvent != null) - { - return AfterOpenStoreEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedOpenStoreEvent(GeneralEventArgs e) - { - if (SucceedOpenStoreEvent != null) - { - return SucceedOpenStoreEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedOpenStoreEvent(GeneralEventArgs e) - { - if (FailedOpenStoreEvent != null) - { - return FailedOpenStoreEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/QuitRoomEvent.cs b/FunGame.Core/Library/Common/Event/QuitRoomEvent.cs deleted file mode 100644 index 61be25a..0000000 --- a/FunGame.Core/Library/Common/Event/QuitRoomEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class QuitRoomEvent : IQuitRoomEvent - { - public event IEvent.BeforeEvent? BeforeQuitRoomEvent; - public event IEvent.AfterEvent? AfterQuitRoomEvent; - public event IEvent.SucceedEvent? SucceedQuitRoomEvent; - public event IEvent.FailedEvent? FailedQuitRoomEvent; - - public virtual EventResult OnBeforeQuitRoomEvent(GeneralEventArgs e) - { - if (BeforeQuitRoomEvent != null) - { - return BeforeQuitRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterQuitRoomEvent(GeneralEventArgs e) - { - if (AfterQuitRoomEvent != null) - { - return AfterQuitRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedQuitRoomEvent(GeneralEventArgs e) - { - if (SucceedQuitRoomEvent != null) - { - return SucceedQuitRoomEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedQuitRoomEvent(GeneralEventArgs e) - { - if (FailedQuitRoomEvent != null) - { - return FailedQuitRoomEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/RegEvent.cs b/FunGame.Core/Library/Common/Event/RegEvent.cs deleted file mode 100644 index 15890c2..0000000 --- a/FunGame.Core/Library/Common/Event/RegEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class RegEvent : IRegEvent - { - public event IEvent.BeforeEvent? BeforeRegEvent; - public event IEvent.AfterEvent? AfterRegEvent; - public event IEvent.SucceedEvent? SucceedRegEvent; - public event IEvent.FailedEvent? FailedRegEvent; - - public virtual EventResult OnBeforeRegEvent(GeneralEventArgs e) - { - if (BeforeRegEvent != null) - { - return BeforeRegEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterRegEvent(GeneralEventArgs e) - { - if (AfterRegEvent != null) - { - return AfterRegEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedRegEvent(GeneralEventArgs e) - { - if (SucceedRegEvent != null) - { - return SucceedRegEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedRegEvent(GeneralEventArgs e) - { - if (FailedRegEvent != null) - { - return FailedRegEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/SendTalkEvent.cs b/FunGame.Core/Library/Common/Event/SendTalkEvent.cs deleted file mode 100644 index fc70197..0000000 --- a/FunGame.Core/Library/Common/Event/SendTalkEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class SendTalkEvent : ISendTalkEvent - { - public event IEvent.BeforeEvent? BeforeSendTalkEvent; - public event IEvent.AfterEvent? AfterSendTalkEvent; - public event IEvent.SucceedEvent? SucceedSendTalkEvent; - public event IEvent.FailedEvent? FailedSendTalkEvent; - - public virtual EventResult OnBeforeSendTalkEvent(GeneralEventArgs e) - { - if (BeforeSendTalkEvent != null) - { - return BeforeSendTalkEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterSendTalkEvent(GeneralEventArgs e) - { - if (AfterSendTalkEvent != null) - { - return AfterSendTalkEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedSendTalkEvent(GeneralEventArgs e) - { - if (SucceedSendTalkEvent != null) - { - return SucceedSendTalkEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedSendTalkEvent(GeneralEventArgs e) - { - if (FailedSendTalkEvent != null) - { - return FailedSendTalkEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/ShowRankingEvent.cs b/FunGame.Core/Library/Common/Event/ShowRankingEvent.cs deleted file mode 100644 index d224f2a..0000000 --- a/FunGame.Core/Library/Common/Event/ShowRankingEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class ShowRankingEvent : IShowRankingEvent - { - public event IEvent.BeforeEvent? BeforeShowRankingEvent; - public event IEvent.AfterEvent? AfterShowRankingEvent; - public event IEvent.SucceedEvent? SucceedShowRankingEvent; - public event IEvent.FailedEvent? FailedShowRankingEvent; - - public virtual EventResult OnBeforeShowRankingEvent(GeneralEventArgs e) - { - if (BeforeShowRankingEvent != null) - { - return BeforeShowRankingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterShowRankingEvent(GeneralEventArgs e) - { - if (AfterShowRankingEvent != null) - { - return AfterShowRankingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedShowRankingEvent(GeneralEventArgs e) - { - if (SucceedShowRankingEvent != null) - { - return SucceedShowRankingEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedShowRankingEvent(GeneralEventArgs e) - { - if (FailedShowRankingEvent != null) - { - return FailedShowRankingEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/SignInEvent.cs b/FunGame.Core/Library/Common/Event/SignInEvent.cs deleted file mode 100644 index 094a999..0000000 --- a/FunGame.Core/Library/Common/Event/SignInEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class SignInEvent : ISignInEvent - { - public event IEvent.BeforeEvent? BeforeSignInEvent; - public event IEvent.AfterEvent? AfterSignInEvent; - public event IEvent.SucceedEvent? SucceedSignInEvent; - public event IEvent.FailedEvent? FailedSignInEvent; - - public virtual EventResult OnBeforeSignInEvent(GeneralEventArgs e) - { - if (BeforeSignInEvent != null) - { - return BeforeSignInEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterSignInEvent(GeneralEventArgs e) - { - if (AfterSignInEvent != null) - { - return AfterSignInEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedSignInEvent(GeneralEventArgs e) - { - if (SucceedSignInEvent != null) - { - return SucceedSignInEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedSignInEvent(GeneralEventArgs e) - { - if (FailedSignInEvent != null) - { - return FailedSignInEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/StartGameEvent.cs b/FunGame.Core/Library/Common/Event/StartGameEvent.cs deleted file mode 100644 index 2070656..0000000 --- a/FunGame.Core/Library/Common/Event/StartGameEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class StartGameEvent : IStartGameEvent - { - public event IEvent.BeforeEvent? BeforeStartGameEvent; - public event IEvent.AfterEvent? AfterStartGameEvent; - public event IEvent.SucceedEvent? SucceedStartGameEvent; - public event IEvent.FailedEvent? FailedStartGameEvent; - - public virtual EventResult OnBeforeStartGameEvent(GeneralEventArgs e) - { - if (BeforeStartGameEvent != null) - { - return BeforeStartGameEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterStartGameEvent(GeneralEventArgs e) - { - if (AfterStartGameEvent != null) - { - return AfterStartGameEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedStartGameEvent(GeneralEventArgs e) - { - if (SucceedStartGameEvent != null) - { - return SucceedStartGameEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedStartGameEvent(GeneralEventArgs e) - { - if (FailedStartGameEvent != null) - { - return FailedStartGameEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/StartMatchEvent.cs b/FunGame.Core/Library/Common/Event/StartMatchEvent.cs deleted file mode 100644 index 195c759..0000000 --- a/FunGame.Core/Library/Common/Event/StartMatchEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class StartMatchEvent : IStartMatchEvent - { - public event IEvent.BeforeEvent? BeforeStartMatchEvent; - public event IEvent.AfterEvent? AfterStartMatchEvent; - public event IEvent.SucceedEvent? SucceedStartMatchEvent; - public event IEvent.FailedEvent? FailedStartMatchEvent; - - public virtual EventResult OnBeforeStartMatchEvent(GeneralEventArgs e) - { - if (BeforeStartMatchEvent != null) - { - return BeforeStartMatchEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterStartMatchEvent(GeneralEventArgs e) - { - if (AfterStartMatchEvent != null) - { - return AfterStartMatchEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedStartMatchEvent(GeneralEventArgs e) - { - if (SucceedStartMatchEvent != null) - { - return SucceedStartMatchEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedStartMatchEvent(GeneralEventArgs e) - { - if (FailedStartMatchEvent != null) - { - return FailedStartMatchEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Core/Library/Common/Event/UseItemEvent.cs b/FunGame.Core/Library/Common/Event/UseItemEvent.cs deleted file mode 100644 index 1694e77..0000000 --- a/FunGame.Core/Library/Common/Event/UseItemEvent.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Milimoe.FunGame.Core.Interface; -using Milimoe.FunGame.Core.Library.Constant; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Milimoe.FunGame.Core.Library.Common.Event -{ - public class UseItemEvent : IUseItemEvent - { - public event IEvent.BeforeEvent? BeforeUseItemEvent; - public event IEvent.AfterEvent? AfterUseItemEvent; - public event IEvent.SucceedEvent? SucceedUseItemEvent; - public event IEvent.FailedEvent? FailedUseItemEvent; - - public virtual EventResult OnBeforeUseItemEvent(GeneralEventArgs e) - { - if (BeforeUseItemEvent != null) - { - return BeforeUseItemEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnAfterUseItemEvent(GeneralEventArgs e) - { - if (AfterUseItemEvent != null) - { - return AfterUseItemEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnSucceedUseItemEvent(GeneralEventArgs e) - { - if (SucceedUseItemEvent != null) - { - return SucceedUseItemEvent(this, e); - } - - return EventResult.Fail; - } - - public virtual EventResult OnFailedUseItemEvent(GeneralEventArgs e) - { - if (FailedUseItemEvent != null) - { - return FailedUseItemEvent(this, e); - } - - return EventResult.Fail; - } - } -} diff --git a/FunGame.Desktop/Model/MainModel.cs b/FunGame.Desktop/Model/MainModel.cs index e90867e..3e9330d 100644 --- a/FunGame.Desktop/Model/MainModel.cs +++ b/FunGame.Desktop/Model/MainModel.cs @@ -17,7 +17,6 @@ namespace Milimoe.FunGame.Desktop.Model public class MainModel { public Core.Library.Common.Network.Socket? Socket { get; private set; } - public Core.Library.Common.Event.ConnectEvent ConnectEvent { get; } = new ConnectEvent(); public Main Main { get; } private int CurrentRetryTimes = -1; @@ -87,6 +86,7 @@ namespace Milimoe.FunGame.Desktop.Model else { ShowMessage.ErrorMessage("查找可用的服务器失败！"); + Config.FunGame_isRetrying = false; throw new Exception("查找可用的服务器失败，请重启FunGame。"); } } @@ -112,6 +112,7 @@ namespace Milimoe.FunGame.Desktop.Model if (Others.Config.FunGame_isRetrying) { Main?.GetMessage("正在连接服务器，请耐心等待。"); + Config.FunGame_isRetrying= false; return ConnectResult.CanNotConnect; } if (!Others.Config.FunGame_isConnected) @@ -148,6 +149,7 @@ namespace Milimoe.FunGame.Desktop.Model Main?.GetMessage("ERROR: 连接超时，远程服务器没有回应。", false); } Socket?.Close(); + Config.FunGame_isRetrying = false; return ConnectResult.ConnectFailed; } } @@ -161,6 +163,7 @@ namespace Milimoe.FunGame.Desktop.Model catch (Exception e) { Main?.GetMessage(e.GetErrorInfo(), false); + Config.FunGame_isRetrying = false; } return ConnectResult.ConnectFailed;