Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Wu Xijin

2018-12-19 819fe0978ef216322cbce9ea2f5af2316e2fa8e6

 System/CrossServerOneVsOne/CrossServerWin.cs

@@ -22,6 +22,7 @@
        [SerializeField] Text honorText;

        [SerializeField] Slider scoreSlider;

        [SerializeField] Text scorePerText;

        [SerializeField] GameObject danLvUpObj;

        [SerializeField] Button scoreRankBtn;

        [SerializeField] Button rankAwardBtn;

        [SerializeField] Button arenaBtn;

@@ -95,6 +96,7 @@
            curScoreText.text = crossServerModel.pkResultInfo.CurScore.ToString();

            int maxScore = 0;

            bool isMaxRank = crossServerModel.TryGetMaxRank(out maxScore);

            danLvUpObj.SetActive(!isMaxRank);

            if (!isMaxRank)

            {

                scorePerText.text = StringUtility.Contact(crossServerModel.pkResultInfo.CurScore, "/", maxScore);