Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 System/Message/MessageWin.cs

@@ -40,6 +40,7 @@


        public void ShowFixedTip(string tip, ArrayList infoList = null)

        {

            transform.SetAsLastSibling();

            m_FixedTip0.SetExtenalData(infoList);

            m_FixedTip0.text = tip;

            if (!m_ContianerFixedTip0.gameObject.activeInHierarchy)

@@ -51,6 +52,7 @@


        public void ShowFixedTips(string tip, ArrayList infoList = null)

        {

            transform.SetAsLastSibling();

            var _index = m_FixedTipDisplays.FindIndex((x) =>

             {

                 return !x;

@@ -94,6 +96,7 @@
            {

                return;

            }

            transform.SetAsLastSibling();

            var _hint = ServerTipDetails.RequireServerTip();

            if (_hint != null)

            {