diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs b/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs index 78e98716c8..713bd01136 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs @@ -55,7 +55,7 @@ class CECHPWorkMelee : CECHPWork // If target turn to be un-attackable, cancel action if (m_pHost.AttackableJudge(m_idTarget, true) == 0) { - //UnityGameSession.c2s_CmdCancelAction(); + UnityGameSession.c2s_CmdCancelAction(); //g_pGame.GetGameSession().c2s_CmdCancelAction(); m_bFinished = true; return true; diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs index 408d365101..c6759f9d89 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs @@ -421,5 +421,10 @@ namespace CSNetwork.C2SCommand }; return SerializeCommand(CommandID.NORMAL_ATTACK, cmd); } + + public static Octets CreateNakeCmd(CommandID iCmd) + { + return SerializeCommand(iCmd); + } } } diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs index 8457ee20aa..7ec3dfbe0f 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs @@ -741,5 +741,12 @@ namespace CSNetwork gamedatasend.Data = C2SCommandFactory.CreateNormalAttackDataCmd(byPVPMask); SendProtocol(gamedatasend); } + + public void c2s_CmdCancelAction() + { + gamedatasend gamedatasend = new gamedatasend(); + gamedatasend.Data = C2SCommandFactory.CreateNakeCmd(CSNetwork.C2SCommand.CommandID.CANCEL_ACTION); + SendProtocol(gamedatasend); + } } } diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/obj/Debug/netstandard2.1/CSNetwork.dll b/Assets/PerfectWorld/Scripts/Network/CSNetwork/obj/Debug/netstandard2.1/CSNetwork.dll deleted file mode 100644 index 3f28de2e06..0000000000 Binary files a/Assets/PerfectWorld/Scripts/Network/CSNetwork/obj/Debug/netstandard2.1/CSNetwork.dll and /dev/null differ diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/obj/Debug/netstandard2.1/CSNetwork.dll.meta b/Assets/PerfectWorld/Scripts/Network/CSNetwork/obj/Debug/netstandard2.1/CSNetwork.dll.meta deleted file mode 100644 index 73df0221aa..0000000000 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/obj/Debug/netstandard2.1/CSNetwork.dll.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: e3cf084cf53b24fe7a6bffb17846d608 \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs index 252720bce4..8a6928689e 100644 --- a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs +++ b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs @@ -189,6 +189,11 @@ namespace BrewMonster.Network Instance._gameSession.c2s_CmdNormalAttack(byPVPMask); } + public static void c2s_CmdCancelAction() + { + Instance._gameSession.c2s_CmdCancelAction(); + } + #region Task public static void c2s_CmdGetAllData(bool byPack, bool byEquip, bool byTask) {