Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Chat/FairyChatWin.cs

@@ -18,6 +18,9 @@
        [SerializeField] ChatContentBehaviour m_ChatContent;

        [SerializeField] RectTransform m_ContainerNoFairy;

        [SerializeField] Button m_JoinFairy;



        ChatCenter chatCenter { get { return ModelCenter.Instance.GetModel<ChatCenter>(); } }



        #region Built-in

        protected override void BindController()

        {

@@ -36,6 +39,9 @@
            ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

            m_ChatContent.chatType = ChatInfoType.Fairy;

            MyFairyRefresh();

            ChatCtrl.Inst.ViewChat(ChatInfoType.Fairy);

            ChatCtrl.Inst.lockUpdate = false;

            chatCenter.UpdateChatContentPos();

        }



        protected override void OnActived()