Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 703337574c8d4d4e852ea90c778e3aff3523ce12

 System/MainInterfacePanel/ChatFrame.cs

@@ -307,6 +307,7 @@
            //MainRedDot.Instance.redPointFriendChat.state = RedPointState.None;

            //ChatCtrl.Inst.presentChatType = ChatInfoType.Friend;

            //WindowCenter.Instance.Open<ChatWin>();

            WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

            WindowCenter.Instance.Open<SocialWin>();

        }