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

weixudong

2020-12-09 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125

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

@@ -119,7 +119,7 @@
        {
            List<EndlessBuffConfig> ret = new List<EndlessBuffConfig>();
            // 暂且先这么处理吧 如果1：火 2：水 3：木
            int attributeId = (int)Mathf.Floor(id / 10000f);
            int attributeId = (int)Mathf.Floor(id / 100f);

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