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

client_Zxw

2018-09-19 6cc9f56e28978bede19629ce50947b9609080da5

 System/Chat/ChatTip.cs

@@ -154,6 +154,7 @@
        if (mapId == 31230)

        {

            ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

            WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

            WindowCenter.Instance.Open<SocialWin>(false, 2);

            return;

        }

@@ -226,9 +227,11 @@
        switch (ChatCtrl.Inst.presentChatType)

        {

            case ChatInfoType.Team:

                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

                WindowCenter.Instance.Open<SocialWin>(false, 1);

                break;

            case ChatInfoType.Fairy:

                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

                WindowCenter.Instance.Open<SocialWin>(false, 2);

                break;

            default: