Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Chat/ChatMineVoiceCell.cs

@@ -14,6 +14,7 @@
        [SerializeField] Image m_ChatBubble;

        [SerializeField] Text vipText;

        [SerializeField] Text playerNameText;

        [SerializeField] Text m_ChatTime;

        [SerializeField] Image m_ChatIcon;

        [SerializeField] ImageFitterText m_Fitter;



@@ -50,6 +51,7 @@


            m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(_data.job, 0));

            playerNameText.text = _data.name;

            m_ChatTime.text = _data.createTime.ToString("yyyy-MM-dd HH:mm");
            if (_data.vipLv > 0)

            {

                vipText.text = string.Format("V{0}", _data.vipLv);