Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-09-19 6cc9f56e28978bede19629ce50947b9609080da5

 System/FriendSystem/New/FriendsModel.cs

@@ -911,6 +911,11 @@
            else

            {

                ChatCtrl.Inst.presentChatType = ChatInfoType.Friend;

                if (WindowCenter.Instance.CheckOpen<SocialWin>())

                {

                    WindowJumpMgr.Instance.ClearJumpData();

                    WindowCenter.Instance.CloseImmediately<SocialWin>();

                }

                WindowCenter.Instance.Open<ChatWin>();

            }

        }