Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle

wangguan

2020-11-27 6c547fcd89adf90eb67a2d077934eca97ecd1959

 Assets/Scripts/ActionGameFramework/Health/Targetable.cs

@@ -85,6 +85,11 @@
        /// </summary>
        public ParticleSystem FrostParticle;

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

        protected Color mMatColor;

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

        /// <summary>