refactor:公招相关代码 (#652)

* 重构RecruitSolver * 删除没有用的资源 * fix:解决RecruitSolver冲突 * ruff format base_schedule.py
ArkMowers · Jul 26, 2024 · 3328054 · 3328054
1 parent 3d3bea2
commit 3328054
Show file tree

Hide file tree

Showing 45 changed files with 364 additions and 837 deletions.
diff --git a/arknights_mower/models/recruit.pkl b/arknights_mower/models/recruit.pkl
diff --git a/arknights_mower/models/recruit_result.pkl b/arknights_mower/models/recruit_result.pkl
diff --git a/arknights_mower/resources/recruit.png b/arknights_mower/resources/recruit.png
diff --git a/arknights_mower/resources/agent_token.png → ...s_mower/resources/recruit/agent_token.png b/arknights_mower/resources/agent_token.png → ...s_mower/resources/recruit/agent_token.png
diff --git a/arknights_mower/resources/recruit/agent_token_first.png b/arknights_mower/resources/recruit/agent_token_first.png
diff --git a/...ights_mower/resources/available_level.png → ...wer/resources/recruit/available_level.png b/...ights_mower/resources/available_level.png → ...wer/resources/recruit/available_level.png
diff --git a/arknights_mower/resources/recruit/begin_recruit.png b/arknights_mower/resources/recruit/begin_recruit.png
diff --git a/arknights_mower/resources/career_needs.png → ..._mower/resources/recruit/career_needs.png b/arknights_mower/resources/career_needs.png → ..._mower/resources/recruit/career_needs.png
diff --git a/...ghts_mower/resources/job_requirements.png → ...er/resources/recruit/job_requirements.png b/...ghts_mower/resources/job_requirements.png → ...er/resources/recruit/job_requirements.png
diff --git a/arknights_mower/resources/recruit/lmb.png b/arknights_mower/resources/recruit/lmb.png
diff --git a/arknights_mower/resources/recruit/recruit_done.png b/arknights_mower/resources/recruit/recruit_done.png
diff --git a/arknights_mower/resources/recruit/recruit_lock.png b/arknights_mower/resources/recruit/recruit_lock.png
diff --git a/arknights_mower/resources/recruit/refresh.png b/arknights_mower/resources/recruit/refresh.png
diff --git a/arknights_mower/resources/recruit/refresh_comfirm.png b/arknights_mower/resources/recruit/refresh_comfirm.png
diff --git a/arknights_mower/resources/recruit/riic_res/CASTER.png b/arknights_mower/resources/recruit/riic_res/CASTER.png
diff --git a/arknights_mower/resources/recruit/riic_res/MEDIC.png b/arknights_mower/resources/recruit/riic_res/MEDIC.png
diff --git a/arknights_mower/resources/recruit/riic_res/PIONEER.png b/arknights_mower/resources/recruit/riic_res/PIONEER.png
diff --git a/arknights_mower/resources/recruit/riic_res/SNIPER.png b/arknights_mower/resources/recruit/riic_res/SNIPER.png
diff --git a/arknights_mower/resources/recruit/riic_res/SPECIAL.png b/arknights_mower/resources/recruit/riic_res/SPECIAL.png
diff --git a/arknights_mower/resources/recruit/riic_res/SUPPORT.png b/arknights_mower/resources/recruit/riic_res/SUPPORT.png
diff --git a/arknights_mower/resources/recruit/riic_res/TANK.png b/arknights_mower/resources/recruit/riic_res/TANK.png
diff --git a/arknights_mower/resources/recruit/riic_res/WARRIOR.png b/arknights_mower/resources/recruit/riic_res/WARRIOR.png
diff --git a/arknights_mower/resources/recruit/start_recruit.png b/arknights_mower/resources/recruit/start_recruit.png
diff --git a/arknights_mower/resources/recruit/stone.png b/arknights_mower/resources/recruit/stone.png
diff --git a/arknights_mower/resources/recruit/ticket.png b/arknights_mower/resources/recruit/ticket.png
diff --git a/arknights_mower/resources/recruit/time.png b/arknights_mower/resources/recruit/time.png
diff --git a/arknights_mower/resources/recruit_2.png b/arknights_mower/resources/recruit_2.png
diff --git a/arknights_mower/resources/recruit_4.png b/arknights_mower/resources/recruit_4.png
diff --git a/arknights_mower/resources/recruit_4_chose.png b/arknights_mower/resources/recruit_4_chose.png
diff --git a/arknights_mower/resources/recruit_budget.png b/arknights_mower/resources/recruit_budget.png
diff --git a/arknights_mower/resources/recruit_continue.png b/arknights_mower/resources/recruit_continue.png
diff --git a/arknights_mower/resources/recruit_finish.png b/arknights_mower/resources/recruit_finish.png
diff --git a/arknights_mower/resources/recruit_no.png b/arknights_mower/resources/recruit_no.png
diff --git a/arknights_mower/resources/recruit_no_lmb.png b/arknights_mower/resources/recruit_no_lmb.png
diff --git a/arknights_mower/resources/recruit_no_refresh.png b/arknights_mower/resources/recruit_no_refresh.png
diff --git a/arknights_mower/resources/recruit_no_ticket.png b/arknights_mower/resources/recruit_no_ticket.png
diff --git a/arknights_mower/resources/recruit_refresh.png b/arknights_mower/resources/recruit_refresh.png
diff --git a/arknights_mower/resources/recruit_special.png b/arknights_mower/resources/recruit_special.png
diff --git a/arknights_mower/resources/recruit_tags.png b/arknights_mower/resources/recruit_tags.png
diff --git a/arknights_mower/resources/recruit_ticket.png b/arknights_mower/resources/recruit_ticket.png
diff --git a/arknights_mower/resources/recruit_yesorno.png b/arknights_mower/resources/recruit_yesorno.png
diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py
@@ -3322,6 +3322,7 @@ def recruit_plan_solver(self):
             hours=config.conf.recruit_gap
         ):
             RecruitSolver(self.device, self.recog).run()
+
             self.last_execution["recruit"] = datetime.now()
             logger.info(f"下一次公开招募执行时间在{config.conf.recruit_gap}小时之后")