Просмотр исходного кода

Merge pull request #1693 from runhey/dev

Automated PR 2026.07.23
huangrunheng 3 месяцев назад
Родитель
Сommit
dd979f999d
35 измененных файлов с 527 добавлено и 117 удалено
  1. 3 1
      config/template.json
  2. 310 0
      module/config/instance_guard.py
  3. 9 1
      module/device/method/adb.py
  4. 1 0
      module/server/config_manager.py
  5. 87 0
      script.py
  6. BIN
      tasks/ActivityShikigami/as/as_battle_main_to_records.png
  7. BIN
      tasks/ActivityShikigami/as/as_climb_mode_pass.png
  8. BIN
      tasks/ActivityShikigami/as/as_climb_mode_switch.png
  9. BIN
      tasks/ActivityShikigami/as/as_shi.png
  10. BIN
      tasks/ActivityShikigami/as/as_to_battle_main.png
  11. 1 1
      tasks/ActivityShikigami/as/image.json
  12. 3 3
      tasks/ActivityShikigami/as/pages.json
  13. 7 7
      tasks/ActivityShikigami/assets.py
  14. 2 0
      tasks/AreaBoss/script_task.py
  15. 4 4
      tasks/Hyakkiyakou/assets.py
  16. 8 8
      tasks/Hyakkiyakou/hya/image5.json
  17. 19 23
      tasks/MemoryScrolls/assets.py
  18. 12 12
      tasks/MemoryScrolls/ms/click.json
  19. 21 39
      tasks/MemoryScrolls/ms/image.json
  20. BIN
      tasks/MemoryScrolls/ms/ms_ms_back.png
  21. BIN
      tasks/MemoryScrolls/ms/ms_ms_close.png
  22. BIN
      tasks/MemoryScrolls/ms/ms_ms_complete.png
  23. BIN
      tasks/MemoryScrolls/ms/ms_ms_complete_100.png
  24. BIN
      tasks/MemoryScrolls/ms/ms_ms_contribute.png
  25. BIN
      tasks/MemoryScrolls/ms/ms_ms_fragment_s.png
  26. BIN
      tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png
  27. BIN
      tasks/MemoryScrolls/ms/ms_ms_main.png
  28. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_l.png
  29. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_m.png
  30. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_s.png
  31. 6 6
      tasks/MemoryScrolls/ms/swipe.json
  32. 5 5
      tasks/MemoryScrolls/script_task.py
  33. 3 1
      tasks/RealmRaid/script_task.py
  34. 4 0
      tasks/Script/config_optimization.py
  35. 22 6
      tasks/TrueOrochi/script_task.py

+ 3 - 1
config/template.json

@@ -28,7 +28,9 @@
       "combat_screenshot_interval": 1.0,
       "task_hoarding_duration": 0,
       "when_task_queue_empty": "goto_main",
