From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Chat/TeamChatWin.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/System/Chat/TeamChatWin.cs b/System/Chat/TeamChatWin.cs
index 812c682..f30097c 100644
--- a/System/Chat/TeamChatWin.cs
+++ b/System/Chat/TeamChatWin.cs
@@ -17,6 +17,7 @@
[SerializeField] ChatContentBehaviour m_ChatContent;
[SerializeField] RectTransform m_NoTeamContainer;
TeamModel team { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
+ ChatCenter chatCenter { get { return ModelCenter.Instance.GetModel<ChatCenter>(); } }
#region Built-in
protected override void BindController()
{
@@ -33,6 +34,9 @@
ChatCtrl.Inst.presentChatType = ChatInfoType.Team;
m_ChatContent.chatType = ChatInfoType.Team;
MyTeamRefresh();
+ ChatCtrl.Inst.ViewChat(ChatInfoType.Team);
+ ChatCtrl.Inst.lockUpdate = false;
+ chatCenter.UpdateChatContentPos();
}
protected override void OnActived()
--
Gitblit v1.8.0