From 63cfa19949d8f0ee86f04123dea17ed456ed4398 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 23 十一月 2018 22:54:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerTaskDatas.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 94df486..9e1880f 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -1456,8 +1456,6 @@
public static bool IsOPenAutoResolve()//浠诲姟闈㈡澘涓嶅紑鍚嚜鍔ㄦ寕鏈虹姸鎬�
{
- WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>();
- WindowCenter.Instance.IsOpen<DialogueDuidanceWin>();
bool _bool = true;
if (WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())
{
@@ -1575,12 +1573,13 @@
}
public void TaskMove(int _taskID)
{
- if (MainTaskDic.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
+ if (allMissionDict.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
{
string _strTest = allMissionDict[_taskID].InforList;
string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);
HrefAnalysis.Inst.ExcuteHrefEvent(strTask);
DropItemManager.StopMissionPickup = false;
+ TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
}
}
}
--
Gitblit v1.8.0