Merge commit '323055bb1b4c9b5669676dd799238050279b7d7a' into master

chenxin

2020-11-05 d6161eec964b2eeb23bd93c84c29f8ffd3a2d06f

 Assets/Scripts/Data/EndlessBuffData.cs

@@ -78,7 +78,6 @@
            new Color(118 / 255f, 1, 118 / 255f),
            new Color(131 / 255f, 181 / 255f, 1),
            new Color(220 / 255f, 112 / 255f, 1),
            new Color()
        };

        public static void Init()
@@ -109,9 +108,6 @@
                }
                allEndlessConfig.Add(newConfig);
            }

            InitEndlessBuffPool(1);
            GetRandomBuffList();
        }

        /// <summary>