From 09354f7b3a308247924889947d4d9ea2ea0e552b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 23 十一月 2018 11:49:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskAllocation.cs | 6 ++++++
System/MainInterfacePanel/CoinTaskWin.cs | 2 ++
System/MainInterfacePanel/PlayerTaskDatas.cs | 1 +
System/FairyAu/FairyAuTaskWin.cs | 1 +
System/MainInterfacePanel/FlyingShoesTask.cs | 5 +++++
5 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/System/FairyAu/FairyAuTaskWin.cs b/System/FairyAu/FairyAuTaskWin.cs
index 9f07577..9b227a2 100644
--- a/System/FairyAu/FairyAuTaskWin.cs
+++ b/System/FairyAu/FairyAuTaskWin.cs
@@ -203,6 +203,7 @@
WindowCenter.Instance.CloseImmediately<FairyAuTaskWin>();
WindowCenter.Instance.Open<MainInterfaceWin>();
ObjectiveText.ExcuteHref();
+ TaskAllocation.Instance.TaskTime = DateTime.Now;
}
void CloseButton()//鍏抽棴鎸夐挳
diff --git a/System/MainInterfacePanel/CoinTaskWin.cs b/System/MainInterfacePanel/CoinTaskWin.cs
index e9dbacd..a64f86f 100644
--- a/System/MainInterfacePanel/CoinTaskWin.cs
+++ b/System/MainInterfacePanel/CoinTaskWin.cs
@@ -10,6 +10,7 @@
using System.Text;
using System.Text.RegularExpressions;
using Snxxz.UI;
+using System;
//璧忛噾浠诲姟闈㈡澘
namespace Snxxz.UI
{
@@ -281,6 +282,7 @@
void Forward()
{
_Text_TaskTarget.ExcuteHref();
+ TaskAllocation.Instance.TaskTime = DateTime.Now;
WindowCenter.Instance.CloseImmediately<TaskWin>();
WindowCenter.Instance.Open<MainInterfaceWin>();
}
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 68ad7ae..33e7102 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -9,6 +9,7 @@
using System.Collections.Generic;
using Snxxz.UI;
using System.Text.RegularExpressions;
+using System;
//鍏充簬椋為瀷浠诲姟
namespace Snxxz.UI
{
@@ -168,6 +169,7 @@
{
HeroAIRecorder.ClearRecord();
ContentText.ExcuteHref();
+ TaskAllocation.Instance.TaskTime = DateTime.Now;
OpenPanel(Task_ID);
}
@@ -281,12 +283,14 @@
if (ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0)
{
HeroAIRecorder.ClearRecord();
+ TaskAllocation.Instance.TaskTime= DateTime.Now;
m_ContentText.ExcuteHref(1);
return;
}
if (itemNumber > 0)
{
HeroAIRecorder.ClearRecord();
+ TaskAllocation.Instance.TaskTime = DateTime.Now;
m_ContentText.ExcuteHref(1);
}
else
@@ -297,6 +301,7 @@
if (NeedMoney >= 1)
{
HeroAIRecorder.ClearRecord();
+ TaskAllocation.Instance.TaskTime = DateTime.Now;
m_ContentText.ExcuteHref(1);
}
else
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 94df486..508df0b 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -1581,6 +1581,7 @@
string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);
HrefAnalysis.Inst.ExcuteHrefEvent(strTask);
DropItemManager.StopMissionPickup = false;
+ TaskAllocation.Instance.TaskTime = DateTime.Now;
}
}
}
diff --git a/System/MainInterfacePanel/TaskAllocation.cs b/System/MainInterfacePanel/TaskAllocation.cs
index 2dc7d15..a780538 100644
--- a/System/MainInterfacePanel/TaskAllocation.cs
+++ b/System/MainInterfacePanel/TaskAllocation.cs
@@ -8,6 +8,7 @@
using System.Text;
using System.Text.RegularExpressions;
using System.Collections.Generic;
+using System;
//鐢ㄤ簬浠诲姟鍒嗛厤
namespace Snxxz.UI
{
@@ -154,6 +155,11 @@
});
}
}
+ public DateTime TaskTime
+ {
+ get;
+ set;
+ }
}
}
--
Gitblit v1.8.0