From eec5d6d844ddc23eca705ddf3dff9d4a2140f701 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期六, 25 八月 2018 10:20:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/Actor/Skill/AttackHandler.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Fight/Actor/Skill/AttackHandler.cs b/Fight/Actor/Skill/AttackHandler.cs
index 059b4e3..ff8237b 100644
--- a/Fight/Actor/Skill/AttackHandler.cs
+++ b/Fight/Actor/Skill/AttackHandler.cs
@@ -122,7 +122,7 @@
if (CheckPull(attacker, target, soConfig.bodyControlId))
{
- target.StartBeatBack(soConfig.bodyControlId, MathUtility.ForwardXZ(target.Pos, attacker.Pos));
+ target.StartBeatBack(attacker.ServerInstID, soConfig.bodyControlId, MathUtility.ForwardXZ(target.Pos, attacker.Pos));
}
}
@@ -1080,7 +1080,7 @@
// 鏀诲嚮鑰呮槸鐜╁
if (attacker.ActorType == GameObjType.gotPlayer)
{
- return false;
+ return _bodyControl.useForPlayer && target.CanPushedBack();
}
else if (attacker.ActorType == GameObjType.gotNPC)
{
--
Gitblit v1.8.0