Merge branch 'main' into dev_shawn

README.md

@@ -11,6 +11,7 @@
 ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/ArkMowers/arknights-mower/main?style=flat-square)
 [![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/ArkMowers/arknights-mower?style=flat-square)](https://codeclimate.com/github/ArkMowers/arknights-mower)
 
+
 7*24 小时不间断长草，让你忘掉这个游戏！
 
 </div>

arknights_mower/solvers/base_schedule.py

@@ -600,6 +600,7 @@ def plan_solver(self):
                         continue
                     if op.name in self.op_data.exhaust_agent:
                         if op.current_mood() <= 2:
+
                             if next((e for e in self.tasks if 'type' in e.keys() and op.name in e['type']),
                                     None) is None:
                                 self.enter_room(op.current_room)

menu.py

@@ -229,9 +229,8 @@ def menu():
 
     plan_tab = sg.Tab('  排班表 ', [[left_area, central_area, right_area], [setting_area]], element_justification="center")
     setting_tab = sg.Tab('  高级设置 ',
-                         [
-                          [run_mode_title, run_mode_1, run_mode_2], [ling_xi_title, ling_xi_1, ling_xi_2, ling_xi_3],
-                          [enable_party_title, enable_party_1, enable_party_0],
+                         [[run_mode_title, run_mode_1, run_mode_2], [ling_xi_title, ling_xi_1, ling_xi_2, ling_xi_3],
+                          [enable_party_title,enable_party_1,enable_party_0],
                           [max_resting_count_title, max_resting_count, sg.Text('', size=16), run_order_delay_title,
                            run_order_delay],
                           [drone_room_title, drone_room, sg.Text('', size=7), drone_count_limit_title,