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

Client_PangDeRong

2018-09-01 379663dd5e7c0da4025fc6867dfb13f11a3bc946

 System/WindowJump/WindowJumpMgr.cs

@@ -102,7 +102,6 @@
            case JumpUIType.UnionFunc2:

            case JumpUIType.UnionWarehouse:

            case JumpUIType.UnionHall:

            case JumpUIType.UnionMethod:

            case JumpUIType.UnionTask:

            case JumpUIType.UnionTask2:

            case JumpUIType.UnionActive1:

@@ -113,6 +112,13 @@
                    return;

                }

                break;

            case JumpUIType.UnionMethod:

                if (!fairyModel.fairyMethodToOpen)

                {

                    fairyModel.ProcessMethodToErrorTip();

                    return;

                }

                break;

            case JumpUIType.UnionStore:

                if(!fairyModel.fairyStoreOpen)

                {