From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/FriendSystem/MailAllModel.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/System/FriendSystem/MailAllModel.cs b/System/FriendSystem/MailAllModel.cs
index d38ac28..61414ad 100644
--- a/System/FriendSystem/MailAllModel.cs
+++ b/System/FriendSystem/MailAllModel.cs
@@ -89,6 +89,8 @@
private Dictionary<string, MailInfo> mailModelDict = new Dictionary<string,MailInfo>();
private List<MailInfo> timeOrderMailInfo = new List<MailInfo>();
private Regex smatch = new Regex(@"<MailTemplate>([^>.\n]*)</MailTemplate>([^>.\n]*)", RegexOptions.Singleline);
+ private Regex smatchSystem = new Regex(@"[\\]*\/[\\]*", RegexOptions.Singleline);
+
public string mailTitleStr = "";
public string mailContentstr = "";
public string mailSendPersonStr = "";
@@ -345,6 +347,7 @@
public void GetReciveMailContent(MailInfo info)
{
Debug.Log(info.Text);
+ info.Text = smatchSystem.Replace(info.Text, "/");
if (smatch.IsMatch(info.Text))
{
Match match = smatch.Match(info.Text);
@@ -422,7 +425,7 @@
if(mailContentArray.Length > 2)
{
- string mailDes = Regex.Replace(mailContentArray[2], @"<[\\]+/r>", "</r>");
+ string mailDes = mailContentArray[2];
mailContentstr = mailDes;
}
}
@@ -472,8 +475,10 @@
}
StringBuilder todayDailySB = new StringBuilder();
+ List<int> dailyIdlist = new List<int>();
public string GetTodayDailyNotify(DateTime getTime)
{
+ dailyIdlist.Clear();
todayDailySB.Length = 0;
var dayOfWeek = (int)getTime.DayOfWeek;
var quests = dailyModel.GetQuestByWeekTime(dayOfWeek % 7);
@@ -484,6 +489,11 @@
int openTime = openTimelist[i];
for (int j = 0;j < quests[openTime].Count; j++)
{
+ if(dailyIdlist.Contains(quests[openTime][j]))
+ {
+ continue;
+ }
+ dailyIdlist.Add(quests[openTime][j]);
DailyQuestOpenTime dailyQuestOpenTime;
dailyModel.TryGetOpenTime(quests[openTime][j], out dailyQuestOpenTime);
if (dailyQuestOpenTime.IsValidServerOpenTime())
--
Gitblit v1.8.0