Merge pull request #398 from Fuynkio/dev_shawn

修改skland逻辑，添加一个翻译房间的函数

arknights_mower/__main__.py

@@ -353,8 +353,11 @@ def simulate():
                     # 刷新时间以鹰历为准
                     if base_scheduler.daily_report:
                         base_scheduler.daily_report = base_scheduler.report_plan_solver()
-                    if base_scheduler.daily_skland and base_scheduler.skland_config['skland_enable']:
-                        base_scheduler.daily_report = base_scheduler.skland_plan_solover()
+                    # if base_scheduler.daily_skland and base_scheduler.skland_config['skland_enable']:
+                    #     base_scheduler.daily_report = base_scheduler.skland_plan_solover()
+                    #     base_scheduler.daily_skland=False
+                    if base_scheduler.skland_config['skland_enable']:
+                        base_scheduler.skland_plan_solover()
                     if base_scheduler.daily_mail:
                         base_scheduler.daily_report = base_scheduler.mail_plan_solver()
 

arknights_mower/solvers/base_schedule.py

@@ -80,7 +80,7 @@ def __init__(self, device: Device = None, recog: Recognizer = None) -> None:
         self.recruit_time = None
         self.daily_mission = False
         self.daily_report = False
-        self.daily_skland = False
+        self.daily_skland = True
         self.daily_mail = False
         self.check_mail_enable = True
         self.report_enable = True
@@ -503,7 +503,19 @@ def infra_main(self):
             self.collect_notification = True
         else:
             return self.handle_error()
-
+    def translate_room(self,room):
+        if "room" in room:
+            parts = room.split("_")
+            return f"B{parts[1]}0{parts[2]}"
+        elif "dormitory" in room:
+            parts = room.split("_")
+            return f"{parts[1]}层宿舍"
+        elif "contact" in room:
+            return "办公室"
+        elif "central" in room:
+            return "控制中枢"
+        else:
+            return "会客室"
     def agent_get_mood(self, skip_dorm=False, force=False):
         # 暂时规定纠错只适用于主班表
         need_read = set(
@@ -514,7 +526,9 @@ def agent_get_mood(self, skip_dorm=False, force=False):
                 try:
                     self.enter_room(room)
                     _mood_data = self.get_agent_from_room(room)
-                    logger.info(f'房间 {room} 心情为：{_mood_data}')
+                    mood_info = [f"干员: {item['agent']}, 心情: {round(item['mood'], 3)}" for item in _mood_data]
+                    logger.info(f'房间 {self.translate_room(room)}  {mood_info}')
+                    #logger.info(f'房间 {room} 心情为：{_mood_data}')
                     break
                 except Exception as e:
                     if error_count > 3: raise e