Merge pull request #189 from ArkMowers/dev_shawn

Dev shawn

.github/workflows/pyinstaller-win-shawn.yml

@@ -0,0 +1,36 @@
+name: dev_shawn分支自动打包
+
+on:
+  push:
+    branches:
+      - dev_shawn
+
+jobs:
+  build-win-amd64:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.8 amd64
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+          architecture: x64
+      - name: Install dependencies
+        shell: cmd
+        run: |
+          python -m venv venv
+          venv\Scripts\python -m pip install -r requirements.txt
+          venv\Scripts\python -m pip install pyinstaller
+      - name: Patch Paddle
+        shell: cmd
+        run: |
+          copy .\packaging\image.py .\venv\Lib\site-packages\paddle\dataset\image.py /y
+          copy .\packaging\network.py .\venv\Lib\site-packages\paddleocr\ppocr\utils\network.py /y
+      - name: Make package
+        shell: cmd
+        run: |
+          venv\Scripts\pyinstaller .\menu.spec
+      - uses: actions/upload-artifact@v3
+        with:
+          name: mower
+          path: dist\mower.exe

.gitignore

@@ -56,7 +56,6 @@ MANIFEST
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
-*.spec
 
 # Installer logs
 pip-log.txt

arknights_mower/__main__.py

@@ -1,47 +1,70 @@
+import atexit
+import os
 import time
 from datetime import datetime
+from arknights_mower.utils.log import logger
+import json
+
+from arknights_mower.utils.pipe import Pipe
 
 conf = {}
 plan = {}
+operators = {}
 
 
 # 执行自动排班
-def main(c, p, child_conn):
+def main(c, p, o={}, child_conn=None):
     __init_params__()
-    from arknights_mower.utils.log import logger, init_fhlr
+    from arknights_mower.utils.log import init_fhlr
     from arknights_mower.utils import config
     global plan
     global conf
+    global operators
     conf = c
     plan = p
+    operators = o
     config.LOGFILE_PATH = './log'
     config.SCREENSHOT_PATH = './screenshot'
-    config.SCREENSHOT_MAXNUM = 1000
+    config.SCREENSHOT_MAXNUM = 50
     config.ADB_DEVICE = [conf['adb']]
     config.ADB_CONNECT = [conf['adb']]
     config.ADB_CONNECT = [conf['adb']]
     config.APPNAME = 'com.hypergryph.arknights' if conf[
                                                        'package_type'] == 1 else 'com.hypergryph.arknights.bilibili'  # 服务器
     init_fhlr(child_conn)
-    if conf['ling_xi'] == 1:
-        agent_base_config['令']['UpperLimit'] = 11
-        agent_base_config['夕']['UpperLimit'] = 11
-        agent_base_config['夕']['LowerLimit'] = 13
-    elif conf['ling_xi'] == 2:
-        agent_base_config['夕']['UpperLimit'] = 11
-        agent_base_config['令']['UpperLimit'] = 11
-        agent_base_config['令']['LowerLimit'] = 13
-    for key in list(filter(None, conf['rest_in_full'].replace('，', ',').split(','))):
+    Pipe.conn = child_conn
+    if plan['conf']['ling_xi'] == 1:
+        agent_base_config['令']['UpperLimit'] = 12
+        agent_base_config['夕']['LowerLimit'] = 12
+    elif plan['conf']['ling_xi'] == 2:
+        agent_base_config['夕']['UpperLimit'] = 12
+        agent_base_config['令']['LowerLimit'] = 12
+    for key in list(filter(None, plan['conf']['rest_in_full'].replace('，', ',').split(','))):
         if key in agent_base_config.keys():
             agent_base_config[key]['RestInFull'] = True
         else:
             agent_base_config[key] = {'RestInFull': True}
+    for key in list(filter(None, plan['conf']['exhaust_require'].replace('，', ',').split(','))):
+        if key in agent_base_config.keys():
+            agent_base_config[key]['ExhaustRequire'] = True
+        else:
+            agent_base_config[key] = {'ExhaustRequire': True}
+    for key in list(filter(None, plan['conf']['workaholic'].replace('，', ',').split(','))):
+        if key in agent_base_config.keys():
+            agent_base_config[key]['Workaholic'] = True
+        else:
+            agent_base_config[key] = {'Workaholic': True}
+    for key in list(filter(None, plan['conf']['resting_priority'].replace('，', ',').split(','))):
+        if key in agent_base_config.keys():
+            agent_base_config[key]['RestingPriority'] = 'low'
+        else:
+            agent_base_config[key] = {'RestingPriority': 'low'}
     logger.info('开始运行Mower')
+    logger.debug(agent_base_config)
     simulate()
 
 
 def inialize(tasks, scheduler=None):
