Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

weixudong

2020-11-19 69e0fea6c92fd4e153d45e5f26ef89baecf0405a

 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,21 @@
        /// </summary>
        public ParticleSystem PoisonEndParticle;

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

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

        /// <summary>
        /// 被火技能攻击特效
        /// </summary>
        public ParticleSystem FireSkillParticle;

        protected Color mMatColor;

        /// <summary>