Merge commit '2940e451058b1af7541ff651f485f33a10e92f7e' into master

chenxin

2020-11-07 d35d31d85fd4b827dc37008aef39c019b6a7781d

 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;
@@ -64,6 +74,16 @@
        /// 中毒结束播放的粒子特效
        /// </summary>
        public ParticleSystem PoisonEndParticle;

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

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

        protected Color mMatColor;

@@ -138,8 +158,8 @@
        public void addSpeedSlowRate(float rate)
        {
            speedSlowRate += rate;
            if (speedSlowRate >= 0.5f)
                speedSlowRate = 0.5f;
            if (speedSlowRate >= 0.6f)
                speedSlowRate = 0.6f;
        }

        /// <summary>