Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-12-27 b5651b96bb1bfd53341af7fbe4cb46db54dee58c

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -20,6 +20,7 @@
        [SerializeField] Text winStreakText;

        [SerializeField] Button buyTimesBtn;

        [SerializeField] Button matchRecordBtn;

        [SerializeField] RedpointBehaviour matchRedPointBeh;

        [SerializeField] GameObject inSeasonTimeObj;

        [SerializeField] GameObject outSeasonTimeObj;

        [SerializeField] GameObject lookPlayerObj;

@@ -216,6 +217,7 @@


        private void OnStartMatch()

        {

            matchRedPointBeh.gameObject.SetActive(false);

            lookPlayerObj.SetActive(true);

            crossServerModel.matchStartTime = DateTime.Now;

            UpdateLookPlayerTime();

@@ -228,6 +230,7 @@
            if(type == 0)

            {

                crossServerModel.IsMatching = false;

                matchRedPointBeh.gameObject.SetActive(true);

                lookPlayerObj.SetActive(false);

                UpdateActivityState();

            }