From e528da473ca715b5a8304c63693daa10fa87f9dc Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 03 一月 2019 16:57:06 +0800
Subject: [PATCH] Revert "2792 【1.4】【BUG】跨服匹配战斗中出现未加入仙盟提示信息"

---
 System/KnapSack/Logic/PackSendQuestMgr.cs |    5 +----
 System/WindowJump/WindowJumpMgr.cs        |   15 +++------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index b5a9088..edae4bf 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/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;
             }
 
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 61ffcb1..6f3745e 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/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;

--
Gitblit v1.8.0