From ce7eadef64a5705c232ad1f46f866566668dee8a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 23 十一月 2018 19:51:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskAllocation.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/TaskAllocation.cs b/System/MainInterfacePanel/TaskAllocation.cs
index 357691a..588684c 100644
--- a/System/MainInterfacePanel/TaskAllocation.cs
+++ b/System/MainInterfacePanel/TaskAllocation.cs
@@ -14,17 +14,15 @@
{
[XLua.LuaCallCSharp]
-public class TaskAllocation : Singleton<TaskAllocation>
+ public class TaskAllocation : Singleton<TaskAllocation>
{
private static StringBuilder textBuilder = new StringBuilder();
private const string Info_Pattern = "{([a-zA-Z0-9_]+)}";
PlayerTaskDatas m_TaskModel;
- PlayerTaskDatas taskmodel
- {
- get
- {
+ PlayerTaskDatas taskmodel {
+ get {
return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>());
}
}
@@ -156,7 +154,11 @@
}
}
- public DateTime TaskTime = DateTime.Now;
+ DateTime m_TaskTime = DateTime.Now;
+ public DateTime TaskTime {
+ get { return m_TaskTime; }
+ set { m_TaskTime = value; }
+ }
}
--
Gitblit v1.8.0