Browse Source

Merge pull request #2 from runhey/dev

更新主版本
davidyangkunlong 3 months ago
parent
commit
73b6384b27
87 changed files with 923 additions and 317 deletions
  1. 2 2
      assets/i18n/zh-CN.json
  2. 3 1
      config/template.json
  3. 310 0
      module/config/instance_guard.py
  4. 9 1
      module/device/method/adb.py
  5. 2 0
      module/device/method/nemu_ipc.py
  6. 1 1
      module/logger.py
  7. 1 0
      module/server/config_manager.py
  8. 87 0
      script.py
  9. BIN
      tasks/ActivityShikigami/as/as_battle_main_to_records.png
  10. BIN
      tasks/ActivityShikigami/as/as_check_battle_boss.png
  11. BIN
      tasks/ActivityShikigami/as/as_climb_mode_pass.png
  12. BIN
      tasks/ActivityShikigami/as/as_climb_mode_switch.png
  13. BIN
      tasks/ActivityShikigami/as/as_shi.png
  14. BIN
      tasks/ActivityShikigami/as/as_to_battle_boss.png
  15. BIN
      tasks/ActivityShikigami/as/as_to_battle_main.png
  16. 1 1
      tasks/ActivityShikigami/as/image.json
  17. 3 3
      tasks/ActivityShikigami/as/pages.json
  18. 3 3
      tasks/ActivityShikigami/assets.py
  19. 19 0
      tasks/ActivityShikigami/script_task.py
  20. 59 41
      tasks/AreaBoss/script_task.py
  21. 43 20
      tasks/BondlingFairyland/general_invite.py
  22. 14 4
      tasks/BondlingFairyland/script_task.py
  23. 13 1
      tasks/Component/Costume/assets.py
  24. 1 1
      tasks/Component/Costume/config.py
  25. 2 2
      tasks/Component/Costume/costume_base.py
  26. 47 0
      tasks/Component/Costume/main15/image.json
  27. BIN
      tasks/Component/Costume/main15/main15_check_main_15.png
  28. BIN
      tasks/Component/Costume/main15/main15_main_goto_exploration_15.png
  29. BIN
      tasks/Component/Costume/main15/main15_main_goto_summon_15.png
  30. BIN
      tasks/Component/Costume/main15/main15_main_goto_town_15.png
  31. BIN
      tasks/Component/Costume/main15/main15_pet_house_15.png
  32. 5 1
      tasks/Component/GeneralBattle/general_battle.py
  33. 2 3
      tasks/Component/GeneralInvite/assets.py
  34. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_explore.png
  35. 2 2
      tasks/Component/GeneralInvite/gi/image.json
  36. 2 2
      tasks/Component/GeneralInvite/gi/member.json
  37. 3 0
      tasks/Component/ReplaceShikigami/replace_shikigami.py
  38. 19 4
      tasks/FloatParade/assets.py
  39. BIN
      tasks/FloatParade/fp/fp_fp_access.png
  40. BIN
      tasks/FloatParade/fp/fp_fp_getall0.png
  41. BIN
      tasks/FloatParade/fp/fp_fp_select_1.png
  42. BIN
      tasks/FloatParade/fp/fp_fp_select_2.png
  43. BIN
      tasks/FloatParade/fp/fp_fp_select_3.png
  44. BIN
      tasks/FloatParade/fp/fp_fp_tasks.png
  45. BIN
      tasks/FloatParade/fp/fp_fp_upgrade.png
  46. BIN
      tasks/FloatParade/fp/fp_red_point_0.png
  47. 43 7
      tasks/FloatParade/fp/image.json
  48. 20 0
      tasks/FloatParade/mileage/mileage.json
  49. BIN
      tasks/FloatParade/mileage/mileage_claim_mileage.png
  50. BIN
      tasks/FloatParade/mileage/mileage_entry_mileage.png
  51. 42 48
      tasks/FloatParade/script_task.py
  52. 2 2
      tasks/GameUi/assets.py
  53. 9 1
      tasks/GameUi/game_ui.py
  54. 2 2
      tasks/GameUi/page.py
  55. BIN
      tasks/GameUi/page/page_check_six_gates.png
  56. 4 4
      tasks/GameUi/page/page_img.json
  57. 16 6
      tasks/HeroTest/script_task.py
  58. 4 4
      tasks/Hyakkiyakou/assets.py
  59. 8 8
      tasks/Hyakkiyakou/hya/image5.json
  60. 19 23
      tasks/MemoryScrolls/assets.py
  61. 12 12
      tasks/MemoryScrolls/ms/click.json
  62. 21 39
      tasks/MemoryScrolls/ms/image.json
  63. BIN
      tasks/MemoryScrolls/ms/ms_ms_back.png
  64. BIN
      tasks/MemoryScrolls/ms/ms_ms_close.png
  65. BIN
      tasks/MemoryScrolls/ms/ms_ms_complete.png
  66. BIN
      tasks/MemoryScrolls/ms/ms_ms_complete_100.png
  67. BIN
      tasks/MemoryScrolls/ms/ms_ms_contribute.png
  68. BIN
      tasks/MemoryScrolls/ms/ms_ms_fragment_s.png
  69. BIN
      tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png
  70. BIN
      tasks/MemoryScrolls/ms/ms_ms_main.png
  71. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_l.png
  72. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_m.png
  73. BIN
      tasks/MemoryScrolls/ms/ms_ms_zero_s.png
  74. 6 6
      tasks/MemoryScrolls/ms/swipe.json
  75. 5 5
      tasks/MemoryScrolls/script_task.py
  76. 3 1
      tasks/RealmRaid/script_task.py
  77. 0 2
      tasks/Restart/assets.py
  78. 18 29
      tasks/Restart/login.py
  79. 0 9
      tasks/Restart/login/image.json
  80. BIN
      tasks/Restart/login/login_courtyard.png
  81. 1 1
      tasks/RichMan/assets.py
  82. 1 1
      tasks/RichMan/mall/navbar/image_side.json
  83. 4 0
      tasks/Script/config_optimization.py
  84. 22 6
      tasks/TrueOrochi/script_task.py
  85. 2 2
      tasks/WeeklyTrifles/area_boss/image.json
  86. 1 1
      tasks/WeeklyTrifles/assets.py
  87. 5 5
      tasks/WeeklyTrifles/script_task.py

+ 2 - 2
assets/i18n/zh-CN.json

@@ -40,6 +40,6 @@
   "close_emulator_wait_duration_help": "距离下一个任务超过此分钟数时关闭模拟器;设为0表示禁用",
   "emulator_startup_lead_time": "模拟器预热时间",
   "emulator_startup_lead_time_help": "在开始运行任务之前提前启动模拟器的时间",