-    from arknights_mower.utils.log import logger
     from arknights_mower.solvers.base_schedule import BaseSchedulerSolver
     from arknights_mower.strategy import Solver
     from arknights_mower.utils.device import Device
@@ -52,13 +75,16 @@ def inialize(tasks, scheduler=None):
         base_scheduler = BaseSchedulerSolver(cli.device, cli.recog)
         base_scheduler.operators = {}
         plan1 = {}
-        for key in plan:
-            plan1[key] = plan[key]['plans']
+        for key in plan[plan['default']]:
+            plan1[key] = plan[plan['default']][key]['plans']
+        plan[plan['default']] = plan1
+        logger.debug(plan)
         base_scheduler.package_name = config.APPNAME  # 服务器
-        base_scheduler.global_plan = {'default': "plan_1", "plan_1": plan1}
+        base_scheduler.global_plan = plan
+        base_scheduler.current_plan = plan1
         base_scheduler.current_base = {}
         base_scheduler.resting = []
-        base_scheduler.max_resting_count = conf['max_resting_count']
+        base_scheduler.max_resting_count = plan['conf']['max_resting_count']
         base_scheduler.drone_count_limit = conf['drone_count_limit']
         base_scheduler.tasks = tasks
         base_scheduler.enable_party = conf['enable_party'] == 1  # 是否使用线索
@@ -85,10 +111,12 @@ def inialize(tasks, scheduler=None):
         maa_config['maa_adb_path'] = conf['maa_adb_path']
         maa_config['maa_adb'] = conf['adb']
         maa_config['weekly_plan'] = conf['maa_weekly_plan']
+        maa_config['roguelike'] = conf['maa_rg_enable'] == 1
         base_scheduler.maa_config = maa_config
         base_scheduler.ADB_CONNECT = config.ADB_CONNECT[0]
         base_scheduler.error = False
         base_scheduler.drone_room = None if conf['drone_room'] == '' else conf['drone_room']
+        base_scheduler.reload_room = list(filter(None, conf['reload_room'].replace('，', ',').split(',')))
         base_scheduler.drone_execution_gap = 4
         base_scheduler.run_order_delay = conf['run_order_delay']
         base_scheduler.agent_base_config = agent_base_config
@@ -101,14 +129,24 @@ def inialize(tasks, scheduler=None):
 
 
 def simulate():
-    from arknights_mower.utils.log import logger
     '''
     具体调用方法可见各个函数的参数说明
     '''
     tasks = []
     reconnect_max_tries = 10
     reconnect_tries = 0
+    global base_scheduler
     base_scheduler = inialize(tasks)
+    base_scheduler.initialize_operators()
+    if operators != {}:
+        for k,v in operators.items():
+            if k in base_scheduler.op_data.operators and not base_scheduler.op_data.operators[k].room.startswith("dorm"):
+                # 只复制心情数据
+                base_scheduler.op_data.operators[k].mood = v.mood
+                base_scheduler.op_data.operators[k].time_stamp = v.time_stamp
+                base_scheduler.op_data.operators[k].depletion_rate = v.depletion_rate
+                base_scheduler.op_data.operators[k].current_room = v.current_room
+                base_scheduler.op_data.operators[k].current_index = v.current_index
     while True:
         try:
             if len(base_scheduler.tasks) > 0:
@@ -130,6 +168,10 @@ def simulate():
                     logger.info(subject)
                     base_scheduler.send_email(context, subject)
                     time.sleep(sleep_time)
+            if len(base_scheduler.tasks) > 0 and 'type' in base_scheduler.tasks[0].keys() and base_scheduler.tasks[0]['type'].split('_')[0] == 'maa':
+                logger.info(f"开始执行 MAA {base_scheduler.tasks[0]['type'].split('_')[1]} 任务")
+                base_scheduler.maa_plan_solver((base_scheduler.tasks[0]['type'].split('_')[1]).split(','), one_time=True)
+                continue
             base_scheduler.run()
             reconnect_tries = 0
         except ConnectionError as e:
@@ -152,6 +194,30 @@ def simulate():
             logger.exception(f"程序出错--->{E}")
 
 
+def save_state(op_data,file='state.json'):
+    if not os.path.exists('tmp'):
+        os.makedirs('tmp')
+    with open('tmp/' + file, 'w') as f:
+        if op_data is not None :
+            json.dump(vars(op_data), f, default=str)
+
+
+def load_state(file='state.json'):
+
+    if not os.path.exists('tmp/' + file):
+        return None
+    with open('tmp/' + file, 'r') as f:
+        state = json.load(f)
+    operators = {k: eval(v) for k, v in state['operators'].items()}
+    for k,v in operators.items():
+        if not v.time_stamp == 'None':
+            v.time_stamp = datetime.strptime(v.time_stamp, '%Y-%m-%d %H:%M:%S.%f')
+        else:
+            v.time_stamp = None
+    logger.info("基建配置已加载！")
+    return operators
+
+
 agent_base_config = {}
 maa_config = {}
 
