From b8b99e24035d9309e4fd4c5c0e0db52d38e06f61 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 22 十一月 2018 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerTaskDatas.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index c50edb6..94df486 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -324,8 +324,6 @@
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())
@@ -362,7 +360,7 @@
}
else
{
- if (BountyDic.ContainsKey(_TaskNow) || (FairyAuDic.ContainsKey(_TaskNow)&& vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1))
+ if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))
{
if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
{
@@ -1577,7 +1575,7 @@
}
public void TaskMove(int _taskID)
{
- if (allMissionDict.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
+ if (MainTaskDic.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
{
string _strTest = allMissionDict[_taskID].InforList;
string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);
--
Gitblit v1.8.0