Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master

chenxin

2020-10-28 56f231f1f6523d7920cf32f033f9bb6f0015550f

 Assets/Scripts/ActionGameFramework/Health/Targetable.cs

@@ -56,6 +56,16 @@
        protected bool isPoison;

        /// <summary>
        /// 是否处于减速状态
        /// </summary>
        protected bool isSlowDown;

        /// <summary>
        /// 是否处于冰冻状态
        /// </summary>
        protected bool isFrost;

        /// <summary>
        /// 中毒粒子特效
        /// </summary>
        public ParticleSystem PoisonParticle;
@@ -65,6 +75,16 @@
        /// </summary>
        public ParticleSystem PoisonEndParticle;

        /// <summary>
        /// 减速粒子特效
        /// </summary>
        public ParticleSystem SlowDownParticle;

        /// <summary>
        /// 冰冻特效
        /// </summary>
        public ParticleSystem FrostParticle;

        protected Color mMatColor;

        /// <summary>