#715 宿舍类别变成下班来重新转火

ArkMowers · Feb 1, 2025 · ff89225 · ff89225
1 parent 5dd09f7
commit ff89225
Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py
@@ -1412,7 +1412,9 @@ def plan_solver(self):
             datetime.now() + timedelta(minutes=0.75 * len(re_order_dorm_plan))
         ):
             logger.info(f"新增宿舍移位任务{re_order_dorm_plan}")
-            task = SchedulerTask(task_plan=re_order_dorm_plan)
+            task = SchedulerTask(
+                task_plan=re_order_dorm_plan, task_type=TaskTypes.SHIFT_OFF
+            )
             self.tasks.append(task)
 
     def resting(self):

diff --git a/arknights_mower/tests/scheduler_task_tests.py b/arknights_mower/tests/scheduler_task_tests.py
@@ -379,6 +379,9 @@ def test_reorder_1(self):
         op_data.dorm[2].name = "夕"
         plan = try_reorder(op_data)
         self.assertEqual(len(plan), 2)
+        tasks = [SchedulerTask(task_plan=plan, task_type=TaskTypes.SHIFT_OFF)]
+        check_dorm_ordering(tasks, op_data)
+        self.assertEqual(len(tasks), 2)
 
     def test_reorder_2(self):
         # 非高优高效不会被移动
@@ -392,6 +395,9 @@ def test_reorder_2(self):
         self.assertEqual(len(plan), 3)
         self.assertEqual(plan["dormitory_1"][2], "夕")
         self.assertEqual(plan["dormitory_1"][4], "凯尔希")
+        tasks = [SchedulerTask(task_plan=plan, task_type=TaskTypes.SHIFT_OFF)]
+        check_dorm_ordering(tasks, op_data)
+        self.assertEqual(len(tasks), 2)
 
     def test_reorder_3(self):
         # 如果高优都占了，则不动
@@ -407,6 +413,9 @@ def test_reorder_3(self):
         plan = try_reorder(op_data)
         self.assertEqual(plan["dormitory_1"][2], "夕")
         self.assertEqual(plan["dormitory_1"][3], "见行者")
+        tasks = [SchedulerTask(task_plan=plan, task_type=TaskTypes.SHIFT_OFF)]
+        check_dorm_ordering(tasks, op_data)
+        self.assertEqual(len(tasks), 2)
 
     def init_opdata(self):
         agent_base_config = PlanConfig(