@@ -168,7 +234,7 @@ def __init_params__():
         "巫恋": {"ArrangeOrder": [2, "true"]},
         "柏喙": {"ExhaustRequire": True, "ArrangeOrder": [2, "true"]},
         "龙舌兰": {"ArrangeOrder": [2, "true"]},
-        "空弦": {"ArrangeOrder": [2, "true"], "RestingPriority": "low"},
+        "空弦": {"ArrangeOrder": [2, "true"]},
         "伺夜": {"ArrangeOrder": [2, "true"]},
         "绮良": {"ArrangeOrder": [2, "true"]},
         "但书": {"ArrangeOrder": [2, "true"]},
@@ -187,10 +253,9 @@ def __init_params__():
         "安比尔": {"ArrangeOrder": [2, "false"]},
         "爱丽丝": {"ArrangeOrder": [2, "false"]},
         "桃金娘": {"ArrangeOrder": [2, "false"]},
-        "帕拉斯": {"RestingPriority": "low"},
-        "红云": {"RestingPriority": "low", "ArrangeOrder": [2, "true"]},
+        "红云": {"ArrangeOrder": [2, "true"]},
         "承曦格雷伊": {"ArrangeOrder": [2, "true"]},
-        "乌有": {"ArrangeOrder": [2, "true"], "RestingPriority": "low"},
+        "乌有": {"ArrangeOrder": [2, "true"]},
         "图耶": {"ArrangeOrder": [2, "true"]},
         "鸿雪": {"ArrangeOrder": [2, "true"]},
         "孑": {"ArrangeOrder": [2, "true"]},
@@ -200,7 +265,8 @@ def __init_params__():
         "焰尾": {"RestInFull": True},
         "重岳": {"ArrangeOrder": [2, "true"]},
         "坚雷": {"ArrangeOrder": [2, "true"]},
-        "年": {"RestingPriority": "low"}
+        "年": {"RestingPriority": "low"},
+        "伊内丝": {"ExhaustRequire": True, "ArrangeOrder": [2, "true"], "RestInFull": True},
     }
     maa_config = {
         # maa 运行的时间间隔，以小时计

arknights_mower/data/agent.json

@@ -274,5 +274,10 @@
     "洋灰",
     "休谟斯",
     "摩根",
-    "U-Official"
+    "U-Official",
+    "缪尔赛思",
+    "霍尔海雅",
+    "淬羽赫默",
+    "玫拉",
+    "铎铃"
 ]

arknights_mower/data/ocr.json

@@ -29,5 +29,6 @@
     "Lancet2": "Lancet-2",
     "THRMEX": "THRM-EX",
     "U-Officia": "U-Official",
+    "UOfficial": "U-Official",
     "铅跟": "铅踝"
 }

arknights_mower/data/scene.json

@@ -95,6 +95,10 @@
         "label": "CLOSE_MINE",
         "comment": "产业合作洽谈会"
     },
+    "113": {
+    "label": "CHECK_IN",
+    "comment": "4周年签到"
+    },
     "201": {
         "label": "INFRA_MAIN",
         "comment": "基建全局视角"

arknights_mower/ocr/decode.py

@@ -111,10 +111,10 @@ def get_mini_boxes(self, contour):
     def box_score_fast(self, bitmap, _box):
         h, w = bitmap.shape[:2]
         box = _box.copy()
-        xmin = np.clip(np.floor(box[:, 0].min()).astype(np.int), 0, w - 1)
-        xmax = np.clip(np.ceil(box[:, 0].max()).astype(np.int), 0, w - 1)
-        ymin = np.clip(np.floor(box[:, 1].min()).astype(np.int), 0, h - 1)
-        ymax = np.clip(np.ceil(box[:, 1].max()).astype(np.int), 0, h - 1)
+        xmin = np.clip(np.floor(box[:, 0].min()).astype(np.int32), 0, w - 1)
+        xmax = np.clip(np.ceil(box[:, 0].max()).astype(np.int32), 0, w - 1)
+        ymin = np.clip(np.floor(box[:, 1].min()).astype(np.int32), 0, h - 1)
+        ymax = np.clip(np.ceil(box[:, 1].max()).astype(np.int32), 0, h - 1)
 
         mask = np.zeros((ymax - ymin + 1, xmax - xmin + 1), dtype=np.uint8)
         box[:, 0] = box[:, 0] - xmin