-  "exit_four_help": "支持打九退四,保证稳定57级,要求设置好战斗主题,即 脚本->全局配置->游戏装饰自定义->战斗主题"
+  "exit_four_help": "支持打九退四,保证稳定57级,要求设置好战斗主题,即 脚本->全局配置->游戏装饰自定义->战斗主题",
+  "costume_main_15": "茨心乐园"
 }
-

+ 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)

+ 2 - 0
module/device/method/nemu_ipc.py

@@ -214,6 +214,8 @@ class NemuIpcImpl:
             os.path.abspath(os.path.join(nemu_folder, './shell/sdk/external_renderer_ipc.dll')),
             # MuMuPlayer12 5.0
             os.path.abspath(os.path.join(nemu_folder, './nx_device/12.0/shell/sdk/external_renderer_ipc.dll')),
+            # MuMuPlayer15
+            os.path.abspath(os.path.join(nemu_folder, './nx_device/15.0/shell/sdk/external_renderer_ipc.dll')),
         ]
         self.lib = None
         for ipc_dll in list_dll:

+ 1 - 1
module/logger.py

@@ -16,7 +16,7 @@ from rich.rule import Rule
 from typing import Callable, List
 
 
-def cleanup_logs(log_dir: str = "./log", keep_days: int = 7):
+def cleanup_logs(log_dir: str = "./log", keep_days: int = 14):
     """删除 log_dir 下所有早于 keep_days 的文件夹和文件"""
     log_path = Path(log_dir)
     if not log_path.exists():

+ 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_check_battle_boss.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_boss.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": "进入主要的战斗界面"

+ 3 - 3
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,7 +46,7 @@ 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=(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 

+ 19 - 0
tasks/ActivityShikigami/script_task.py

@@ -251,6 +251,25 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         """
         logger.hr(f'Start run climb type BOSS')
 
+        self.ui_clicks([self.I_TO_BATTLE_BOSS],
+                       stop=self.I_CHECK_BATTLE_BOSS, interval=1)
+
+
+        while 1:
+            self.screenshot()
+            self.put_status()
+            # --------------------------------------------------------------
+            if not self.ocr_appear(self.O_FIRE):
+                self.appear_then_click(self.I_CHECK_BATTLE_BOSS, interval=4)
+                continue
+
+            if self.conf.general_climb.random_sleep:
+                random_sleep(probability=0.2)
+            if self.start_battle():
+                continue
+
+        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_BOSS, interval=1)
+
     def _run_ap100(self):
         """
         更新前请先看 ./README.md

+ 59 - 41
tasks/AreaBoss/script_task.py

@@ -60,14 +60,14 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.switch_to_famous()
 
         if con.boss_number - boss_fought == 3:
-            self.boss_fight(self.I_BATTLE_1)
-            self.boss_fight(self.I_BATTLE_2)
-            self.boss_fight(self.I_BATTLE_3)
+            self.boss_fight(self.I_BATTLE_1, ultra=True)
+            self.boss_fight(self.I_BATTLE_2, ultra=True)
+            self.boss_fight(self.I_BATTLE_3, ultra=True)
         elif con.boss_number - boss_fought == 2:
-            self.boss_fight(self.I_BATTLE_1)
-            self.boss_fight(self.I_BATTLE_2)
+            self.boss_fight(self.I_BATTLE_1, ultra=True)
+            self.boss_fight(self.I_BATTLE_2, ultra=True)
         elif con.boss_number - boss_fought == 1:
-            self.boss_fight(self.I_BATTLE_1)
+            self.boss_fight(self.I_BATTLE_1, ultra=True)
         # 退出
         self.go_back()
         self.set_next_run(task='AreaBoss', success=True, finish=False)
@@ -147,30 +147,22 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
         # 如果已经打过该BOSS,直接跳过不打了
         if self.is_group_ranked():
+            logger.warning("There is no boss could be challenged")
             self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
             return True
 
-        if ultra:
-            if not self.get_difficulty():
-                # 判断是否能切换到极地鬼
-                if not self.appear(self.I_AB_DIFFICULTY_NORMAL) and self.config.area_boss.boss.Attack_60:
-                    self.switch_to_level_60()
-                    if not self.start_fight():
-                        logger.warning("you are so weakness!")
-                        self.wait_until_appear(self.I_AB_CLOSE_RED)
-                        self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
-                        return False
-                else:
-                    self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
-                    return False
-                # 切换到 极地鬼
-            self.switch_difficulty(True)
-
-            # 调整悬赏层数
-            match reward_floor:
-                case AreaBossFloor.ONE: self.switch_to_floor_1()
-                case AreaBossFloor.TEN: self.switch_to_floor_10()
-                case AreaBossFloor.DEFAULT: logger.info("Not change floor")
+        # 设置极模式
+        if ultra and self.setup_ultra():
+            pass
+        # 普通模式下的60级
+        elif self.config.area_boss.boss.Attack_60:
+            self.switch_to_level_60()
+            if not self.start_fight():
+                logger.warning("you are so weakness!")
+                self.wait_until_appear(self.I_AB_CLOSE_RED)
+                self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
+                return False
+
         result = True
         if not self.start_fight():
             result = False
@@ -188,8 +180,31 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                 break
 
         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():
+            # 如果可以切换,直接切换
+            if self.appear(self.I_AB_DIFFICULTY_NORMAL):
+                self.switch_difficulty(True)
+            else:
+                logger.warning("Cannot switch difficulty")
+                return False
+        # 调整悬赏层数
+        reward_floor = self.config.area_boss.boss.reward_floor
+        match reward_floor:
+            case AreaBossFloor.ONE:
+                self.switch_to_floor_1()
+            case AreaBossFloor.TEN:
+                self.switch_to_floor_10()
+            case AreaBossFloor.DEFAULT:
+                logger.info("Not change floor")
+        return True
+
     def switch_to_level_60(self):
+        logger.info("Switch to level 60")
         while 1:
             self.screenshot()
             if self.appear(self.I_AB_LEVEL_60):
@@ -197,7 +212,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             if self.appear(self.I_AB_LEVEL_HANDLE):
                 x, y = self.I_AB_LEVEL_HANDLE.front_center()
                 self.S_AB_LEVEL_RIGHT.roi_front = (x, y, 10, 10)
-                self.swipe(self.S_AB_LEVEL_RIGHT)
+                self.swipe(self.S_AB_LEVEL_RIGHT, interval=3)
 
     def get_difficulty(self) -> bool:
         """
@@ -383,18 +398,21 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                     False       打开失败
         @rtype:
         """
-        try_num = 3 if try_num <= 0 else try_num
-
-        while try_num > 0:
-            self.click(battle, interval=3)
-            if self.wait_until_appear(self.I_AB_CLOSE_RED, wait_time=3):
-                break
-            try_num -= 1
-        # 打开鬼王详情界面失败,直接返回
-        self.screenshot()
-        if self.appear(self.I_AB_CLOSE_RED):
-            return True
-        return False
+        try_count = 0
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_AB_CLOSE_RED) and self.appear(self.I_FIRE):
+                self.screenshot()
+                if not self.appear(self.I_FIRE):
+                    continue
+                return True
+            if try_count >= try_num:
+                logger.warning(f"Cannot boss_detail, try {try_count} times")
+                return False
+            if self.click(battle, interval=3):
+                try_count += 1
+                continue
+        return True
 
     def is_group_ranked(self):
         """

+ 43 - 20
tasks/BondlingFairyland/general_invite.py

@@ -74,6 +74,11 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
                 logger.warning('Timeout, now is no room')
                 return False
 
+            if self.appear(self.I_INVITE_ENSURE) or self.appear(self.I_GI_CANCEL):
+                logger.warning('Invite page is still open, close it before checking room status')
+                self.close_invite_page()
+                continue
+
             if not self.is_in_room():
                 continue
 
@@ -100,6 +105,25 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
                     self.timer_invite.reset()
                 self.invite_friends(config)
 
+    def close_invite_page(self) -> bool:
+        """
+        Close the invite selector if it is still open, returning to the room page.
+        """
+        logger.info('Close invite page')
+        timer = Timer(3).start()
+        closed = False
+        while not timer.reached():
+            self.screenshot()
+            if not self.appear(self.I_INVITE_ENSURE) and not self.appear(self.I_GI_CANCEL):
+                return closed
+            if self.appear_then_click(self.I_GI_CANCEL, interval=0.8):
+                closed = True
+                continue
+            if self.appear_then_click(self.I_INVITE_ENSURE, interval=0.8):
+                closed = True
+                continue
+        return closed
+
     def ensure_enter(self) -> bool:
         """
         确认是否进入了组队界面
