From a0ede150686a218c92b901b1f20aef12a9913890 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 14 九月 2018 09:36:59 +0800
Subject: [PATCH] 1930【1.0.15】【主干】功能预告跳转八卦炉激活，功能预告界面未关闭
---
System/FriendSystem/MailAllModel.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/System/FriendSystem/MailAllModel.cs b/System/FriendSystem/MailAllModel.cs
index d6cbda3..0ac7e2c 100644
--- a/System/FriendSystem/MailAllModel.cs
+++ b/System/FriendSystem/MailAllModel.cs
@@ -95,7 +95,7 @@
public void ReFreshModel(HA9A1_tagGCQueryCompensationResult mailModel)
{
- DesignDebug.Log("鍒锋柊閭欢鏁版嵁" + mailModel.Count);
+ DebugEx.Log("鍒锋柊閭欢鏁版嵁" + mailModel.Count);
if(mailModel.Count > 0)
{
int preMailCnt = mailModelDict.Count;
@@ -296,7 +296,7 @@
if (!smatch.IsMatch(curInfo.Text)) return;
Match curMatch = smatch.Match(curInfo.Text);
- MailConfig curMailModel = ConfigManager.Instance.GetTemplate<MailConfig>(curMatch.Groups[1].Value);
+ MailConfig curMailModel = Config.Instance.Get<MailConfig>(curMatch.Groups[1].Value);
if (curMailModel == null || curMailModel.MailType != "TodayDailyTask") return;
todayDailylist.Clear();
@@ -305,7 +305,7 @@
if (smatch.IsMatch(info.Text))
{
Match match = smatch.Match(info.Text);
- MailConfig _mailModel = ConfigManager.Instance.GetTemplate<MailConfig>(match.Groups[1].Value);
+ MailConfig _mailModel = Config.Instance.Get<MailConfig>(match.Groups[1].Value);
if (_mailModel != null)
{
if (_mailModel.MailType == "TodayDailyTask")
@@ -344,7 +344,7 @@
if (smatch.IsMatch(info.Text))
{
Match match = smatch.Match(info.Text);
- MailConfig _mailModel = ConfigManager.Instance.GetTemplate<MailConfig>(match.Groups[1].Value);
+ MailConfig _mailModel = Config.Instance.Get<MailConfig>(match.Groups[1].Value);
List<string> _mailParalist = new List<string>();
if (_mailModel != null)
{
@@ -392,7 +392,7 @@
string[] mailContentArray = info.Text.Split(new string[] { "<$_$>" }, StringSplitOptions.RemoveEmptyEntries);
if (mailContentArray.Length > 0)
{
- FuncConfigConfig funcMailModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>(mailContentArray[0]);
+ FuncConfigConfig funcMailModel = Config.Instance.Get<FuncConfigConfig>(mailContentArray[0]);
if (funcMailModel != null)
mailSendPersonStr = funcMailModel.Numerical1;
else
@@ -404,11 +404,11 @@
}
else
{
- DesignDebug.Log("涓嶉渶瑕佽В鏋愭ā鏉块偖浠�");
+ DebugEx.Log("涓嶉渶瑕佽В鏋愭ā鏉块偖浠�");
string[] mailContentArray = info.Text.Split(new string[] { "<$_$>" }, StringSplitOptions.RemoveEmptyEntries);
if (mailContentArray.Length > 0)
{
- FuncConfigConfig funcMailModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>(mailContentArray[0]);
+ FuncConfigConfig funcMailModel = Config.Instance.Get<FuncConfigConfig>(mailContentArray[0]);
if (funcMailModel != null)
mailSendPersonStr = funcMailModel.Numerical1;
else
@@ -424,7 +424,7 @@
}
else
{
- DesignDebug.LogError("鏈嶅姟绔笅鍙戞牸寮忎笉姝ｇ‘");
+ DebugEx.LogError("鏈嶅姟绔笅鍙戞牸寮忎笉姝ｇ‘");
}
}
@@ -435,7 +435,7 @@
if (smatch.IsMatch(info.Text))
{
Match match = smatch.Match(info.Text);
- MailConfig _mailModel = ConfigManager.Instance.GetTemplate<MailConfig>(match.Groups[1].Value);
+ MailConfig _mailModel = Config.Instance.Get<MailConfig>(match.Groups[1].Value);
if (_mailModel != null)
{
return _mailModel.MailType;
@@ -469,7 +469,7 @@
HourMinute hourMinute = hourMinutelist[k];
if (!hourMinute.wholeDay)
{
- var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(quests[openTime][j]);
+ var config = Config.Instance.Get<DailyQuestConfig>(quests[openTime][j]);
string openTimeStr = StringUtility.Contact(hourMinute.hourBegin > 9 ? hourMinute.hourBegin.ToString() : "0" + hourMinute.hourBegin, ":", hourMinute.minuteBegin > 9 ? hourMinute.minuteBegin.ToString() : "0" + hourMinute.minuteBegin);
string endTimeStr = StringUtility.Contact(hourMinute.hourEnd > 9 ? hourMinute.hourEnd.ToString() : "0" + hourMinute.hourEnd, ":", hourMinute.minuteEnd > 9 ? hourMinute.minuteEnd.ToString() : "0" + hourMinute.minuteEnd);
todayDailySB.Append(StringUtility.Contact("銆�", config.Title, "銆�", openTimeStr, "-", endTimeStr, "\n"));
--
Gitblit v1.8.0