Merge commit '8681be3c80a3b6837e578290fd2fef5bf6b14a14' into master

chenxin

2020-11-25 4e582c6a8eaf19976b93314ba896e542d7c732dd

 Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs

@@ -62,15 +62,18 @@
                switch (buffList[i].UseTarget)
                {
                    case EndlessBuffUseTarget.All:
                        addArr[0] += buffList[i].Config.buff_effect[1];
                        addArr[1] += buffList[i].Config.buff_effect[1];
                        addArr[2] += buffList[i].Config.buff_effect[1];
                        addArr[0] += (int)buffList[i].Config.buff_effect[1];
                        addArr[1] += (int)buffList[i].Config.buff_effect[1];
                        addArr[2] += (int)buffList[i].Config.buff_effect[1];
                        break;
                    case EndlessBuffUseTarget.Element:
                        addArr[buffList[i].Config.target_type[1] - 1] += buffList[i].Config.buff_effect[1];
                        addArr[(int)buffList[i].Config.target_type[1] - 1] += (int)buffList[i].Config.buff_effect[1];
                        break;
                    case EndlessBuffUseTarget.Designated:
                        break;
                    case EndlessBuffUseTarget.SkillLevelUp:
                        break;

                }
            }