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

client_Zxw

2018-09-19 6cc9f56e28978bede19629ce50947b9609080da5

 System/WindowJump/WindowJumpMgr.cs

@@ -628,7 +628,16 @@
            case JumpUIType.UnionChat1:

            case JumpUIType.UnionChat2:

                ChatCtrl.Inst.presentChatType = (ChatInfoType)(int.Parse(_tagWinSearchModel.SelectActive) - 1);

                SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);

                switch (ChatCtrl.Inst.presentChatType)

                {

                    case ChatInfoType.Team:

                    case ChatInfoType.Fairy:

                        SetJumpLogic<SocialWin>(_tagWinSearchModel.TABID);

                        break;

                    default:

                        SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);

                        break;

                }

                break;

            case JumpUIType.MakeDrug:

                if (PackSendQuestMgr.Instance.useItemModel != null)