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

chenxin

2020-12-11 f4b2230e6456f4e5c05e8535834a693a55fce0a2

 Assets/Scripts/TowerDefense/Level/EndlessBuff/CritDamageAdd.cs

@@ -11,11 +11,10 @@
        /// 根据宝石id获得暴击增加的伤害比率（千分比）
        /// </summary>
        /// <param name="gemId"></param>
        /// <param name="preDamage"></param>
        /// <returns></returns>
        public float GetCritDamageRate(int gemId, float preDamage = 0)
        public float GetCritDamageRate(int gemId)
        {
            float ret = preDamage;
            float ret = 0;

            for (int i = 0; i < BuffList.Count; ++i)
            {