From 7e2383dba1cf69922323c8d9a723b65c67b5bb03 Mon Sep 17 00:00:00 2001
From: yangjing <phantomj@126.com>
Date: Sun, 9 Oct 2022 17:30:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=B0=8F=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Game/BlockManager.cs              | 2 +-
 Assets/Scripts/Game/Wars/Soldiers/AvatarGroup.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Assets/Scripts/Game/BlockManager.cs b/Assets/Scripts/Game/BlockManager.cs
index 39b81c4a..189e52fd 100644
--- a/Assets/Scripts/Game/BlockManager.cs
+++ b/Assets/Scripts/Game/BlockManager.cs
@@ -512,7 +512,7 @@ public class BlockManager : MonoBehaviour
 
     private void DisplayNewUnit(BlockUnit pUnit, bool pIsMerge = false)
     {
-        int tMergeFxID = pIsMerge ? PlayerData.Instance.CurrentPetID : -1;
+        //int tMergeFxID = pIsMerge ? PlayerData.Instance.CurrentPetID : -1;
         GameObject tFx = ResourceManager.Instance.LoadRes<GameObject>(Const.Path.GetMergeFxByLevel(pUnit.Level));
         Instantiate(tFx, pUnit.transform.position, Quaternion.identity);
 
diff --git a/Assets/Scripts/Game/Wars/Soldiers/AvatarGroup.cs b/Assets/Scripts/Game/Wars/Soldiers/AvatarGroup.cs
index dc87c012..5249601b 100644
--- a/Assets/Scripts/Game/Wars/Soldiers/AvatarGroup.cs
+++ b/Assets/Scripts/Game/Wars/Soldiers/AvatarGroup.cs
@@ -13,6 +13,10 @@ public class AvatarGroup : MonoBehaviour
     {
         //mAnimators = GetComponentsInChildren<Animator>();
         mAnimators = new Animator[1] { GetComponentInChildren<Animator>()};
+        foreach (var item in mAnimators)
+        {
+            item.applyRootMotion = false;
+        }
 
         if (GameConfig.Instance.IsSimpleAni)
         {