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

weixudong

2020-11-19 69e0fea6c92fd4e153d45e5f26ef89baecf0405a

 Assets/Scripts/Data/EndlessBuffData.cs

@@ -80,9 +80,9 @@
        /// <returns></returns>
        private static List<Color> rareColorList = new List<Color>()
        {
            new Color(118 / 255f, 1, 118 / 255f),
            new Color(131 / 255f, 181 / 255f, 1),
            new Color(220 / 255f, 112 / 255f, 1),
            new Color(68f / 255f, 148f / 255f, 57f / 255f),
            new Color(74f / 255f, 124f / 255f, 207f / 255f),
            new Color(149f / 255f, 79f / 255f, 214f / 255f),
        };

        public static void Init()
@@ -195,6 +195,22 @@
        }

        /// <summary>
        /// 根据buff配置表id获取buff数据
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public static EndlessBuffConfig GetBuffById(int id)
        {
            for (int i = 0; i < endlessBuffPool.Count; ++i)
            {
                if (endlessBuffPool[i].Config.id == id)
                    return endlessBuffPool[i];
            }

            return null;
        }

        /// <summary>
        /// 根据品质获得颜色值
        /// </summary>
        /// <param name="rare"></param>