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

chenxin

2020-10-22 85f0d13945f3aef5aef1b3c1b47c77cea0514c17

 Assets/Scripts/Data/EndlessPortData.cs

@@ -179,7 +179,8 @@

                    int val = random.Next(waveData[i].DropTotalWeight);

                    if (val <= waveData[i].Config.drop_rate[j])
                    // cx test
                    // if (val <= waveData[i].Config.drop_rate[j])
                        // 命中
                        ret.Add(waveData[i].Config.drop[j]);
                }