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(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(); mAnimators = new Animator[1] { GetComponentInChildren()}; + foreach (var item in mAnimators) + { + item.applyRootMotion = false; + } if (GameConfig.Instance.IsSimpleAni) {