From fd2c464ef39177a0ec9c32c9ecff7ce409ea26e1 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 8 Oct 2022 17:01:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=9F=BA=E5=BB=BAperiod=E6=97=B6=E9=97=B4=E9=94=99?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2153 fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2210 --- .../ViewModels/TaskQueueViewModel.cs | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 6b1795fc0b..6914c4f399 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -1710,24 +1710,29 @@ namespace MeoAsstGui int hour = now.Hour; int minute = now.Minute; + bool timeLess(int lHour, int lMin, int rHour, int rMin) + { + if (lHour != rHour) + { + return lHour < rHour; + } + else + { + return lMin < rMin; + } + } + foreach (var plan in CustomInfrastPlanInfoList) { - bool hit = false; foreach (var period in plan.PeriodList) { - if (period.BeginHour <= hour && period.BeginMinute <= minute && - hour <= period.EndHour && minute <= period.EndMinute) + if (timeLess(period.BeginHour, period.BeginMinute, hour, minute) && + timeLess(hour, minute, period.EndHour, period.EndMinute)) { CustomInfrastPlanIndex = plan.Index; - hit = true; - break; + return; } } - - if (hit) - { - break; - } } }