From dc8056fb410eba45c5acde347b3baecdbf8e95df Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 09 一月 2019 15:28:54 +0800
Subject: [PATCH] 382 修改技能普攻击退移动逻辑; 增加易乐支付的时候传给sdk服务器id逻辑

---
 Core/SDK/SDKUtility.cs         |    3 ++-
 Fight/GameActor/GActorFight.cs |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index 6aee875..b288485 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -892,7 +892,8 @@
                         m_Json["title"] = title;
 
                         if(ChannelPlatform == E_ChannelPlatform.Mr
-                        || ChannelPlatform == E_ChannelPlatform.Sp)
+                        || ChannelPlatform == E_ChannelPlatform.Sp
+                        || ChannelPlatform == E_ChannelPlatform.Yl)
                         {
                             m_Json["roleID"] = PlayerDatas.Instance.baseData.PlayerID;
                             m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
diff --git a/Fight/GameActor/GActorFight.cs b/Fight/GameActor/GActorFight.cs
index 0ad9dbc..8b6cb27 100644
--- a/Fight/GameActor/GActorFight.cs
+++ b/Fight/GameActor/GActorFight.cs
@@ -262,13 +262,13 @@
             return;
         }
 
-        float _dis = MathUtility.DistanceSqrtXZ(_attacker.Pos, _end);
+        float _dis = MathUtility.DistanceSqrtXZ(m_StartBeatPos, _end);
 
         if (m_PushOrPull)
         {
-            if (MathUtility.DistanceSqrtXZ(_attacker.Pos, _end) > m_LimitDistance * m_LimitDistance)
+            if (MathUtility.DistanceSqrtXZ(m_StartBeatPos, _end) > m_LimitDistance * m_LimitDistance)
             {
-                _end = _attacker.Pos + m_BeatDirection * m_LimitDistance;
+                _end = m_StartBeatPos + m_BeatDirection * m_LimitDistance;
             }
         }
         else

--
Gitblit v1.8.0