Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-22 b84b0ce057d11bcb5d07ea2999435c1c0cf5bf43

 System/CrossServerOneVsOne/RankCellCtrl.cs

@@ -117,7 +117,7 @@
        {

            var config = CrossServerArenaConfig.Get(Danlv);

            m_SegmentTxt.text = config.Name;

            m_SegmentTxt.color = UIHelper.GetDanLVColor(Danlv, false);

            m_SegmentTxt.color = UIHelper.GetDanLVColor(Danlv, true);

            //if (Danlv >= 24)

            //{

            //    m_SegmentTxt.color = new Color32(255, 3, 3, 255);