-      "schedule_rule": "Filter"
+      "schedule_rule": "Filter",
+      "queue_mode": false,
+      "queue_idle_threshold": 10
     }
   },
   "restart": {

+ 310 - 0
module/config/instance_guard.py

@@ -0,0 +1,310 @@
+# This Python file uses the following encoding: utf-8
+# @author handman123
+# github https://github.com/runhey
+"""跨进程实例看守器。
+
+通过共享 JSON 状态文件协调多个进程的实例执行顺序,确保同一时间
+只有一个实例操作模拟器。持有执行权(token)的实例可执行任务,
+其他实例排队等待。
+"""
+import json
+import threading
+from pathlib import Path
+from datetime import datetime
+
+from filelock import FileLock
+from module.logger import logger
+
+
+class _QueueState:
+    """共享状态文件的持久化层。
+
+    负责 JSON 文件的原子读写和持有者心跳过期判断。
+    文件锁(FileLock)保证跨进程写入安全。
+
+    文件格式:
+        {
+            "current": "oas1",               # 当前持有执行权的实例名
+            "timestamp": "2026-07-08 ...",   # 持有者心跳时间戳
+            "queue": ["oas2", "oas3"]        # 等待队列
+        }
+    """
+
+    STATE_FILE = Path.cwd() / "log" / ".queue_state.json"
+    STALE_TIMEOUT = 300  # 心跳超时 5 分钟,超过视为持有者崩溃
+
+    def __init__(self, config_name: str):
+        """Args:
+            config_name: 配置文件名称,如 'oas1'。
+        """
+        self.config_name = config_name
+        self._lock = FileLock(str(self.STATE_FILE) + ".lock", timeout=5)
+
+    def read(self) -> dict:
+        """读取状态文件。
+
+        调用方需持有 _lock。文件不存在或损坏时返回空状态。
+
+        Returns:
+            dict: 包含 current、timestamp、queue 的状态字典。
+        """
+        if not self.STATE_FILE.exists():
+            return {"current": None, "timestamp": None, "queue": []}
+        try:
+            with open(self.STATE_FILE, "r", encoding="utf-8") as f:
+                return json.load(f)
+        except (json.JSONDecodeError, IOError):
+            logger.warning("[InstanceGuard] State file corrupted, resetting")
+            return {"current": None, "timestamp": None, "queue": []}
+
+    def write(self, state: dict) -> None:
+        """写入状态文件。调用方需持有 _lock。"""
+        self.STATE_FILE.parent.mkdir(parents=True, exist_ok=True)
+        with open(self.STATE_FILE, "w", encoding="utf-8") as f:
+            json.dump(state, f, indent=2, ensure_ascii=False)
+
+    def is_stale(self, state: dict) -> bool:
+        """判断持有者心跳是否过期。
+
+        如果 timestamp 距现在超过 STALE_TIMEOUT 秒,认为持有者崩溃。
+
+        Args:
+            state: 从 read() 获取的状态字典。
+
+        Returns:
+            bool: True 表示心跳过期,可安全接管。
+        """
+        ts_str = state.get("timestamp")
+        if not ts_str:
+            return False
+        try:
+            ts = datetime.fromisoformat(ts_str)
+            elapsed = (datetime.now() - ts).total_seconds()
+            return elapsed > self.STALE_TIMEOUT
+        except (ValueError, TypeError):
+            return True
+
+    def __enter__(self):
+        self._lock.acquire()
+        return self.read()
+
+    def __exit__(self, *args):
+        self._lock.release()
+
+
+class _Heartbeat:
+    """心跳保活线程。
+
+    持有 token 期间定期更新 timestamp,防止被误判崩溃。
+    同时监控 token 是否被其他实例抢占(例如被管理员从状态文件强制接管),
+    检测到丢失时设置 token_lost 标志通知主线程。
+    """
+
+    INTERVAL = 180  # 心跳间隔 3 分钟,小于 STALE_TIMEOUT(5min) 留出缓冲
+
+    def __init__(self, config_name: str, state: _QueueState):
+        self._config_name = config_name
+        self._state = state
+        self._thread: threading.Thread = None
+        self._stop_event: threading.Event = None
+        self._token_lost = threading.Event()
+
+    @property
+    def token_lost(self) -> bool:
+        """token 是否被其他实例抢占。"""
+        return self._token_lost.is_set()
+
+    def start(self) -> None:
+        """启动心跳 daemon 线程。已运行则跳过。"""
+        if self._thread and self._thread.is_alive():
+            return
+        self._token_lost.clear()
+        self._stop_event = threading.Event()
+        self._thread = threading.Thread(target=self._loop, daemon=True)
+        self._thread.start()
+        logger.info(
+            f"[InstanceGuard] Heartbeat started for '{self._config_name}'")
+
+    def stop(self) -> None:
+        """停止心跳线程。"""
+        if self._stop_event:
+            self._stop_event.set()
+        self._thread = None
+        self._stop_event = None
+
+    def _loop(self) -> None:
+        """心跳循环。每 INTERVAL 秒刷新 timestamp。"""
+        while not self._stop_event.wait(timeout=self.INTERVAL):
+            try:
+                with self._state._lock:
+                    state = self._state.read()
+                    if state["current"] == self._config_name:
+                        state["timestamp"] = datetime.now().isoformat()
+                        self._state.write(state)
+                    elif self._config_name not in state.get("queue", []):
+                        # 不在 current 也不在 queue,说明被强制移除了
+                        logger.warning(
+                            f"[InstanceGuard] '{self._config_name}' lost token, "
+                            f"current holder: {state['current']}")
+                        self._token_lost.set()
+                        return
+            except Exception as e:
+                logger.error(f"[InstanceGuard] Heartbeat error: {e}")
+
+
+class InstanceGuard:
+    """跨进程实例看守器。
+
+    通过共享状态文件协调多个实例的执行顺序,确保同一时间只有一个实例
+    操作模拟器。集成心跳保活和崩溃检测。
+
+    用法:
+        guard = InstanceGuard(config_name)
+        if guard.try_acquire():
+            # 执行业务逻辑
+            guard.release()
+    """
+
+    def __init__(self, config_name: str):
+        """Args:
+            config_name: 配置文件名称。
+        """
+        self.config_name = config_name
+        self._state = _QueueState(config_name)
+        self._heartbeat = _Heartbeat(config_name, self._state)
+
+    @property
+    def token_lost(self) -> bool:
+        """token 是否被其他实例抢占。"""
+        return self._heartbeat.token_lost
+
+    # ==================== 执行权操作 ====================
+
+    def try_acquire(self) -> bool:
+        """尝试获取执行权。
+
+        四种情况:
+        1. 自己已是持有者 — 刷新 heartbeat,返回 True
+        2. 持有者心跳过期 — 强制接管,返回 True
+        3. 无人持有 — 自己成为持有者,启动心跳,返回 True
+        4. 他人持有 — 加入等待队列,返回 False
+
+        Returns:
+            True: 已获得执行权。
+            False: 执行权被他人持有,已加入队列。
+        """
+        with self._state._lock:
+            state = self._state.read()
+
+            # 自己已是持有者,刷新心跳
+            if state["current"] == self.config_name:
+                state["timestamp"] = datetime.now().isoformat()
+                self._state.write(state)
+                self._heartbeat.start()
+                logger.info(f"[InstanceGuard] '{self.config_name}' already holds token")
+                return True
+
+            # 持有者崩溃,强制接管
+            if state["current"] and self._state.is_stale(state):
+                logger.warning(
+                    f"[InstanceGuard] Holder '{state['current']}' "
+                    f"heartbeat stale, taking over")
+                state["current"] = None
+                state["timestamp"] = None
+
+            # 无人持有,自己成为持有者
+            if state["current"] is None:
+                state["current"] = self.config_name
+                state["timestamp"] = datetime.now().isoformat()
+                if self.config_name in state["queue"]:
+                    state["queue"].remove(self.config_name)
+                self._state.write(state)
+                logger.info(
+                    f"[InstanceGuard] '{self.config_name}' acquired token")
+                self._heartbeat.start()
+                return True
+
+            # 他人持有,加入等待队列
+            if self.config_name not in state["queue"]:
+                state["queue"].append(self.config_name)
+                self._state.write(state)
+                logger.info(
+                    f"[InstanceGuard] '{self.config_name}' waiting, "
+                    f"holder: '{state['current']}', "
+                    f"queue: {state['queue']}")
+            return False
+
+    def release(self) -> None:
+        """释放执行权。
+
+        清空 current 和 timestamp,停止心跳。
+        等待队列中的实例自行获取。
+        如果自己不是持有者,静默返回。
+        """
+        with self._state._lock:
+            state = self._state.read()
+            if state["current"] != self.config_name:
+                return
+
+            self._heartbeat.stop()
+            state["current"] = None
+            state["timestamp"] = None
+            self._state.write(state)
+            logger.info(f"[InstanceGuard] '{self.config_name}' released token")
+
+    def should_release(self, pending_task: list, waiting_task: list,
+                       idle_threshold_minutes: int = 10) -> bool:
+        """判断是否应该在进入空闲前释放执行权。
+
+        条件:
+        1. pending_task 为空(当前无待执行任务)
+        2. waiting_task 为空,或最早的任务距现在超过 idle_threshold_minutes 分钟
+
+        Args:
+            pending_task: 当前到期的任务列表。
+            waiting_task: 未来任务列表,按 next_run 升序。
+            idle_threshold_minutes: 空闲阈值(分钟)。
+
+        Returns:
+            True: 空闲时间足够长,应释放执行权。
+            False: 即将有任务,应继续持有。
+        """
+        if pending_task:
+            return False
+        if not waiting_task:
+            return True
+
+        next_task_time = waiting_task[0].next_run
+        idle_seconds = (next_task_time - datetime.now()).total_seconds()
+        return idle_seconds > idle_threshold_minutes * 60
+
+    def remove_from_queue(self) -> None:
+        """从排队系统中完全移除自己。
+
+        进程停止时调用,防止残留状态导致死锁。
+        如果自己是持有者,将执行权移交给下一个等待者。
+        """
+        with self._state._lock:
+            state = self._state.read()
+
+            if self.config_name in state["queue"]:
+                state["queue"].remove(self.config_name)
+                logger.info(
+                    f"[InstanceGuard] '{self.config_name}' removed from queue")
+
+            if state["current"] == self.config_name:
+                self._heartbeat.stop()
+                if state["queue"]:
+                    next_holder = state["queue"].pop(0)
+                    state["current"] = next_holder
+                    state["timestamp"] = datetime.now().isoformat()
+                    logger.info(
+                        f"[InstanceGuard] '{self.config_name}' removed, "
+                        f"token → '{next_holder}'")
+                else:
+                    state["current"] = None
+                    state["timestamp"] = None
+                self._state.write(state)
+                return
+
+            self._state.write(state)

+ 9 - 1
module/device/method/adb.py

@@ -12,7 +12,7 @@ from module.device.connection import Connection
 from module.device.method.minitouch import smooth_path
 from module.device.method.utils import (RETRY_TRIES, retry_sleep, remove_prefix, handle_adb_error,
                                         ImageTruncated, PackageNotInstalled)
-from module.exception import RequestHumanTakeover, ScriptError
+from module.exception import RequestHumanTakeover, ScriptError, EmulatorNotRunningError
 from module.logger import logger
 
 
@@ -33,6 +33,14 @@ def retry(func):
             # Can't handle
             except RequestHumanTakeover:
                 break
+            # Emulator not running, try to restart it
+            except EmulatorNotRunningError:
+                logger.error('Emulator not running, attempting to restart')
+                if hasattr(self, 'emulator_start'):
+                    self.emulator_start()
+
+                def init():
+                    self.adb_reconnect()
             # When adb server was killed
             except ConnectionResetError as e:
                 logger.error(e)

+ 1 - 0
module/server/config_manager.py

@@ -26,6 +26,7 @@ class ConfigManager:
             # 如果没有脚本文件 则创建一个
             ConfigManager.copy(file='oas1', template='template')
             result.append('oas1')
+        result.sort()
         return result
 
     @staticmethod

+ 87 - 0
script.py

@@ -2,6 +2,7 @@
 # @author runhey
 # github https://github.com/runhey
 
+from functools import wraps
 import zerorpc
 import zmq
 import msgpack
@@ -28,6 +29,7 @@ from multiprocessing.queues import Queue
 from module.config.utils import convert_to_underscore
 from module.config.config import Config
 from module.config.config_model import ConfigModel
+from module.config.instance_guard import InstanceGuard
 from module.device.device import Device
 from module.device.env import IS_WINDOWS
 from module.base.utils import load_module
@@ -57,6 +59,8 @@ class Script:
         self.failure_record = {}
         # 运行loop的线程
         self.loop_thread: Thread = None
+        # 跨进程排队管理器(仅在 queue_mode=True 时初始化)
+        self.instance_guard: InstanceGuard = None
 
     @cached_property
     def config(self) -> "Config":
@@ -275,6 +279,19 @@ class Script:
             result[key] = item
         return json.dumps(result)
 
+    def _release_token_before_wait(func):
+        @wraps(func)
+        def wrapper(self, future):
+            if self.instance_guard and self.instance_guard.should_release(
+                pending_task=self.config.pending_task,
+                waiting_task=self.config.waiting_task,
+                idle_threshold_minutes=self.config.script.optimization.queue_idle_threshold
+            ):
+                self.instance_guard.release()
+            return func(self, future)
+        return wrapper
+
+    @_release_token_before_wait
     def wait_until(self, future):
         """
         Wait until a specific time.
@@ -312,6 +329,9 @@ class Script:
             if self.state_queue:
                 self.state_queue.put({"schedule": self.config.get_schedule_data()})
             now = datetime.now()
+            if not self._try_acquire_queue_token():
+                del_cached_property(self, "config")
+                continue
             # 任务时间到了返回任务名称
             if task.next_run <= now:
                 return task.command
@@ -320,6 +340,58 @@ class Script:
                 # 若等待被打断, 则刷新配置
                 del_cached_property(self, "config")
 
+    def _try_acquire_queue_token(self) -> bool:
+        """
+        尝试获取排队执行权。
+        如果排队模式未启用,返回 True。
+        如果排队模式启用但未能获取到执行权,进入等待循环直到获取成功或配置变更。
+
+        Returns:
+            True: 获取得执行权,可以执行任务
+            False: 等待被配置变更打断,调用方应重新加载配置后重试
+        """
+        # 是否开启排队模式
+        if not self.config.script.optimization.queue_mode:
+            if self.instance_guard:
+                self.instance_guard.remove_from_queue()
+                self.instance_guard = None
+            return True
+
+        # 懒加载instance_guard
+        if self.instance_guard is None:
+            try:
+                self.instance_guard = InstanceGuard(self.config_name)
+                logger.info(f"[Queue] Queue mode enabled for '{self.config_name}'")
+            except Exception:
+                self.instance_guard = None
+                return True
+
+        # 尝试获取执行权
+        if self.instance_guard.try_acquire():
+            return True
+
+        # 执行权获取失败,关闭模拟器并进入等待循环
+        logger.info(f"[Queue] '{self.config_name}' waiting for execution token...")
+        if (self.config.script.optimization.when_task_queue_empty == 'close_game'
+                and not self._emulator_down
+                and 'device' in self.__dict__):
+            try:
+                self.device.emulator_stop()
+                self._emulator_down = True
+                logger.info(f"[Queue] Emulator closed during queue wait")
+            except Exception:
+                pass
+        self.config.start_watching()
+        while True:
+            time.sleep(30)
+
+            if self.config.should_reload():
+                logger.info(f"[Queue] Config changed, re-evaluating")
+                return False
+
+            if self.instance_guard.try_acquire():
+                return True
+
     def _handle_wait_during_idle(self, next_run: datetime) -> bool:
         """
         处理任务空闲期间的行为策略
@@ -362,6 +434,8 @@ class Script:
 
         if self._emulator_down:
             logger.info("Wake emulator before next task")
+            if not self._try_acquire_queue_token():
+                return False
             self.device = Device(self.config)
             self._emulator_down = False
 
@@ -466,6 +540,19 @@ class Script:
         if command == 'start' or command == 'goto_main':
             logger.error(f'Invalid command `{command}`')
 
+        if not self._try_acquire_queue_token():
+            return False
+
+        if self.instance_guard and self.instance_guard.token_lost:
+            logger.warning(f'Token lost, stopping emulator and rejoining queue')
+            try:
+                self.device.emulator_stop()
+            except Exception:
+                pass
+            self._emulator_down = True
+            self.instance_guard.release()
+            return False
+
         try:
             self.device.screenshot()
             module_name = 'script_task'

BIN
tasks/ActivityShikigami/as/as_battle_main_to_records.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_pass.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_switch.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


+ 1 - 1
tasks/ActivityShikigami/as/image.json

@@ -21,7 +21,7 @@
     "itemName": "climb_mode_pass",
     "imageName": "as_climb_mode_pass.png",
     "roiFront": "1142,547,21,21",
-    "roiBack": "1129,511,111,68",
+    "roiBack": "1096,516,78,83",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动爬塔标志"

+ 3 - 3
tasks/ActivityShikigami/as/pages.json

@@ -2,7 +2,7 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "1187,383,43,29",
+    "roiFront": "1189,467,39,28",
     "roiBack": "1164,134,83,393",
     "method": "Template matching",
     "threshold": 0.7,
@@ -38,8 +38,8 @@
   {
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "245,284,39,176",
-    "roiBack": "177,240,238,269",
+    "roiFront": "1040,173,38,152",
+    "roiBack": "951,101,238,269",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入主要的战斗界面"

+ 7 - 7
tasks/ActivityShikigami/assets.py

@@ -29,7 +29,7 @@ class ActivityShikigamiAssets:
 	# 还未上锁图片 
 	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,607,266,95), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 活动爬塔标志 
-	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1142,547,21,21), roi_back=(1129,511,111,68), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
+	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1142,547,21,21), roi_back=(1096,516,78,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
 	# 体力爬塔标志 
 	I_CLIMB_MODE_AP = RuleImage(roi_front=(1093,544,20,20), roi_back=(1055,495,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_ap.png")
 	# 切换按键 
@@ -38,7 +38,7 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1187,383,43,29), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(1189,467,39,28), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 右上跳过按钮 
@@ -46,14 +46,14 @@ class ActivityShikigamiAssets:
 	# 红色退出 
 	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
 	# 进入主要的战斗界面 
-	I_TO_BATTLE_MAIN = RuleImage(roi_front=(245,284,39,176), roi_back=(177,240,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(1040,173,38,152), roi_back=(951,101,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
 	# 点击进入boss战斗页面 
-	I_TO_BATTLE_BOSS = RuleImage(roi_front=(940,250,20,100), roi_back=(900,200,100,200), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
+	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1076,241,37,136), roi_back=(934,209,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	# description 
 	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(50,642,62,58), roi_back=(1,510,415,203), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
 	# description 
-	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(352,171,45,35), roi_back=(319,150,100,300), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
-	# 从main进入到式神录
+	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(34,365,45,35), roi_back=(20,328,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
+	# 从main进入到式神录 
 	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1018,562,39,42), roi_back=(966,534,140,100), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
 	# description 
 	I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(15,94,247,38), roi_back=(2,68,311,100), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
@@ -92,7 +92,7 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 挑战 
-	O_FIRE = RuleOcr(roi=(1132,583,107,55), area=(1123,570,150,100), mode="Single", method="Default", keyword="挑战", name="fire")
+	O_FIRE = RuleOcr(roi=(1124,599,96,50), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
 	O_REMAIN_AP = RuleOcr(roi=(777,17,63,30), area=(776,16,63,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 

+ 2 - 0
tasks/AreaBoss/script_task.py

@@ -182,6 +182,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         return self.run_general_battle(self.config.area_boss.general_battle)
 
     def setup_ultra(self) -> bool:
+        # 确定进入鬼王界面
+        self.wait_until_appear(self.I_AB_CLOSE_RED)
         # 尝试切换
         if not self.get_difficulty():
             # 如果可以切换,直接切换

+ 4 - 4
tasks/Hyakkiyakou/assets.py

@@ -157,13 +157,13 @@ class HyakkiyakouAssets:
 	# description 
 	I_FRIEND_REMOTE_2 = RuleImage(roi_front=(440,122,89,56), roi_back=(440,122,89,56), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
 	# 回归活动使用 
-	I_FRIEND_SAME_1_RECALL = RuleImage(roi_front=(167,123,106,62), roi_back=(154,105,132,94), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_1.png")
+	I_FRIEND_SAME_1_RECALL = RuleImage(roi_front=(137,123,106,62), roi_back=(124,105,132,94), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_1.png")
 	# 回归活动使用 
-	I_FRIEND_REMOTE_1_RECALL = RuleImage(roi_front=(288,123,106,56), roi_back=(269,106,159,91), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_1.png")
+	I_FRIEND_REMOTE_1_RECALL = RuleImage(roi_front=(218,123,106,56), roi_back=(199,106,159,91), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_1.png")
 	# 回归活动使用 
-	I_FRIEND_SAME_2_RECALL = RuleImage(roi_front=(168,126,100,60), roi_back=(152,112,133,80), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_2.png")
+	I_FRIEND_SAME_2_RECALL = RuleImage(roi_front=(138,126,100,60), roi_back=(122,112,133,80), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_2.png")
 	# 回归活动使用 
-	I_FRIEND_REMOTE_2_RECALL = RuleImage(roi_front=(296,122,100,56), roi_back=(278,115,131,81), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
+	I_FRIEND_REMOTE_2_RECALL = RuleImage(roi_front=(226,122,100,56), roi_back=(208,115,131,81), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
 	# 寮 
 	I_FRIEND_RYOU_1 = RuleImage(roi_front=(537,126,80,45), roi_back=(537,126,80,45), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_ryou_1.png")
 	# description 

+ 8 - 8
tasks/Hyakkiyakou/hya/image5.json

@@ -38,8 +38,8 @@
   {
     "itemName": "friend_same_1_recall",
     "imageName": "hya_friend_same_1.png",
-    "roiFront": "167,123,106,62",
-    "roiBack": "154,105,132,94",
+    "roiFront": "137,123,106,62",
+    "roiBack": "124,105,132,94",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "回归活动使用"
@@ -47,8 +47,8 @@
   {
     "itemName": "friend_remote_1_recall",
     "imageName": "hya_friend_remote_1.png",
-    "roiFront": "288,123,106,56",
-    "roiBack": "269,106,159,91",
+    "roiFront": "218,123,106,56",
+    "roiBack": "199,106,159,91",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "回归活动使用"
@@ -56,8 +56,8 @@
   {
     "itemName": "friend_same_2_recall",
     "imageName": "hya_friend_same_2.png",
-    "roiFront": "168,126,100,60",
-    "roiBack": "152,112,133,80",
+    "roiFront": "138,126,100,60",
+    "roiBack": "122,112,133,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "回归活动使用"
@@ -65,8 +65,8 @@
   {
     "itemName": "friend_remote_2_recall",
     "imageName": "hya_friend_remote_2.png",
-    "roiFront": "296,122,100,56",
-    "roiBack": "278,115,131,81",
+    "roiFront": "226,122,100,56",
+    "roiBack": "208,115,131,81",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "回归活动使用"

+ 19 - 23
tasks/MemoryScrolls/assets.py

@@ -12,17 +12,17 @@ class MemoryScrollsAssets:
 
 	# Click Rule Assets
 	# 进入卷一 
-	C_MS_SCROLL_1 = RuleClick(roi_front=(170,157,279,192), roi_back=(170,157,279,192), name="ms_scroll_1")
+	C_MS_SCROLL_1 = RuleClick(roi_front=(247,192,279,192), roi_back=(247,192,279,192), name="ms_scroll_1")
 	# 进入卷二 
-	C_MS_SCROLL_2 = RuleClick(roi_front=(490,135,297,210), roi_back=(490,135,297,210), name="ms_scroll_2")
+	C_MS_SCROLL_2 = RuleClick(roi_front=(542,189,274,196), roi_back=(542,189,274,196), name="ms_scroll_2")
 	# 进入卷三 
-	C_MS_SCROLL_3 = RuleClick(roi_front=(836,135,304,210), roi_back=(836,135,304,210), name="ms_scroll_3")
+	C_MS_SCROLL_3 = RuleClick(roi_front=(840,192,279,187), roi_back=(840,192,279,187), name="ms_scroll_3")
 	# 进入卷四 
-	C_MS_SCROLL_4 = RuleClick(roi_front=(137,389,305,206), roi_back=(137,389,305,206), name="ms_scroll_4")
+	C_MS_SCROLL_4 = RuleClick(roi_front=(246,402,279,199), roi_back=(246,402,279,199), name="ms_scroll_4")
 	# 进入卷五 
-	C_MS_SCROLL_5 = RuleClick(roi_front=(491,390,303,207), roi_back=(491,390,303,207), name="ms_scroll_5")
+	C_MS_SCROLL_5 = RuleClick(roi_front=(552,405,271,196), roi_back=(552,405,271,196), name="ms_scroll_5")
 	# 进入卷六 
-	C_MS_SCROLL_6 = RuleClick(roi_front=(835,389,303,204), roi_back=(835,389,303,204), name="ms_scroll_6")
+	C_MS_SCROLL_6 = RuleClick(roi_front=(838,408,277,185), roi_back=(838,408,277,185), name="ms_scroll_6")
 	# 贡献完成跳结算 
 	C_MS_CONTRIBUTED = RuleClick(roi_front=(108,509,993,190), roi_back=(108,509,993,190), name="ms_contributed")
 	# 双绘卷之二 
@@ -33,41 +33,37 @@ class MemoryScrollsAssets:
 	# 进入绘卷主界面 
 	I_MS_ENTER = RuleImage(roi_front=(1169,155,24,55), roi_back=(1169,155,24,55), threshold=0.5, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_enter.png")
 	# 判断是否处于绘卷主界面 
-	I_MS_MAIN = RuleImage(roi_front=(689,3,40,50), roi_back=(689,3,40,50), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_main.png")
-	# 退出到召唤界面 
-	I_MS_BACK = RuleImage(roi_front=(32,31,43,45), roi_back=(32,31,43,45), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_back.png")
-	# 关闭分卷捐献界面 
-	I_MS_CLOSE = RuleImage(roi_front=(1145,48,39,41), roi_back=(1145,48,39,41), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_close.png")
+	I_MS_MAIN = RuleImage(roi_front=(151,390,40,50), roi_back=(151,390,40,50), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_main.png")
 	# 贡献碎片 
-	I_MS_CONTRIBUTE = RuleImage(roi_front=(1013,583,125,35), roi_back=(1013,583,125,35), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_contribute.png")
+	I_MS_CONTRIBUTE = RuleImage(roi_front=(1015,537,125,35), roi_back=(1015,537,125,35), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_contribute.png")
 	# 贡献碎片完成 
 	I_MS_CONTRIBUTED = RuleImage(roi_front=(493,232,63,40), roi_back=(493,232,63,40), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_contributed.png")
 	# 绘卷100% 
-	I_MS_COMPLETE = RuleImage(roi_front=(397,593,100,21), roi_back=(397,593,100,21), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_complete.png")
+	I_MS_COMPLETE = RuleImage(roi_front=(418,560,100,21), roi_back=(418,560,100,21), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_complete.png")
 	# 小绘卷不足 
-	I_MS_ZERO_S = RuleImage(roi_front=(968,160,51,27), roi_back=(968,160,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_s.png")
+	I_MS_ZERO_S = RuleImage(roi_front=(981,124,51,27), roi_back=(981,124,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_s.png")
 	# 中绘卷不足 
-	I_MS_ZERO_M = RuleImage(roi_front=(967,312,54,26), roi_back=(967,312,54,26), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_m.png")
+	I_MS_ZERO_M = RuleImage(roi_front=(981,266,54,26), roi_back=(981,266,54,26), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_m.png")
 	# 大绘卷不足 
-	I_MS_ZERO_L = RuleImage(roi_front=(968,464,51,27), roi_back=(968,464,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_l.png")
+	I_MS_ZERO_L = RuleImage(roi_front=(982,408,51,27), roi_back=(982,408,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_l.png")
 	# 绘卷到达95%进度 
-	I_MS_COMPLETE_95 = RuleImage(roi_front=(655,594,4,18), roi_back=(655,594,4,18), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_complete_100.png")
+	I_MS_COMPLETE_95 = RuleImage(roi_front=(654,562,8,18), roi_back=(654,562,8,18), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_complete_100.png")
 	# 小碎片 
-	I_MS_FRAGMENT_S = RuleImage(roi_front=(290,677,40,35), roi_back=(290,677,40,35), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s.png")
+	I_MS_FRAGMENT_S = RuleImage(roi_front=(651,25,26,23), roi_back=(640,0,58,63), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s.png")
 	# 小碎片满50 
-	I_MS_FRAGMENT_S_50 = RuleImage(roi_front=(473,517,60,25), roi_back=(473,517,60,25), threshold=0.9, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_50.png")
+	I_MS_FRAGMENT_S_50 = RuleImage(roi_front=(540,314,60,25), roi_back=(507,302,104,45), threshold=0.95, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_50.png")
 	# description 
-	I_MS_FRAGMENT_S_VERIFICATION = RuleImage(roi_front=(522,318,100,100), roi_back=(522,318,100,100), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png")
+	I_MS_FRAGMENT_S_VERIFICATION = RuleImage(roi_front=(615,137,44,39), roi_back=(598,115,100,100), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png")
 	# 双绘卷进入按钮 
 	I_MS_DOUBLE_SCROLLS_ENTER = RuleImage(roi_front=(565,586,154,40), roi_back=(565,586,154,40), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_double_scrolls_enter.png")
 
 
 	# Swipe Rule Assets
 	# 小碎片拉满 
-	S_MS_SWIPE_S = RuleSwipe(roi_front=(838,199,37,27), roi_back=(1176,171,80,81), mode="default", name="ms_swipe_s")
+	S_MS_SWIPE_S = RuleSwipe(roi_front=(853,182,37,27), roi_back=(1129,157,49,70), mode="default", name="ms_swipe_s")
 	# 中碎片拉满 
-	S_MS_SWIPE_M = RuleSwipe(roi_front=(838,352,37,23), roi_back=(1176,326,83,84), mode="default", name="ms_swipe_m")
+	S_MS_SWIPE_M = RuleSwipe(roi_front=(852,326,37,23), roi_back=(1129,300,47,81), mode="default", name="ms_swipe_m")
 	# 大碎片拉满 
-	S_MS_SWIPE_L = RuleSwipe(roi_front=(839,503,34,25), roi_back=(1175,473,78,85), mode="default", name="ms_swipe_l")
+	S_MS_SWIPE_L = RuleSwipe(roi_front=(854,465,34,25), roi_back=(1131,440,43,77), mode="default", name="ms_swipe_l")
 
 

+ 12 - 12
tasks/MemoryScrolls/ms/click.json

@@ -1,38 +1,38 @@
 [
   {
     "itemName": "ms_scroll_1",
-    "roiFront": "170,157,279,192",
-    "roiBack": "170,157,279,192",
+    "roiFront": "247,192,279,192",
+    "roiBack": "247,192,279,192",
     "description": "进入卷一"
   },
   {
     "itemName": "ms_scroll_2",
-    "roiFront": "490,135,297,210",
-    "roiBack": "490,135,297,210",
+    "roiFront": "542,189,274,196",
+    "roiBack": "542,189,274,196",
     "description": "进入卷二"
   },
   {
     "itemName": "ms_scroll_3",
-    "roiFront": "836,135,304,210",
-    "roiBack": "836,135,304,210",
+    "roiFront": "840,192,279,187",
+    "roiBack": "840,192,279,187",
     "description": "进入卷三"
   },
   {
     "itemName": "ms_scroll_4",
-    "roiFront": "137,389,305,206",
-    "roiBack": "137,389,305,206",
+    "roiFront": "246,402,279,199",
+    "roiBack": "246,402,279,199",
     "description": "进入卷四"
   },
   {
     "itemName": "ms_scroll_5",
-    "roiFront": "491,390,303,207",
-    "roiBack": "491,390,303,207",
+    "roiFront": "552,405,271,196",
+    "roiBack": "552,405,271,196",
     "description": "进入卷五"
   },
   {
     "itemName": "ms_scroll_6",
-    "roiFront": "835,389,303,204",
-    "roiBack": "835,389,303,204",
+    "roiFront": "838,408,277,185",
+    "roiBack": "838,408,277,185",
     "description": "进入卷六"
   },
   {

+ 21 - 39
tasks/MemoryScrolls/ms/image.json

@@ -11,35 +11,17 @@
   {
     "itemName": "ms_main",
     "imageName": "ms_ms_main.png",
-    "roiFront": "689,3,40,50",
-    "roiBack": "689,3,40,50",
+    "roiFront": "151,390,40,50",
+    "roiBack": "151,390,40,50",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "判断是否处于绘卷主界面"
   },
-  {
-    "itemName": "ms_back",
-    "imageName": "ms_ms_back.png",
-    "roiFront": "32,31,43,45",
-    "roiBack": "32,31,43,45",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "退出到召唤界面"
-  },
-  {
-    "itemName": "ms_close",
-    "imageName": "ms_ms_close.png",
-    "roiFront": "1145,48,39,41",
-    "roiBack": "1145,48,39,41",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "关闭分卷捐献界面"
-  },
   {
     "itemName": "ms_contribute",
     "imageName": "ms_ms_contribute.png",
-    "roiFront": "1013,583,125,35",
-    "roiBack": "1013,583,125,35",
+    "roiFront": "1015,537,125,35",
+    "roiBack": "1015,537,125,35",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "贡献碎片"
@@ -56,8 +38,8 @@
   {
     "itemName": "ms_complete",
     "imageName": "ms_ms_complete.png",
-    "roiFront": "397,593,100,21",
-    "roiBack": "397,593,100,21",
+    "roiFront": "418,560,100,21",
+    "roiBack": "418,560,100,21",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "绘卷100%"
@@ -65,8 +47,8 @@
   {
     "itemName": "ms_zero_s",
     "imageName": "ms_ms_zero_s.png",
-    "roiFront": "968,160,51,27",
-    "roiBack": "968,160,51,27",
+    "roiFront": "981,124,51,27",
+    "roiBack": "981,124,51,27",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "小绘卷不足"
@@ -74,8 +56,8 @@
   {
     "itemName": "ms_zero_m",
     "imageName": "ms_ms_zero_m.png",
-    "roiFront": "967,312,54,26",
-    "roiBack": "967,312,54,26",
+    "roiFront": "981,266,54,26",
+    "roiBack": "981,266,54,26",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "中绘卷不足"
@@ -83,8 +65,8 @@
   {
     "itemName": "ms_zero_l",
     "imageName": "ms_ms_zero_l.png",
-    "roiFront": "968,464,51,27",
-    "roiBack": "968,464,51,27",
+    "roiFront": "982,408,51,27",
+    "roiBack": "982,408,51,27",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "大绘卷不足"
@@ -92,8 +74,8 @@
   {
     "itemName": "ms_complete_95",
     "imageName": "ms_ms_complete_100.png",
-    "roiFront": "655,594,4,18",
-    "roiBack": "655,594,4,18",
+    "roiFront": "654,562,8,18",
+    "roiBack": "654,562,8,18",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "绘卷到达95%进度"
@@ -101,8 +83,8 @@
   {
     "itemName": "ms_fragment_s",
     "imageName": "ms_ms_fragment_s.png",
-    "roiFront": "290,677,40,35",
-    "roiBack": "290,677,40,35",
+    "roiFront": "651,25,26,23",
+    "roiBack": "640,0,58,63",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "小碎片"
@@ -110,17 +92,17 @@
   {
     "itemName": "ms_fragment_s_50",
     "imageName": "ms_ms_fragment_s_50.png",
-    "roiFront": "473,517,60,25",
-    "roiBack": "473,517,60,25",
+    "roiFront": "540,314,60,25",
+    "roiBack": "507,302,104,45",
     "method": "Template matching",
-    "threshold": 0.9,
+    "threshold": 0.95,
     "description": "小碎片满50"
   },
   {
     "itemName": "ms_fragment_s_verification",
     "imageName": "ms_ms_fragment_s_verification.png",
-    "roiFront": "522,318,100,100",
-    "roiBack": "522,318,100,100",
+    "roiFront": "615,137,44,39",
+    "roiBack": "598,115,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

BIN
tasks/MemoryScrolls/ms/ms_ms_back.png


BIN
tasks/MemoryScrolls/ms/ms_ms_close.png


BIN
tasks/MemoryScrolls/ms/ms_ms_complete.png


BIN
tasks/MemoryScrolls/ms/ms_ms_complete_100.png


BIN
tasks/MemoryScrolls/ms/ms_ms_contribute.png


BIN
tasks/MemoryScrolls/ms/ms_ms_fragment_s.png


BIN
tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png


BIN
tasks/MemoryScrolls/ms/ms_ms_main.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_l.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_m.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_s.png


+ 6 - 6
tasks/MemoryScrolls/ms/swipe.json

@@ -1,22 +1,22 @@
 [
   {
     "itemName": "ms_swipe_s",
-    "roiFront": "838,199,37,27",
-    "roiBack": "1176,171,80,81",
+    "roiFront": "853,182,37,27",
+    "roiBack": "1129,157,49,70",
     "mode": "default",
     "description": "小碎片拉满"
   },
   {
     "itemName": "ms_swipe_m",
-    "roiFront": "838,352,37,23",
-    "roiBack": "1176,326,83,84",
+    "roiFront": "852,326,37,23",
+    "roiBack": "1129,300,47,81",
     "mode": "default",
     "description": "中碎片拉满"
   },
   {
     "itemName": "ms_swipe_l",
-    "roiFront": "839,503,34,25",
-    "roiBack": "1175,473,78,85",
+    "roiFront": "854,465,34,25",
+    "roiBack": "1131,440,43,77",
     "mode": "default",
     "description": "大碎片拉满"
   }

+ 5 - 5
tasks/MemoryScrolls/script_task.py

@@ -10,6 +10,7 @@ from datetime import timedelta, datetime
 
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_summon
+from tasks.GlobalGame.assets import GlobalGameAssets
 from tasks.MemoryScrolls.assets import MemoryScrollsAssets
 from tasks.MemoryScrolls.config import ScrollNumber
 
@@ -68,8 +69,8 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
             self.ui_click_until_smt_disappear(self.I_MS_FRAGMENT_S, stop=self.I_MS_FRAGMENT_S_VERIFICATION, interval=1.5)
         # 进入指定分卷
         self.goto_scroll(con)
-        # 返回召唤界面,目前只发现此种返回按键
-        self.ui_click_until_disappear(self.I_MS_BACK, interval=1)
+        # 返回召唤界面
+        self.ui_click_until_disappear(GlobalGameAssets.I_UI_BACK_YELLOW, interval=1)
         logger.info('Return to Summon page')
     
     def goto_scroll(self, con):
@@ -79,8 +80,7 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
         """
         while 1:
             self.screenshot()
-            # 暂时用手动截取叉号,后续替换为通用图片
-            if self.appear(self.I_MS_CLOSE):
+            if self.appear(GlobalGameAssets.I_UI_BACK_RED):
                 logger.info('Entered Memory Scrolls contribution page')
                 break
             match con.scroll_number:
@@ -126,7 +126,7 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
                 # next_run=datetime.now() + timedelta(days=1)
                 # self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
         # 返回绘卷主界面
-        self.ui_click_until_disappear(self.I_MS_CLOSE, interval=1)
+        self.ui_click_until_disappear(GlobalGameAssets.I_UI_BACK_RED, interval=1)
         logger.info('Closed Memory Scrolls contribution page')
     
     def contribute_memoryscrolls(self):

+ 3 - 1
tasks/RealmRaid/script_task.py

@@ -517,7 +517,9 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
 
             if not self.appear(self.I_RR_PERSON, threshold=0.8):
                 break
-                
+            # https://github.com/runhey/OnmyojiAutoScript/issues/1692
+            if self.appear_then_click(self.I_SOUL_RAID, interval=2):
+                continue
             if self.appear_then_click(self.I_FIRE, interval=1):
                 continue
             if self.click(click, interval=1.8):

+ 4 - 0
tasks/Script/config_optimization.py

@@ -32,4 +32,8 @@ class Optimization(BaseModel):
     emulator_startup_lead_time: Time = Field(default=Time(minute=2),
                                             description='emulator_startup_lead_time_help')
     schedule_rule: ScheduleRule = Field(default=ScheduleRule.FILTER, description='schedule_rule_help')
+    # 排队模式:多个实例排队依次执行任务,避免同时执行造成服务器压力
+    queue_mode: bool = Field(default=False, description='queue_mode_help')
+    # 释放执行权的空闲阈值(分钟),仅 queue_mode=True 时生效
+    queue_idle_threshold: int = Field(default=10, description='queue_idle_threshold_help')
 

+ 22 - 6
tasks/TrueOrochi/script_task.py

@@ -86,9 +86,28 @@ class ScriptTask(OrochiScriptTask, TrueOrochiAssets):
             # 如果还没有真蛇,那么就退出
             self.check_times(battle)
             raise TaskEnd('TrueOrochi')
-        # 如果有真蛇,那么就开始战斗
+
+        # 如果有真蛇,开始第一次战斗
+        self.run_true_orochi_battle()
+        self.check_times(True)
+
+        # 检查是否还有真蛇入口,支持存储两次
+        self.ui_get_current_page()
+        self.ui_goto(page_soul_zones)
+        self.orochi_enter()
+        sleep(0.5)
+        if conf.current_success < 2 and self.check_true_orochi(True):
+            battle = True
+            logger.info('Find another true orochi entry, continue')
+            self.run_true_orochi_battle()
+            self.check_times(battle)
+
+        raise TaskEnd('TrueOrochi')
+
+    def run_true_orochi_battle(self):
+        """执行一次真蛇战斗"""
+        conf = self.config.true_orochi.true_orochi_config
         logger.hr('True Orochi Battle')
-        conf.current_success += 1
         while 1:
             self.screenshot()
             if self.appear(self.I_ST_CREATE_ROOM):
@@ -166,8 +185,6 @@ class ScriptTask(OrochiScriptTask, TrueOrochiAssets):
             sleep(0.5)
 
         logger.info("Battle process end")
-        self.check_times(battle)
-        raise TaskEnd('TrueOrochi')
 
     def check_true_orochi(self, screenshot=False) -> bool:
         """
@@ -219,5 +236,4 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t.run()
-
+    t.run()