Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

4 天以前 b19666d8acba43e715688da14fe19f029050e588

 Main/System/Battle/BattleObject/BattleObject.cs

@@ -294,6 +294,8 @@
            }
        }



        bool isFatalAttack = (null != deadPack) && isLastHit;

        if (isFatalAttack)
@@ -307,10 +309,18 @@
        }
        else
        {
            if ((dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage()))
            if (dmgInfo.IsType(DamageType.Block))
            {
                motionBase.PlayAnimation(MotionName.hit, false);
                battleField.battleEffectMgr.PlayEffect(this, 19999, heroRectTrans, Camp);
            }
            else
            {
                if ((dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage()))
                {
                    motionBase.PlayAnimation(MotionName.hit, false);
                }
            }

        }