@@ -343,25 +367,26 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
             logger.info('Find recent friend')
             # 获取’最近‘在friend_class中的index
             if '最近' not in friend_class:
-                logger.warning('No recent friend')
-                return False
-            recent_index = friend_class.index('最近')
-            while recent_index == 1:
-                self.screenshot()
-                if self.appear(self.I_FLAG_2_ON):
-                    break
-                if self.appear_then_click(self.I_FLAG_2_OFF, interval=1):
-                    continue
+                logger.warning('No recent friend, fallback to auto find')
+                find_mode = FindMode.AUTO_FIND
+            else:
+                recent_index = friend_class.index('最近')
+                while recent_index == 1:
+                    self.screenshot()
+                    if self.appear(self.I_FLAG_2_ON):
+                        break
+                    if self.appear_then_click(self.I_FLAG_2_OFF, interval=1):
+                        continue
 
-            logger.info(f'Now find friend in ”最近“')
-            sleep(1)
-            if not is_select:
-                if self.detect_select(name):
-                    is_select = True
-            sleep(1)
-            if not is_select:
-                if self.detect_select(name):
-                    is_select = True
+                logger.info(f'Now find friend in “最近”')
+                sleep(1)
+                if not is_select:
+                    if self.detect_select(name):
+                        is_select = True
+                sleep(1)
+                if not is_select:
+                    if self.detect_select(name):
+                        is_select = True
 
         for index in range(len(friend_class)):
             # 如果不是自动寻找,就跳过
@@ -472,5 +497,3 @@ if __name__ == '__main__':
     # t.run_invite(c.orochi.invite_config, is_first=True)
     t.screenshot()
     print(t.appear(t.I_FIRE, threshold=0.8))
-
-

+ 14 - 4
tasks/BondlingFairyland/script_task.py

@@ -101,19 +101,29 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                     self.screenshot()
                     if self.appear(self.I_GI_IN_ROOM):
                         return True
+                    # 求援后可能出现式盘数量上限确认弹窗
+                    if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                        sleep(1)
+                        continue
                     if click_count >= 6:
                         logger.error('Click fire failed')
                         logger.error(
                             'You might need to check your bondling number. It most possibly arrived to the max 500')
                         raise BondlingNumberMax
-                    # 某些活动的时候出现 “选择共鸣的阴阳师”
-                    if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
-                        continue
                     if self.check_and_invite(True):
                         continue
                     if self.appear(self.I_CREATE_TEAM, interval=1):
                         self.ensure_private()
-                        self.appear_then_click(self.I_CREATE_TEAM, interval=2)
+                        if self.appear_then_click(self.I_CREATE_TEAM, interval=2):
+                            logger.info('Wait up to 5s for bondling room after creating team')
+                            enter_timer = Timer(5).start()
+                            while not enter_timer.reached():
+                                self.screenshot()
+                                if self.appear(self.I_GI_IN_ROOM) or self.is_in_room(is_screenshot=False):
+                                    logger.info('Bondling room entered after creating team')
+                                    return True
+                                if self.appear(self.I_BALL_HELP) or self.appear(self.I_CREATE_TEAM):
+                                    break
                         continue
                     # 求援
                     if self.appear(self.I_BALL_AREA, interval=1):

+ 13 - 1
tasks/Component/Costume/assets.py

@@ -88,6 +88,19 @@ class CostumeAssets:
 	I_PET_HOUSE_14 = RuleImage(roi_front=(1034,449,35,33), roi_back=(925,362,235,218), threshold=0.7, method="Template matching", file="./tasks/Component/Costume/main14/main14_pet_house_14.png")
 
 
