Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-22 b84b0ce057d11bcb5d07ea2999435c1c0cf5bf43

Merge branch 'master' into ItemReconstruction

 System/ClientVersion/VersionConfig.cs

@@ -247,7 +247,7 @@
                var input = lhsStrings[i];

                var intTemp = 0;

                int.TryParse(input, out intTemp);

                version1 += intTemp * MathUtility.Power(1000, lhsStrings.Length - i);

                version1 += intTemp * MathUtility.Power(1000, lhsStrings.Length -1- i);

            }



            var version2 = 0;

@@ -256,7 +256,7 @@
                var input = rhsStrings[i];

                var intTemp = 0;

                int.TryParse(input, out intTemp);

                version2 += intTemp * MathUtility.Power(1000, rhsStrings.Length - i);

                version2 += intTemp * MathUtility.Power(1000, rhsStrings.Length -1- i);

            }



            return version1 > version2 ? _lhs : _rhs;


 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);