Merge pull request #323 from Fuynkio/dev_shawn

MAA读仓库
ArkMowers · Oct 3, 2023 · b64a3cb · b64a3cb
2 parents c1a91f3 + eed877d
commit b64a3cb
Show file tree

Hide file tree

Showing 780 changed files with 1,562 additions and 77 deletions.
diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py
@@ -28,6 +28,7 @@
 from ..utils.recognize import RecognizeError, Recognizer, Scene
 from ..utils.solver import BaseSolver
 from ..utils.datetime import get_server_weekday, the_same_time
+from ..utils.depot import process_itemlist
 from arknights_mower.utils.news import get_update_time
 import arknights_mower.utils.paddleocr
 import cv2
@@ -2182,6 +2183,10 @@ def log_maa(msg, details, arg):
         elif "what" in d and d["what"] == "RecruitSpecialTag":
             global recruit_special_tags
             recruit_special_tags["tags"].append(d["details"]["tags"])
+        elif d.get("what") == "DepotInfo" and d["details"].get("done") is True:
+            itemlist_filename = "tmp\itemlist.csv"
+            logger.debug(f"开始扫描仓库（MAA）")
+            process_itemlist(d, itemlist_filename)
 
     def initialize_maa(self):
         path = pathlib.Path(self.maa_config['maa_path'])
@@ -2218,7 +2223,7 @@ def initialize_maa(self):
             raise Exception("MAA 连接失败")
 
     def append_maa_task(self, type):
-        if type in ['StartUp', 'Visit', 'Award']:
+        if type in ['StartUp', 'Visit', 'Award','Depot']:
             self.MAA.append_task(type)
         elif type == 'Fight':
             _plan = self.maa_config['weekly_plan'][get_server_weekday()]
@@ -2269,7 +2274,7 @@ def maa_plan_solver(self, tasks='All', one_time=False):
                 # 任务及参数请参考 docs/集成文档.md
                 self.initialize_maa()
                 if tasks == 'All':
-                    tasks = ['StartUp', 'Fight', 'Visit', 'Mall', 'Award']
+                    tasks = ['StartUp', 'Fight', 'Visit', 'Mall', 'Award','Depot']
                     # tasks = ['StartUp', 'Fight', 'Recruit', 'Visit', 'Mall', 'Award']
                 for maa_task in tasks:
                     if maa_task == 'Recruit':

diff --git a/arknights_mower/templates/conf.yml b/arknights_mower/templates/conf.yml
@@ -128,6 +128,14 @@ maa_weekly_plan1:
     周五: 1
     周六: 0
     周日: 1
+  - stage: [PR-A-1]
+    周一: 1
+    周二: 0
+    周三: 0
+    周四: 1
+    周五: 1
+    周六: 0
+    周日: 1
   - stage: [PR-B-2]
     周一: 1
     周二: 1
@@ -136,6 +144,14 @@ maa_weekly_plan1:
     周五: 1
     周六: 1
     周日: 0
+  - stage: [PR-B-1]
+    周一: 1
+    周二: 1
+    周三: 0
+    周四: 0
+    周五: 1
+    周六: 1
+    周日: 0
   - stage: [PR-C-2]
     周一: 0
     周二: 0
@@ -144,6 +160,14 @@ maa_weekly_plan1:
     周五: 0
     周六: 1
     周日: 1
+  - stage: [PR-C-1]
+    周一: 0
+    周二: 0
+    周三: 1
+    周四: 1
+    周五: 0
+    周六: 1
+    周日: 1
   - stage: [PR-D-2]
     周一: 1
     周二: 1
@@ -152,6 +176,14 @@ maa_weekly_plan1:
     周五: 1
     周六: 1
     周日: 0
+  - stage: [PR-D-1]
+    周一: 1
+    周二: 1
+    周三: 0
+    周四: 0
+    周五: 1
+    周六: 1
+    周日: 0
 mail_enable: 0
 account: ''
 pass_code: ''