+	# Image Rule Assets
+	# 茨心乐园庭院判定
+	I_CHECK_MAIN_15 = RuleImage(roi_front=(1017,365,71,48), roi_back=(900,270,300,220), threshold=0.75, method="Template matching", file="./tasks/Component/Costume/main15/main15_check_main_15.png")
+	# 探索
+	I_MAIN_GOTO_EXPLORATION_15 = RuleImage(roi_front=(590,190,30,50), roi_back=(520,130,190,180), threshold=0.55, method="Template matching", file="./tasks/Component/Costume/main15/main15_main_goto_exploration_15.png")
+	# 召唤屋
+	I_MAIN_GOTO_SUMMON_15 = RuleImage(roi_front=(960,204,28,45), roi_back=(890,130,200,180), threshold=0.55, method="Template matching", file="./tasks/Component/Costume/main15/main15_main_goto_summon_15.png")
+	# 町中
+	I_MAIN_GOTO_TOWN_15 = RuleImage(roi_front=(838,324,24,49), roi_back=(760,250,200,190), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main15/main15_main_goto_town_15.png")
+	# 宠物屋
+	I_PET_HOUSE_15 = RuleImage(roi_front=(951,383,31,50), roi_back=(900,330,150,150), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main15/main15_pet_house_15.png")
+
+
 	# Image Rule Assets
 	# description 
 	I_CHECK_MAIN_2 = RuleImage(roi_front=(1090,146,48,55), roi_back=(880,108,271,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main2/main2_check_main_2.png")
@@ -191,4 +204,3 @@ class CostumeAssets:
 	# description 
 	I_PET_HOUSE_9 = RuleImage(roi_front=(888,327,40,35), roi_back=(730,316,440,57), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main9/main9_pet_house_9.png")
 
-

+ 1 - 1
tasks/Component/Costume/config.py

@@ -21,6 +21,7 @@ class MainType(str, Enum):
     COSTUME_MAIN_12 = 'costume_main_12'  # 龙吟溯玉
     COSTUME_MAIN_13 = 'costume_main_13'  # 云景阆苑
     COSTUME_MAIN_14 = 'costume_main_14'  # 雪月华庭
+    COSTUME_MAIN_15 = 'costume_main_15'  # 茨心乐园
 
 # 结界皮肤
 class RealmType(str, Enum):
@@ -100,4 +101,3 @@ class CostumeConfig(BaseModel):
 
 
 
-

+ 2 - 2
tasks/Component/Costume/costume_base.py

@@ -21,7 +21,7 @@ main_costume_model = {
         'I_MAIN_GOTO_SUMMON': f'I_MAIN_GOTO_SUMMON_{i}',
         'I_MAIN_GOTO_TOWN': f'I_MAIN_GOTO_TOWN_{i}',
         'I_PET_HOUSE': f'I_PET_HOUSE_{i}'
-    } for i in range(1, 15)
+    } for i in range(1, 16)
 }
 
 
@@ -151,4 +151,4 @@ class CostumeBase:
 
 if __name__ == '__main__':
     c = CostumeBase()
-    c.check_costume_main(MainType.COSTUME_MAIN_2)
+    c.check_costume_main(MainType.COSTUME_MAIN_2)

+ 47 - 0
tasks/Component/Costume/main15/image.json

@@ -0,0 +1,47 @@
+[
+  {
+    "itemName": "check_main_15",
+    "imageName": "main15_check_main_15.png",
+    "roiFront": "1017,365,71,48",
+    "roiBack": "900,270,300,220",
+    "method": "Template matching",
+    "threshold": 0.75,
+    "description": "茨心乐园庭院判定"
+  },
+  {
+    "itemName": "main_goto_exploration_15",
+    "imageName": "main15_main_goto_exploration_15.png",
+    "roiFront": "590,190,30,50",
+    "roiBack": "520,130,190,180",
+    "method": "Template matching",
+    "threshold": 0.55,
+    "description": "探索"
+  },
+  {
+    "itemName": "main_goto_summon_15",
+    "imageName": "main15_main_goto_summon_15.png",
+    "roiFront": "960,204,28,45",
+    "roiBack": "890,130,200,180",
+    "method": "Template matching",
+    "threshold": 0.55,
+    "description": "召唤屋"
+  },
+  {
+    "itemName": "main_goto_town_15",
+    "imageName": "main15_main_goto_town_15.png",
+    "roiFront": "838,324,24,49",
+    "roiBack": "760,250,200,190",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "町中"
+  },
+  {
+    "itemName": "pet_house_15",
+    "imageName": "main15_pet_house_15.png",
+    "roiFront": "951,383,31,50",
+    "roiBack": "900,330,150,150",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "宠物屋"
+  }
+]

BIN
tasks/Component/Costume/main15/main15_check_main_15.png


BIN
tasks/Component/Costume/main15/main15_main_goto_exploration_15.png


BIN
tasks/Component/Costume/main15/main15_main_goto_summon_15.png


BIN
tasks/Component/Costume/main15/main15_main_goto_town_15.png


BIN
tasks/Component/Costume/main15/main15_pet_house_15.png


+ 5 - 1
tasks/Component/GeneralBattle/general_battle.py

@@ -398,13 +398,17 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
 
         # 点击预设确认
         self.wait_until_appear(self.I_PRESET_ENSURE, wait_time=1)
+        click_timer = Timer(10).start()
         while 1:
             self.screenshot()
+            if click_timer.reached():
+                logger.warning("Switch preset failure")
             if not self.appear(self.I_PRESET_ENSURE):
                 break
-            if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8, interval=0.2):
+            if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8, interval=1):
                 continue
         logger.info("Click preset ensure")
+        return None
 
     def random_click_swipt(self):
         if 0 <= random.randint(0, 500) <= 3:  # 百分之4的概率

+ 2 - 3
tasks/Component/GeneralInvite/assets.py

@@ -84,7 +84,7 @@ class GeneralInviteAssets:
 	# 勾选 默认邀请 
 	I_I_DEFAULT = RuleImage(roi_front=(541,342,41,39), roi_back=(541,342,41,39), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_default.png")
 	# description 
-	I_GI_CANCEL = RuleImage(roi_front=(438,407,171,55), roi_back=(438,407,171,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_cancel.png")
+	I_GI_CANCEL = RuleImage(roi_front=(438,407,171,55), roi_back=(438,407,171,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_cancel.png")
 	# 队长邀请 确定 
 	I_GI_SURE = RuleImage(roi_front=(670,402,175,60), roi_back=(670,402,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_sure.png")
 	# 所有的组队界面都有加成 
@@ -105,7 +105,7 @@ class GeneralInviteAssets:
 	# 判断是不是在庭院界面 
 	I_GI_HOME = RuleImage(roi_front=(361,34,34,46), roi_back=(361,34,34,46), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_home.png")
 	# 判断是不是在探索界面 
-	I_GI_EXPLORE = RuleImage(roi_front=(677,11,33,46), roi_back=(677,11,33,46), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_explore.png")
+	I_GI_EXPLORE = RuleImage(roi_front=(690,16,28,28), roi_back=(688,8,33,46), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_explore.png")
 
 
 	# Ocr Rule Assets
@@ -128,4 +128,3 @@ class GeneralInviteAssets:
 	# Ocr-description 
 	O_ONLINE = RuleOcr(roi=(790,102,124,42), area=(0,0,100,100), mode="Single", method="Default", keyword="", name="online")
 
-

BIN
tasks/Component/GeneralInvite/gi/gi_gi_explore.png


+ 2 - 2
tasks/Component/GeneralInvite/gi/image.json

@@ -325,7 +325,7 @@
   },
   {
     "itemName": "gi_cancel",
-    "imageName": "gi_gi_cancel.png",
+    "imageName": "gi_cancel.png",
     "roiFront": "438,407,171,55",
     "roiBack": "438,407,171,55",
     "method": "Template matching",
@@ -377,4 +377,4 @@
     "threshold": 0.8,
     "description": "识别到寄养邀请"
   }
-]
+]

+ 2 - 2
tasks/Component/GeneralInvite/gi/member.json

@@ -29,8 +29,8 @@
   {
     "itemName": "gi_explore",
     "imageName": "gi_gi_explore.png",
-    "roiFront": "677,11,33,46",
-    "roiBack": "677,11,33,46",
+    "roiFront": "690,16,28,28",
+    "roiBack": "688,8,33,46",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "判断是不是在探索界面"

+ 3 - 0
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -117,6 +117,9 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
                 clicked = False  # 点击了确认, 恢复选式神的操作
                 continue
 
+            # 是否育成候补式神按钮
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1) or self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                continue
             # 与下方点击第7个式神操作互斥, 防止确认按钮还没有出现被下方取消掉
             if not clicked and self.click(click_match, interval=1.5):
                 clicked = True

+ 19 - 4
tasks/FloatParade/assets.py

@@ -12,9 +12,9 @@ class FloatParadeAssets:
 
 	# Image Rule Assets
 	# 从庭院进入花车活动 
-	I_FP_ACCESS = RuleImage(roi_front=(1178,168,43,34), roi_back=(1051,101,210,472), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_access.png")
+	I_FP_ACCESS = RuleImage(roi_front=(1184,385,41,34), roi_back=(1051,101,210,472), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_access.png")
 	# description 
-	I_FP_GETALL0 = RuleImage(roi_front=(1153,287,65,56), roi_back=(1134,261,100,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_getall0.png")
+	I_FP_GETALL0 = RuleImage(roi_front=(1027,655,37,40), roi_back=(1003,572,267,134), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_getall0.png")
 	# description 
 	I_FP_GETALL1 = RuleImage(roi_front=(1198,555,53,54), roi_back=(1163,506,113,164), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_getall1.png")
 	# description 
@@ -24,9 +24,9 @@ class FloatParadeAssets:
 	# description 
 	I_FP_BATCH_FALSE = RuleImage(roi_front=(936,515,40,45), roi_back=(924,505,63,65), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_batch_false.png")
 	# 右下角的任务 
-	I_FP_TASKS = RuleImage(roi_front=(1175,617,79,76), roi_back=(1162,605,100,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_tasks.png")
+	I_FP_TASKS = RuleImage(roi_front=(1184,553,68,66), roi_back=(1167,532,100,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_tasks.png")
 	# 升级 
-	I_FP_UPGRADE = RuleImage(roi_front=(1086,74,116,49), roi_back=(1040,52,169,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_upgrade.png")
+	I_FP_UPGRADE = RuleImage(roi_front=(57,180,39,35), roi_back=(19,153,169,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_upgrade.png")
 	# 红色关闭 
 	I_FP_RED_CLOSE = RuleImage(roi_front=(1170,109,43,44), roi_back=(1157,101,72,62), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_red_close.png")
 	# 寻找花车的切换按钮 
@@ -41,5 +41,20 @@ class FloatParadeAssets:
 	I_FP_GIFT_FLAG1 = RuleImage(roi_front=(559,295,55,44), roi_back=(559,295,55,44), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_gift_flag1.png")
 	# 礼包类型2 
 	I_FP_GIFT_FLAG2 = RuleImage(roi_front=(557,293,58,47), roi_back=(557,293,58,47), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_gift_flag2.png")
+	#  
+	I_FP_SELECT_1 = RuleImage(roi_front=(238,443,110,41), roi_back=(217,420,179,92), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_select_1.png")
+	#  
+	I_FP_SELECT_2 = RuleImage(roi_front=(570,438,116,52), roi_back=(541,418,177,85), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_select_2.png")
+	#  
+	I_FP_SELECT_3 = RuleImage(roi_front=(938,435,104,54), roi_back=(917,415,154,98), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_select_3.png")
+	#  
+	I_RED_POINT_0 = RuleImage(roi_front=(1244,216,19,17), roi_back=(1217,157,59,415), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_red_point_0.png")
+
+
+	# Image Rule Assets
+	#  
+	I_CLAIM_MILEAGE = RuleImage(roi_front=(794,515,142,44), roi_back=(731,493,264,89), threshold=0.8, method="Template matching", file="./tasks/FloatParade/mileage/mileage_claim_mileage.png")
+	# 进入里程(右上角红点) 
+	I_ENTRY_MILEAGE = RuleImage(roi_front=(97,76,19,21), roi_back=(84,69,56,51), threshold=0.8, method="Template matching", file="./tasks/FloatParade/mileage/mileage_entry_mileage.png")
 
 

BIN
tasks/FloatParade/fp/fp_fp_access.png


BIN
tasks/FloatParade/fp/fp_fp_getall0.png


BIN
tasks/FloatParade/fp/fp_fp_select_1.png


BIN
tasks/FloatParade/fp/fp_fp_select_2.png


BIN
tasks/FloatParade/fp/fp_fp_select_3.png


BIN
tasks/FloatParade/fp/fp_fp_tasks.png


BIN
tasks/FloatParade/fp/fp_fp_upgrade.png


BIN
tasks/FloatParade/fp/fp_red_point_0.png


+ 43 - 7
tasks/FloatParade/fp/image.json

@@ -2,7 +2,7 @@
   {
     "itemName": "fp_access",
     "imageName": "fp_fp_access.png",
-    "roiFront": "1178,168,43,34",
+    "roiFront": "1184,385,41,34",
     "roiBack": "1051,101,210,472",
     "method": "Template matching",
     "threshold": 0.8,
@@ -11,8 +11,8 @@
   {
     "itemName": "fp_getall0",
     "imageName": "fp_fp_getall0.png",
-    "roiFront": "1153,287,65,56",
-    "roiBack": "1134,261,100,100",
+    "roiFront": "1027,655,37,40",
+    "roiBack": "1003,572,267,134",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -56,8 +56,8 @@
   {
     "itemName": "fp_tasks",
     "imageName": "fp_fp_tasks.png",
-    "roiFront": "1175,617,79,76",
-    "roiBack": "1162,605,100,100",
+    "roiFront": "1184,553,68,66",
+    "roiBack": "1167,532,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "右下角的任务"
@@ -65,8 +65,8 @@
   {
     "itemName": "fp_upgrade",
     "imageName": "fp_fp_upgrade.png",
-    "roiFront": "1086,74,116,49",
-    "roiBack": "1040,52,169,100",
+    "roiFront": "57,180,39,35",
+    "roiBack": "19,153,169,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "升级"
@@ -133,5 +133,41 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "礼包类型2"
+  },
+  {
+    "itemName": "fp_select_1",
+    "imageName": "fp_fp_select_1.png",
+    "roiFront": "238,443,110,41",
+    "roiBack": "217,420,179,92",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": ""
+  },
+  {
+    "itemName": "fp_select_2",
+    "imageName": "fp_fp_select_2.png",
+    "roiFront": "570,438,116,52",
+    "roiBack": "541,418,177,85",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": ""
+  },
+  {
+    "itemName": "fp_select_3",
+    "imageName": "fp_fp_select_3.png",
+    "roiFront": "938,435,104,54",
+    "roiBack": "917,415,154,98",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": ""
+  },
+  {
+    "itemName": "red_point_0",
+    "imageName": "fp_red_point_0.png",
+    "roiFront": "1244,216,19,17",
+    "roiBack": "1217,157,59,415",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": ""
   }
 ]

+ 20 - 0
tasks/FloatParade/mileage/mileage.json

@@ -0,0 +1,20 @@
+[
+  {
+    "itemName": "claim_mileage",
+    "imageName": "mileage_claim_mileage.png",
+    "roiFront": "794,515,142,44",
+    "roiBack": "731,493,264,89",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": ""
+  },
+  {
+    "itemName": "entry_mileage",
+    "imageName": "mileage_entry_mileage.png",
+    "roiFront": "97,76,19,21",
+    "roiBack": "84,69,56,51",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入里程(右上角红点)"
+  }
+]

BIN
tasks/FloatParade/mileage/mileage_claim_mileage.png


BIN
tasks/FloatParade/mileage/mileage_entry_mileage.png


+ 42 - 48
tasks/FloatParade/script_task.py

@@ -3,35 +3,43 @@
 # github https://github.com/runhey
 import time
 
+from pydantic.deprecated import config
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main
 from tasks.TalismanPass.assets import TalismanPassAssets
 from tasks.FloatParade.assets import FloatParadeAssets
 from tasks.FloatParade.config import FloatParadeConfig, LevelReward
+from tasks.Component.RightActivity.right_activity import RightActivity
 
 from module.logger import logger
 from module.exception import TaskEnd
 from module.base.timer import Timer
 
-class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
+class ScriptTask(RightActivity, FloatParadeAssets, TalismanPassAssets):
 
     def run(self):
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
         con: FloatParadeConfig = self.config.float_parade.float_parade
-
-        # 收取全部奖励
-        self.get_all()
-        # 回退
+        self.enter(self.I_FP_ACCESS)
+        logger.info('Enter float parade')
         while 1:
             self.screenshot()
-            if self.appear(self.I_FP_TASKS):
+            if self.appear(self.I_FP_UPGRADE):
                 break
-            if self.appear_then_click(self.I_BACK_Y, interval=3):
+            if self.appear_then_click(self.I_FP_ACCESS, interval=0.8):
                 continue
-        logger.info('Goback to float parade main page')
+            if self.appear_then_click(self.I_FP_RED_CLOSE, interval=1.5):
+                continue
+            if self.appear_then_click(self.I_FP_GIFT_CLOSE, interval=3):
+                continue
+            # if self.appear_then_click(self.I_TOGGLE_BUTTON, interval=3):
+            #     continue
+
+        # 收取 放置里程
+        self.get_mileage()
+
         # 收取花车等级奖励
         self.get_flower(con.level_reward1, con.level_reward2) # 第一种
+
         # main page
         self.ui_get_current_page()
         self.ui_goto(page_main)
@@ -39,33 +47,15 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
         self.set_next_run(task='FloatParade', success=True, finish=True)
         raise TaskEnd('FloatParade')
 
-
-    def get_all(self):
-        """
-        一键收取所有的, 从庭院进入
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_FP_UPGRADE):
-                break
-            if self.appear_then_click(self.I_FP_ACCESS, interval=0.8):
-                continue
-            if self.appear_then_click(self.I_FP_RED_CLOSE, interval=1.5):
-                continue
-            if self.appear_then_click(self.I_FP_GIFT_CLOSE, interval=3):
-                continue
-            if self.appear_then_click(self.I_FP_TASKS, interval=1.8):
-                continue
-            if self.appear_then_click(self.I_TOGGLE_BUTTON, interval=3):
-                continue
-        logger.info('Enter float parade')
-        logger.info('Click get all reward')
-        if not self.appear(self.I_FP_GETALL1):
-            logger.info('No appear get all button')
+    def get_mileage(self):
+        self.screenshot()
+        if not self.appear(self.I_ENTRY_MILEAGE):
             return
-        self.ui_get_reward(self.I_FP_GETALL1)
-        logger.info('Got all reward')
+        logger.hr("Get mileage reward")
+        self.ui_click( click=self.I_ENTRY_MILEAGE, stop=self.I_CLAIM_MILEAGE, interval=1.9)
+        self.ui_get_reward(self.I_CLAIM_MILEAGE)
+        self.ui_click_until_disappear(self.I_UI_BACK_RED, interval=1.8)
+        logger.info('Got mileage reward')
 
     def get_flower(self, level1: LevelReward = LevelReward.TWO, level2: LevelReward = LevelReward.TWO):
         """
@@ -73,21 +63,17 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
         :return:
         """
         match_level = {
-            LevelReward.ONE: self.I_TP_LEVEL_1,
-            LevelReward.TWO: self.I_TP_LEVEL_2,
-            LevelReward.THREE: self.I_TP_LEVEL_3,
+            LevelReward.ONE: self.I_FP_SELECT_1,
+            LevelReward.TWO: self.I_FP_SELECT_2,
+            LevelReward.THREE: self.I_FP_SELECT_3,
         }
-        self.screenshot()
-        if not self.appear(self.I_FP_GETALL0):
-            logger.info('No any level reward')
-            return
-        logger.info('Appear level reward')
-        # self.ui_click(self.I_FP_GETALL0, self.I_TP_GET_ALL)
         logger.info('Click level reward')
         check_timer = Timer(2)
         check_timer.start()
         while 1:
             self.screenshot()
+            if self.appear_then_click(self.I_UI_BACK_RED, interval=0.8):
+                continue
             # 批量选择
             if self.appear_then_click(self.I_BATCH_SELECTION, interval=1.5):
                 continue
@@ -100,7 +86,6 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
                     pass
                 check_timer.reset()
                 continue
-
             if self.appear(self.I_FP_GIFT_FLAG2) and self.appear_then_click(match_level[level2], interval=0.8):
                 logger.info(f'Select {level2} reward')
                 if self.appear_then_click(self.I_OVERFLOW_CONFIRME, interval=0.8):
@@ -115,10 +100,19 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
             if check_timer.reached():
                 logger.warning('No reward and break')
                 break
-            if self.appear_then_click(self.I_FP_GETALL0, interval=2.1):
-                logger.info('Get all reward')
+
+            apper_get_all_0 = self.appear(self.I_FP_GETALL0)  # 出现一键领取就不大会点”任务“
+            if apper_get_all_0:
+                self.click(self.I_FP_GETALL0, interval=2.1)
                 check_timer.reset()
                 continue
+            elif self.appear_then_click(self.I_FP_TASKS, interval=2.5):
+                check_timer.reset()
+                continue
+
+            if self.appear_then_click(self.I_RED_POINT_0, interval=1.5):
+                continue
+
 
 
 if __name__ == '__main__':

+ 2 - 2
tasks/GameUi/assets.py

@@ -88,8 +88,8 @@ class GameUiAssets:
 	I_CHECK_AREA_BOSS = RuleImage(roi_front=(20,320,150,130), roi_back=(20,320,150,130), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_area_boss.png")
 	# description 
 	I_CHECK_HEIAN_KITAN = RuleImage(roi_front=(27,48,47,39), roi_back=(27,48,47,39), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_heian_kitan.png")
-	# description 
-	I_CHECK_SIX_GATES = RuleImage(roi_front=(249,33,22,24), roi_back=(227,7,98,85), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_six_gates.png")
+	# 六道之门检查 
+	I_CHECK_SIX_GATES = RuleImage(roi_front=(411,297,21,21), roi_back=(395,262,54,85), threshold=0.85, method="Template matching", file="./tasks/GameUi/page/page_check_six_gates.png")
 	# description 
 	I_CHECK_BONDLING_FAIRYLAND = RuleImage(roi_front=(614,660,56,49), roi_back=(614,660,56,49), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_bondling_fairyland.png")
 	# description 

+ 9 - 1
tasks/GameUi/game_ui.py

@@ -316,8 +316,16 @@ class GameUi(BaseTask, GameUiAssets):
         if not page.additional:
             return
         for btn in page.additional:
+            # 支持反向条件操作: [条件元素, 操作元素, True]。不出现条件图片时点击另一个区域。
+            if isinstance(btn, list) and len(btn) == 3 and btn[2] is True:
+                condition, action, invert = btn
+                self.maybe_screenshot(skip_first_screenshot)
+                if not self.appear(condition):
+                    if self.appear_then_operate(action, interval=interval, skip_first_screenshot=False):
+                        logger.info(f'Page {page} additional invert conditional not {condition} -> {action} executed')
+                        skip_first_screenshot = False
             # 支持复合条件操作: [条件元素, 操作元素]。出现条件图片时点击另一个区域。
-            if isinstance(btn, list) and len(btn) == 2:
+            elif isinstance(btn, list) and len(btn) == 2:
                 condition, action = btn
                 self.maybe_screenshot(skip_first_screenshot)
                 if self.appear(condition):

+ 2 - 2
tasks/GameUi/page.py

@@ -54,8 +54,8 @@ page_login = Page(G.I_CHECK_LOGIN_FORM)
 # Main Home 主页
 page_main = Page(G.I_CHECK_MAIN)
 page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS, RestartAssets.I_CANCEL_BATTLE,
-                        [RestartAssets.I_LOGIN_COURTYARD, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA],
-                            GGA.I_CHAT_CLOSE_BUTTON, G.I_CLOSE_CHAT_WINDOW]
+                            GGA.I_CHAT_CLOSE_BUTTON, G.I_CLOSE_CHAT_WINDOW,
+                            [G.I_MAIN_GOTO_SHIKIGAMI_RECORDS, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA, True]]
 # 召唤summon
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)

BIN
tasks/GameUi/page/page_check_six_gates.png


+ 4 - 4
tasks/GameUi/page/page_img.json

@@ -209,11 +209,11 @@
   {
     "itemName": "check_six_gates",
     "imageName": "page_check_six_gates.png",
-    "roiFront": "249,33,22,24",
-    "roiBack": "227,7,98,85",
+    "roiFront": "411,297,21,21",
+    "roiBack": "395,262,54,85",
     "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
+    "threshold": 0.85,
+    "description": "六道之门检查"
   },
   {
     "itemName": "check_bondling_fairyland",

+ 16 - 6
tasks/HeroTest/script_task.py

@@ -3,19 +3,19 @@
 # github https://github.com/runhey
 from datetime import datetime, timedelta, time
 import random  # type: ignore
-from module.atom.image import RuleImage
+from typing import Callable
+
+from module.logger import logger
+from module.exception import TaskEnd
+from module.base.timer import Timer
 
+import tasks.GameUi.page as pages
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.HeroTest.assets import HeroTestAssets
 from tasks.GameUi.game_ui import GameUi
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
-
-from module.logger import logger
-from module.exception import TaskEnd
 from tasks.HeroTest.config import Layer, HeroTest, SkillMode
-from typing import Callable
 
-import tasks.GameUi.page as pages
 
 
 class ScriptTask(GameUi, GeneralBattle, HeroTestAssets, SwitchSoul):
@@ -121,8 +121,18 @@ class ScriptTask(GameUi, GeneralBattle, HeroTestAssets, SwitchSoul):
 
     def hero1_skill_wait(self):
         if self.wait_until_appear(self.I_BCMJ_SKILL_ADD_CONFIRM, wait_time=2):
+            timer = Timer(10).start()
             while 1:
                 self.screenshot()
+
+                # https://github.com/runhey/OnmyojiAutoScript/issues/1671
+                if timer.reached_and_reset():
+                    if self.appear(self.I_BCMJ_SKILL_ADD_CONFIRM):
+                        logger.warning('No skill selected for 10s, panel still open, retrying')
+                        continue
+                    logger.warning('Skill selection panel closed unexpectedly, exit')
+                    break
+
                 if self.appear_then_click(self.I_BCMJ_SKILL_ADD1, interval=1):
                     break
                 if self.appear_then_click(self.I_BCMJ_SKILL_ADD2, interval=1):

+ 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):

+ 0 - 2
tasks/Restart/assets.py

@@ -100,8 +100,6 @@ class RestartAssets:
 	I_LOGIN_SCROOLL_OPEN = RuleImage(roi_front=(1208,609,33,83), roi_back=(1208,609,33,83), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_open.png")
 	# 庭院卷轴关闭 
 	I_LOGIN_SCROOLL_CLOSE = RuleImage(roi_front=(1181,634,28,39), roi_back=(1162,595,77,112), threshold=0.7, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_close.png")
-	# 闲庭图片(用户新增,用于判断是否需要点击卷轴关闭区域) 
-	I_LOGIN_COURTYARD = RuleImage(roi_front=(40,640,100,50), roi_back=(40,640,100,50), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_courtyard.png")
 	# 卷轴关闭区域点击(用户新增,用于点击I_LOGIN_SCROOLL_CLOSE的区域而不依赖图片识别) 
 	I_LOGIN_SCROLL_CLOSE_AREA = RuleImage(roi_front=(1181,634,28,39), roi_back=(1162,595,77,112), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_scroll_close_area.png")
 	# description 

+ 18 - 29
tasks/Restart/login.py

@@ -7,10 +7,11 @@ from module.exception import RequestHumanTakeover, GameTooManyClickError, GameSt
 from module.logger import logger
 from tasks.Restart.assets import RestartAssets
 from tasks.GameUi.assets import GameUiAssets
+from tasks.Component.GeneralBuff.assets import GeneralBuffAssets
 from tasks.base_task import BaseTask
 import time
 
-class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
+class LoginHandler(BaseTask, RestartAssets, GameUiAssets, GeneralBuffAssets):
     character: str
 
     def __init__(self, *wargs, **kwargs):
@@ -43,34 +44,22 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
             if self.appear_then_click(self.I_CANCEL_BATTLE, interval=0.8):
                 logger.info('Cancel continue battle')
                 continue
-            # 确认进入庭院(优化:当出现闲庭图片时,点击卷轴关闭区域,然后判断式神录按钮出现就代表登录成功)
-            if self.appear(self.I_LOGIN_COURTYARD, interval=0.2):
-                if self.click(self.C_LOGIN_SCROLL_CLOSE_AREA, interval=2):
-                    logger.info('Click scroll close area because courtyard appears')
-                    self.screenshot()  # 点击后立即获取最新截图,确保后续状态检查准确
-                    continue
-            # 确认进入庭院(兜底:未检测到闲庭图片时,如果识别到卷轴处于关闭状态,直接点击卷轴将其展开)
-            if self.appear_then_click(self.I_LOGIN_SCROOLL_CLOSE, interval=1):
-                logger.info('Click closed scroll to open it')
-                self.screenshot()
-                continue
-            if self.appear(self.I_MAIN_GOTO_SHIKIGAMI_RECORDS, interval=0.2):
-                if confirm_timer.reached():
-                    logger.info('Login to main confirm (shikigami records button appears)')
-                    break
-            elif self.appear(self.I_LOGIN_SCROOLL_OPEN, interval=0.2):
-                if confirm_timer.reached():
-                    logger.info('Login to main confirm (scroll open)')
-                    break
-            else:
-                confirm_timer.reset()
-            # 登录成功
-            if self.appear(self.I_MAIN_GOTO_SHIKIGAMI_RECORDS, interval=0.5):
-                logger.info('Login success: shikigami records button appears')
-                login_success = True
-            elif self.appear(self.I_LOGIN_SCROOLL_OPEN, interval=0.5):
-                logger.info('Login success: scroll open')
-                login_success = True
+            # 确认进入庭院(优化:先检测加成图标确认在庭院页面,再检测式神录图标)
+            if self.appear(self.I_BUFF_1, interval=0.2):
+                # 加成图标存在,确认在庭院页面
+                if self.appear(self.I_MAIN_GOTO_SHIKIGAMI_RECORDS, interval=0.2):
+                    # 式神录图标存在,认为已在庭院
+                    if confirm_timer.reached():
+                        logger.info('Login to main confirm (buff and shikigami records button appears)')
+                        break
+                    login_success = True
+                else:
+                    # 式神录图标不存在,点击展开卷轴
+                    if self.click(self.C_LOGIN_SCROLL_CLOSE_AREA, interval=2):
+                        logger.info('Click scroll expand area because shikigami records not found')
+                        self.screenshot()
+                        continue
+                    confirm_timer.reset()
 
             # 网络异常
             # if self.ocr_appear(self.O_LOGIN_NETWORK):

+ 0 - 9
tasks/Restart/login/image.json

@@ -17,15 +17,6 @@
     "threshold": 0.7,
     "description": "庭院卷轴关闭"
   },
-  {
-    "itemName": "login_courtyard",
-    "imageName": "login_courtyard.png",
-    "roiFront": "40,640,100,50",
-    "roiBack": "40,640,100,50",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "闲庭图片(用户新增,用于判断是否需要点击卷轴关闭区域)"
-  },
   {
     "itemName": "login_scroll_close_area",
     "imageName": "login_scroll_close_area.png",

BIN
tasks/Restart/login/login_courtyard.png


+ 1 - 1
tasks/RichMan/assets.py

@@ -196,7 +196,7 @@ class RichManAssets:
 	# 荣誉 
 	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(722,11,41,42), roi_back=(722,11,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
 	# 友情点 
-	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1190,287,43,52), roi_back=(1163,258,93,126), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
+	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1190,287,43,52), roi_back=(1159,258,97,296), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
 	# 友情点 
 	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(908,8,39,43), roi_back=(9,8,1266,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
 	# 勋章 

+ 1 - 1
tasks/RichMan/mall/navbar/image_side.json

@@ -39,7 +39,7 @@
     "itemName": "side_sure_friends",
     "imageName": "navbar_side_sure_friends.png",
     "roiFront": "1190,287,43,52",
-    "roiBack": "1163,258,93,126",
+    "roiBack": "1159,258,97,296",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "友情点"

+ 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()

+ 2 - 2
tasks/WeeklyTrifles/area_boss/image.json

@@ -20,8 +20,8 @@
   {
     "itemName": "wt_share_ab",
     "imageName": "area_boss_wt_share_ab.png",
-    "roiFront": "1183,308,45,39",
-    "roiBack": "1183,308,45,39",
+    "roiFront": "1187,273,45,39",
+    "roiBack": "1176,90,76,326",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "地鬼分享"

+ 1 - 1
tasks/WeeklyTrifles/assets.py

@@ -21,7 +21,7 @@ class WeeklyTriflesAssets:
 	# 今天一个都没有打 
 	I_WT_NO_DAY = RuleImage(roi_front=(167,360,72,69), roi_back=(167,360,72,69), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_no_day.png")
 	# 地鬼分享 
-	I_WT_SHARE_AB = RuleImage(roi_front=(1183,308,45,39), roi_back=(1183,308,45,39), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_share_ab.png")
+	I_WT_SHARE_AB = RuleImage(roi_front=(1187,273,45,39), roi_back=(1176,90,76,326), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_share_ab.png")
 	# 分享勾玉 
 	I_WT_AB_JADE = RuleImage(roi_front=(977,552,44,47), roi_back=(977,552,44,47), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_ab_jade.png")
 	# 微信分享 

+ 5 - 5
tasks/WeeklyTrifles/script_task.py

@@ -80,7 +80,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
             self.screenshot()
             if self.appear(self.I_WT_QR_CODE):
                 break
-            if self.appear_then_click(self.I_WT_COLLECT_WECHAT, interval=1):
+            if self.appear_then_click(self.I_WT_COLLECT_WECHAT, interval=4):
                 continue
         logger.info('Click share')
         get_timer = Timer(3)
@@ -92,7 +92,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
                 logger.info('Get reward')
                 break
 
-            if self.appear_then_click(self.I_WT_QR_CODE, self.C_WT_WECHAT, interval=0.8):
+            if self.appear_then_click(self.I_WT_QR_CODE, self.C_WT_WECHAT, interval=2.8):
                 continue
             if get_timer.reached():
                 logger.warning('Share timeout. The reward may have been obtained')
@@ -137,7 +137,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
             if self.appear(self.I_WT_NO_DAY):
                 obtained = True
                 break
-            if self.click(self.C_WT_AB_CLICK, interval=1):
+            if self.click(self.C_WT_AB_CLICK, interval=2.5):
                 continue
             if self.appear_then_click(self.I_WT_DAY_BATTLE, interval=2):
                 continue
@@ -281,8 +281,8 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t._share_collect()
-    # t._share_area_boss()
+    # t._share_collect()
+    t._share_area_boss()
     # t.click_share(t.I_WT_SE_WECHAT)