Revert "2792 【1.4】【BUG】跨服匹配战斗中出现未加入仙盟提示信息"

client_linchunjie

2019-01-03 e528da473ca715b5a8304c63693daa10fa87f9dc

Revert "2792 【1.4】【BUG】跨服匹配战斗中出现未加入仙盟提示信息"

This reverts commit 7d13e4a5f93ca1c24f92568e6c6c868a455feab0.

 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -823,10 +823,7 @@
            if (itemModel.chinItemModel.Effect1 == 209

            && !PlayerDatas.Instance.fairyData.HasFairy)

            {

                if (PlayerDatas.Instance.baseData.ExAttr5 != 1)

                {

                    SysNotifyMgr.Instance.ShowTip("jiazu_andyshao_0");

                }

                SysNotifyMgr.Instance.ShowTip("jiazu_andyshao_0");

                return;

            }




 System/WindowJump/WindowJumpMgr.cs

@@ -730,30 +730,21 @@
            case JumpUIType.UnionBoss:

                if (!PlayerDatas.Instance.fairyData.HasFairy)

                {

                    if (PlayerDatas.Instance.baseData.ExAttr5 != 1)

                    {

                        SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

                    }

                    SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

                    return false;

                }

                break;

            case JumpUIType.UnionMethod:

                if (!fairyModel.fairyMethodToOpen)

                {

                    if (PlayerDatas.Instance.baseData.ExAttr5 != 1)

                    {

                        fairyModel.ProcessMethodToErrorTip();

                    }

                    fairyModel.ProcessMethodToErrorTip();

                    return false;

                }

                break;

            case JumpUIType.UnionStore:

                if (!fairyModel.fairyStoreOpen)

                {

                    if (PlayerDatas.Instance.baseData.ExAttr5 != 1)

                    {

                        fairyModel.ProcessErrorTip();

                    }

                    fairyModel.ProcessErrorTip();

                    return false;

                }

                break;