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

client_linchunjie

2018-09-17 21a37c61e717908a25a017ce63d7d21b94e5f17a

 System/PlayerDead/RebornWin.cs

@@ -6,6 +6,7 @@
using System;

using System.Collections;

using System.Collections.Generic;

using System.Text;

using UnityEngine;

using UnityEngine.Events;

using UnityEngine.UI;

@@ -123,7 +124,15 @@
        private void OnHideBtnlist()

        {

            _btnlist.SetActive(false);

            _rebornWorldText.text = Language.Get("PlayerReborn104");

            StringBuilder builder;

            if(DeadModel.CheckIsRealmSuppress(out builder))

            {

                _rebornWorldText.text = Language.Get("PlayerReborn106",builder.ToString());

            }

            else

            {

                _rebornWorldText.text = Language.Get("PlayerReborn104");

            }

            _timeDownText.gameObject.SetActive(true);

        }

        private void RefreshAutoRebornTime(float obj)