From 2925e7230a5593e0508e7758a5d97a98c6c09d68 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 07 十一月 2018 10:56:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerTaskDatas.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index ccc3af9..ff64cb3 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -319,7 +319,8 @@
WindowCenter.Instance.Close<MainInterfaceWin>();
}
}
-
+ VipModel m_Vipmodel;
+ VipModel vipmodel { get { return m_Vipmodel ?? (m_Vipmodel = ModelCenter.Instance.GetModel<VipModel>()); } }
private void OnEventTalkEvent(int taskID)//NPC瀵硅瘽鍚庣殑寮规
{
//if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())
@@ -356,14 +357,13 @@
}
else
{
- if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))
+ if (BountyDic.ContainsKey(_TaskNow) || (FairyAuDic.ContainsKey(_TaskNow)&& vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1))
{
if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
{
RequestGetTaskAward("OK");
}
}
-
}
}
else
--
Gitblit v1.8.0