From 1be3d40d27002cd0c5c839f807aa116706499658 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期六, 22 六月 2019 18:02:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/SystemSetting/SetPrivateModel.cs | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/System/SystemSetting/SetPrivateModel.cs b/System/SystemSetting/SetPrivateModel.cs
index de1808b..077a319 100644
--- a/System/SystemSetting/SetPrivateModel.cs
+++ b/System/SystemSetting/SetPrivateModel.cs
@@ -445,28 +445,23 @@
title = config.Title;
times = new List<string>();
- for (int i = 0; i < 7; i++)
+ var hourMinutelist = dailyQuestOpenTime.GetNormalHourMinutes();
+ if (hourMinutelist != null)
{
- var hourMinutelist = dailyQuestOpenTime.GetHourMinuteByWeek(i);
- if (hourMinutelist != null)
+ if (id == (int)DailyQuestType.FairyFeast
+ || id == (int)DailyQuestType.FairyLeague)
{
- if (id == (int)DailyQuestType.FairyFeast
- ||id==(int)DailyQuestType.FairyLeague)
+ var time = StringUtility.Contact(hourMinutelist[0].hourBegin > 9 ? hourMinutelist[0].hourBegin.ToString() : "0" + hourMinutelist[0].hourBegin, ":",
+ hourMinutelist[0].minuteBegin > 9 ? hourMinutelist[0].minuteBegin.ToString() : "0" + hourMinutelist[0].minuteBegin);
+ times.Add(time);
+ }
+ else
+ {
+ for (int j = 0; j < hourMinutelist.Count; j++)
{
- var time = StringUtility.Contact(hourMinutelist[0].hourBegin > 9 ? hourMinutelist[0].hourBegin.ToString() : "0" + hourMinutelist[0].hourBegin, ":",
- hourMinutelist[0].minuteBegin > 9 ? hourMinutelist[0].minuteBegin.ToString() : "0" + hourMinutelist[0].minuteBegin);
+ var time = StringUtility.Contact(hourMinutelist[j].hourBegin > 9 ? hourMinutelist[j].hourBegin.ToString() : "0" + hourMinutelist[j].hourBegin, ":",
+ hourMinutelist[j].minuteBegin > 9 ? hourMinutelist[j].minuteBegin.ToString() : "0" + hourMinutelist[j].minuteBegin);
times.Add(time);
- break;
- }
- else
- {
- for (int j = 0; j < hourMinutelist.Count; j++)
- {
- var time = StringUtility.Contact(hourMinutelist[j].hourBegin > 9 ? hourMinutelist[j].hourBegin.ToString() : "0" + hourMinutelist[j].hourBegin, ":",
- hourMinutelist[j].minuteBegin > 9 ? hourMinutelist[j].minuteBegin.ToString() : "0" + hourMinutelist[j].minuteBegin);
- times.Add(time);
- }
- break;
}
}
}
--
Gitblit v1.8.0