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

Merge pull request #1758 from runhey/dev

Automated PR 2026.08.28
huangrunheng 2 месяцев назад
Родитель
Сommit
4e51560518
50 измененных файлов с 1080 добавлено и 76 удалено
  1. 13 1
      assets/i18n/zh-CN.json
  2. 5 4
      module/atom/click.py
  3. 3 2
      module/atom/image.py
  4. 3 2
      module/atom/ocr.py
  5. 5 4
      module/atom/swipe.py
  6. 20 5
      module/device/method/minitouch.py
  7. 6 4
      module/device/method/nemu_ipc.py
  8. 6 2
      module/device/method/scrcpy/scrcpy.py
  9. 136 0
      module/server/diagnostic.py
  10. 11 0
      module/server/home_router.py
  11. 47 0
      script.py
  12. 47 42
      tasks/ActivityShikigami/script_task.py
  13. 1 0
      tasks/Component/Costume/config.py
  14. 1 1
      tasks/Component/Costume/costume_base.py
  15. 44 1
      tasks/Component/CostumeShikigami/assets.py
  16. 182 0
      tasks/Component/CostumeShikigami/sk11/image.json
  17. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_check_records_11.png
  18. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_record_soul_back_11.png
  19. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_1_11.png
  20. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_2_11.png
  21. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_3_11.png
  22. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_4_11.png
  23. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_5_11.png
  24. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_6_11.png
  25. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_7_11.png
  26. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_check_in_11.png
  27. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_click_present_11.png
  28. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_1_11.png
  29. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_2_11.png
  30. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_3_11.png
  31. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_4_11.png
  32. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_sure_11.png
  33. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_sou_team_present_11.png
  34. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_soul_preset_11.png
  35. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_st_replace_11.png
  36. BIN
      tasks/Component/CostumeShikigami/sk11/sk11_st_souls_11.png
  37. 2 2
      tasks/Component/CostumeShikigami/sk5/image.json
  38. 502 0
      tasks/Component/GeneralBattle/battle_wait.py
  39. 2 1
      tasks/Component/GeneralBattle/general_battle.py
  40. 2 0
      tasks/Duel/assets.py
  41. BIN
      tasks/Duel/duel/duel_d_try.png
  42. 9 0
      tasks/Duel/duel/image.json
  43. 2 0
      tasks/GameUi/page.py
  44. 2 1
      tasks/KekkaiUtilize/config.py
  45. 3 0
      tasks/KekkaiUtilize/script_task.py
  46. 1 1
      tasks/RichMan/assets.py
  47. 2 2
      tasks/RichMan/mall/scales/ocr.json
  48. 2 0
      tasks/RyouToppa/script_task.py
  49. 3 1
      tasks/Script/config.py
  50. 18 0
      tasks/Script/config_antiban.py

+ 13 - 1
assets/i18n/zh-CN.json

@@ -57,5 +57,17 @@
   "enable_switch_daily_training": "日常训练开启切换御魂",
   "enable_switch_cultivation_drills": "修行合训开启切换御魂",
   "demon_battle_config": "逢魔战斗内切换阵容",
-  "best_demon_battle_config": "极逢魔战斗内切换阵容"
+  "best_demon_battle_config": "极逢魔战斗内切换阵容",
+  "anti_ban": "防风控作息",
+  "antiban_enable_help": "开启后启用作息约束(睡眠时间窗、累计活跃上限、强制休息),用于避免24小时不间断/深夜连续运行这类服务端可见的异常行为特征。\n注意:点击/滑动的拟人化(真实按压时长、坐标高斯化、微动、压力抖动)始终生效,不受此开关控制。",
+  "sleep_start": "睡眠开始时间",
+  "sleep_start_help": "进入睡眠时间窗的时刻。此区间内停止一切操作,并按“任务队列清空后”的空闲策略关闭游戏/模拟器,到点自动唤醒。支持跨午夜(如 23:00 到次日 06:00)。",
+  "sleep_end": "睡眠结束时间",
+  "sleep_end_help": "退出睡眠时间窗、恢复运行的时刻。",
+  "daily_active_limit": "累计活跃上限",
+  "daily_active_limit_help": "累计活跃时长达到此值后强制长休息一段(休息结束重新计)。设为 0 表示不限制。用于打破长时间不间断在线。格式:天 时:分:秒。",
+  "long_rest_duration": "强制休息时长",
+  "long_rest_duration_help": "触发累计活跃上限后的强制休息时长。格式:天 时:分:秒。",
+  "min_run_interval": "最小再运行间隔",
+  "min_run_interval_help": "防风控:两次蹭卡运行之间的最小间隔,避免蹭卡过于频繁被服务端标记。设为 0(默认)保持原逻辑(按结界卡剩余时间安排下次)。格式:天 时:分:秒。"
 }

+ 5 - 4
module/atom/click.py

@@ -4,6 +4,7 @@
 import numpy as np
 
 from module.base.decorator import cached_property
+from module.base.utils.utils import random_normal_distribution_int
 from module.logger import logger
 
 class RuleClick:
@@ -27,8 +28,8 @@ class RuleClick:
         :return:
         """
         x, y, w, h = self.roi_front
-        x = np.random.randint(x, x + w)
-        y = np.random.randint(y, y + h)
+        x = random_normal_distribution_int(x, x + w)
+        y = random_normal_distribution_int(y, y + h)
         return x, y
 
     def coord_more(self) -> tuple:
@@ -37,8 +38,8 @@ class RuleClick:
         :return:
         """
         x, y, w, h = self.roi_back
-        x = np.random.randint(x, x + w)
-        y = np.random.randint(y, y + h)
+        x = random_normal_distribution_int(x, x + w)
+        y = random_normal_distribution_int(y, y + h)
         return x, y
 
     @property

+ 3 - 2
module/atom/image.py

@@ -11,6 +11,7 @@ from module.atom.RuleImageMallResourceMixin import RuleImageMallResourceMixin
 from module.base.decorator import cached_property
 from module.logger import logger
 from module.base.utils import is_approx_rectangle
+from module.base.utils.utils import random_normal_distribution_int
 
 
 class RuleImage(RuleImageMallResourceMixin):
@@ -307,7 +308,7 @@ class RuleImage(RuleImageMallResourceMixin):
         :return:
         """
         x, y, w, h = self.roi_front
-        return x + np.random.randint(0, w), y + np.random.randint(0, h)
+        return x + random_normal_distribution_int(0, w), y + random_normal_distribution_int(0, h)
 
     def coord_more(self) -> tuple:
         """
@@ -315,7 +316,7 @@ class RuleImage(RuleImageMallResourceMixin):
         :return:
         """
         x, y, w, h = self.roi_back
-        return x + np.random.randint(0, w), y + np.random.randint(0, h)
+        return x + random_normal_distribution_int(0, w), y + random_normal_distribution_int(0, h)
 
     def front_center(self) -> tuple:
         """

+ 3 - 2
module/atom/ocr.py

@@ -7,6 +7,7 @@ import cv2
 
 from module.ocr.base_ocr import BaseCor, OcrMode, OcrMethod
 from module.ocr.sub_ocr import Full, Single, Digit, DigitCounter, Duration, Quantity
+from module.base.utils.utils import random_normal_distribution_int
 from module.logger import logger
 
 
@@ -54,8 +55,8 @@ class RuleOcr(Digit, DigitCounter, Duration, Single, Full, Quantity):
 		# OCR识别到并点击,在SINGLE模式下,识别到挑战,点击区域应该为ROI,而不是AREA
 		# 该地方应该是误写为self.area,本地变量area没有起作用,如果是self.area,上面几句话就白写了,没起作用
         x, y, w, h = area
-        x = np.random.randint(x, x + w)
-        y = np.random.randint(y, y + h)
+        x = random_normal_distribution_int(x, x + w)
+        y = random_normal_distribution_int(y, y + h)
         return x, y
 
 if __name__ == "__main__":

+ 5 - 4
module/atom/swipe.py

@@ -8,6 +8,7 @@ from math import dist
 
 from module.base.decorator import cached_property
 from module.atom.cBezier import BezierTrajectory
+from module.base.utils.utils import random_normal_distribution_int
 from module.logger import logger
 
 
@@ -52,11 +53,11 @@ class RuleSwipe:
         :return: 两个坐标的tuple
         """
         x, y, w, h = self.roi_front
-        x = np.random.randint(x, x + w)
-        y = np.random.randint(y, y + h)
+        x = random_normal_distribution_int(x, x + w)
+        y = random_normal_distribution_int(y, y + h)
         x2, y2, w2, h2 = self.roi_back
-        x2 = np.random.randint(x2, x2 + w2)
-        y2 = np.random.randint(y2, y2 + h2)
+        x2 = random_normal_distribution_int(x2, x2 + w2)
+        y2 = random_normal_distribution_int(y2, y2 + h2)
         return x, y, x2, y2
 
     def trace(self) -> list:

+ 20 - 5
module/device/method/minitouch.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+import random
 import re
 import socket
 import time
@@ -406,6 +407,14 @@ class Minitouch(Connection):
     _minitouch_ws: websockets.WebSocketClientProtocol
     max_x: int
     max_y: int
+    max_pressure: int = 100
+
+    def _humanized_pressure(self) -> int:
+        top = getattr(self, 'max_pressure', 100) or 100
+        return random.randint(max(20, top // 2), top)
+
+    def _humanized_dwell(self) -> int:
+        return int(random.triangular(45, 130, 65))
 
     @cached_property
     def minitouch_builder(self):
@@ -468,7 +477,10 @@ class Minitouch(Connection):
         # self.max_contacts = max_contacts
         self.max_x = int(max_x)
         self.max_y = int(max_y)
-        # self.max_pressure = max_pressure
+        try:
+            self.max_pressure = int(max_pressure)
+        except (ValueError, TypeError):
+            self.max_pressure = 100
 
         # $ <pid>
         out = socket_out.readline().replace("\n", "").replace("\r", "")
@@ -569,7 +581,10 @@ class Minitouch(Connection):
     @retry
     def click_minitouch(self, x, y):
         builder = self.minitouch_builder
-        builder.down(x, y).commit()
+        pressure = self._humanized_pressure()
+        builder.down(x, y, pressure=pressure).commit().wait(self._humanized_dwell())
+        mx, my = x + random.randint(-2, 2), y + random.randint(-2, 2)
+        builder.move(mx, my, pressure=pressure).commit().wait(random.randint(8, 20))
         builder.up().commit()
         self.minitouch_send()
 
@@ -577,7 +592,7 @@ class Minitouch(Connection):
     def long_click_minitouch(self, x, y, duration=1.0):
         duration = int(duration * 1000)
         builder = self.minitouch_builder
-        builder.down(x, y).commit().wait(duration)
+        builder.down(x, y, pressure=self._humanized_pressure()).commit().wait(duration)
         builder.up().commit()
         self.minitouch_send()
 
@@ -590,7 +605,7 @@ class Minitouch(Connection):
         self.minitouch_send()
 
         for point in points[1:]:
-            builder.move(*point).commit().wait(10)
+            builder.move(*point).commit().wait(random.randint(6, 15))
         self.minitouch_send()
 
         builder.up().commit()
@@ -607,7 +622,7 @@ class Minitouch(Connection):
         self.minitouch_send()
 
         for point in points[1:]:
-            builder.move(*point).commit().wait(10)
+            builder.move(*point).commit().wait(random.randint(6, 15))
         self.minitouch_send()
 
         builder.move(*p2).commit().wait(140)

+ 6 - 4
module/device/method/nemu_ipc.py

@@ -1,6 +1,7 @@
 import asyncio
 import ctypes
 import os
+import random
 import sys
 from functools import partial, wraps
 from pathlib import Path
@@ -513,11 +514,12 @@ class NemuIpc():
         return image
 
     def click_nemu_ipc(self, x, y):
-        down = ensure_time((0.010, 0.020))
         self.nemu_ipc.down(x, y)
-        self.sleep(down)
+        self.sleep(ensure_time((0.050, 0.110)))
+        self.nemu_ipc.down(x + random.randint(-2, 2), y + random.randint(-2, 2))
+        self.sleep(ensure_time((0.008, 0.020)))
         self.nemu_ipc.up()
-        self.sleep(0.050 - down)
+        self.sleep(ensure_time((0.020, 0.045)))
 
     def long_click_nemu_ipc(self, x, y, duration=1.0):
         self.nemu_ipc.down(x, y)
@@ -530,7 +532,7 @@ class NemuIpc():
 
         for point in points:
             self.nemu_ipc.down(*point)
-            self.sleep(0.010)
+            self.sleep(ensure_time((0.006, 0.015)))
 
         self.nemu_ipc.up()
         self.sleep(0.050)

+ 6 - 2
module/device/method/scrcpy/scrcpy.py

@@ -1,3 +1,4 @@
+import random
 import time
 from functools import wraps
 
@@ -97,7 +98,10 @@ class Scrcpy(ScrcpyCore, Uiautomator2):
 
         with self._scrcpy_control_socket_lock:
             self._scrcpy_control.touch(x, y, const.ACTION_DOWN)
-            self._scrcpy_control.touch(x, y, const.ACTION_UP)
+            self.sleep(random.uniform(0.045, 0.13))
+            mx, my = x + random.randint(-2, 2), y + random.randint(-2, 2)
+            self._scrcpy_control.touch(mx, my, const.ACTION_MOVE)
+            self._scrcpy_control.touch(mx, my, const.ACTION_UP)
             self.sleep(0.05)
 
     @retry
@@ -122,7 +126,7 @@ class Scrcpy(ScrcpyCore, Uiautomator2):
 
             for point in points[1:-1]:
                 self._scrcpy_control.touch(*point, const.ACTION_MOVE)
-                self.sleep(0.002)
+                self.sleep(random.uniform(0.001, 0.004))
 
             self._scrcpy_control.touch(*p2, const.ACTION_MOVE)
             self._scrcpy_control.touch(*p2, const.ACTION_UP)

+ 136 - 0
module/server/diagnostic.py

@@ -0,0 +1,136 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+"""导出脱敏后的配置摘要与最近日志为 zip,用于风控对照分析。不导出账号/token/密码。"""
+import json
+import platform
+import re
+import sys
+import zipfile
+from datetime import datetime
+from pathlib import Path
+
+from module.config.utils import read_file, deep_get
+from module.server.config_manager import ConfigManager
+from module.logger import logger
+
+PROJECT_ROOT = Path.cwd().resolve()
+LOG_DIR = PROJECT_ROOT / 'log'
+OUT_DIR = LOG_DIR / 'diagnostic'
+
+_RECENT_INSTANCE_LOGS = 4
+_RECENT_SHARED_LOGS = 3
+_RECENT_ERROR_LOGS = 10
+
+# 白名单:只导出这些字段,不带出 URS 凭据
+_DEVICE_FIELDS = [
+    'control_method', 'screenshot_method', 'serial', 'package_name',
+    'emulatorinfo_type', 'emulatorinfo_name',
+]
+
+# 值匹配到分隔符为止(涵盖 base64 的 +/= 等), 避免只按 \w 截断导致凭据残留
+_V = r'[^\s"\',:;&?{}\[\]]'
+_SCRUB_PATTERNS = [
+    (re.compile(r'(账号[::]\s*)(' + _V + r'{3,})'), r'\1***'),
+    (re.compile(r'(account["\'\s::=]+)(' + _V + r'{3,})', re.I), r'\1***'),
+    (re.compile(r'(token["\'\s::=]+)(' + _V + r'{6,})', re.I), r'\1***'),
+    (re.compile(r'(urs[\w]*["\'\s::=]+)(' + _V + r'{6,})', re.I), r'\1***'),
+    (re.compile(r'(password["\'\s::=]+)(' + _V + r'+)', re.I), r'\1***'),
+    (re.compile(r'\b(1[3-9]\d)\d{4}(\d{4})\b'), r'\1****\2'),
+]
+
+
+def _scrub(text: str) -> str:
+    for pat, repl in _SCRUB_PATTERNS:
+        text = pat.sub(repl, text)
+    return text
+
+
+def _config_summary(name: str) -> dict:
+    data = read_file(str(PROJECT_ROOT / 'config' / f'{name}.json'))
+    if not isinstance(data, dict):
+        return {'instance': name, 'error': 'config unreadable'}
+    device = {k: deep_get(data, f'script.device.{k}') for k in _DEVICE_FIELDS}
+    optimization = data.get('script', {}).get('optimization', {})
+    anti_ban = data.get('script', {}).get('anti_ban', {})
+    enabled = []
+    for task, cfg in data.items():
+        if isinstance(cfg, dict) and deep_get(cfg, 'scheduler.enable') is True:
+            enabled.append(task)
+    return {
+        'instance': name,
+        'device': device,
+        'optimization': optimization,
+        'anti_ban': anti_ban,
+        'enabled_tasks': sorted(enabled),
+    }
+
+
+def _recent_files(pattern: str, limit: int) -> list:
+    try:
+        candidates = [p for p in LOG_DIR.glob(pattern) if p.is_file()]
+    except OSError:
+        return []
+    recent = []
+    for p in candidates:
+        try:
+            recent.append((p.stat().st_mtime, p))
+        except OSError:
+            continue
+    recent.sort(key=lambda item: item[0], reverse=True)
+    return [p for _, p in recent[:limit]]
+
+
+def build_diagnostic_zip(config_name: str = '') -> Path:
+    """config_name 为空或 'Home' 时导出全部实例。"""
+    # 只接受已存在的实例名, 防止 config_name 带 ../ 造成路径穿越
+    valid = ConfigManager.all_script_files()
+    if config_name and config_name in valid:
+        instances = [config_name]
+        tag = config_name
+    else:
+        instances = valid
+        tag = 'all'
+
+    summary = {
+        'generated_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
+        'platform': platform.platform(),
+        'python': sys.version.split()[0],
+        'instances': [_config_summary(n) for n in instances],
+    }
+
+    OUT_DIR.mkdir(parents=True, exist_ok=True)
+    stamp = datetime.now().strftime('%Y%m%d_%H%M%S_%f')
+    zip_path = OUT_DIR / f'oas_diag_{tag}_{stamp}.zip'
+
+    log_files = []
+    for name in instances:
+        log_files += _recent_files(f'*_{name}.txt', _RECENT_INSTANCE_LOGS)
+    log_files += _recent_files('*_api.txt', _RECENT_SHARED_LOGS)
+    log_files += _recent_files('*_server.txt', _RECENT_SHARED_LOGS)
+
+    error_logs = []
+    error_root = LOG_DIR / 'error'
+    if error_root.exists():
+        try:
+            err = [p for p in error_root.glob('*/log.txt') if p.is_file()]
+            err.sort(key=lambda p: p.stat().st_mtime, reverse=True)
+            error_logs = err[:_RECENT_ERROR_LOGS]
+        except OSError:
+            error_logs = []
+
+    with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zf:
+        zf.writestr('summary.json', json.dumps(summary, ensure_ascii=False, indent=2))
+        for f in dict.fromkeys(log_files):
+            try:
+                zf.writestr(f'log/{f.name}', _scrub(f.read_text(encoding='utf-8', errors='replace')))
+            except OSError as e:
+                logger.warning(f'diagnostic: skip {f}: {e}')
+        for f in error_logs:
+            try:
+                zf.writestr(f'error/{f.parent.name}/log.txt',
+                            _scrub(f.read_text(encoding='utf-8', errors='replace')))
+            except OSError as e:
+                logger.warning(f'diagnostic: skip {f}: {e}')
+
+    logger.info(f'诊断日志已导出: {zip_path}')
+    return zip_path

+ 11 - 0
module/server/home_router.py

@@ -96,3 +96,14 @@ async def additional_translate() -> dict:
     except Exception as e:
         logger.error(e)
     return {}
+
+
+@home_app.get('/export_diagnostic')
+async def export_diagnostic(config_name: str = ''):
+    from module.server.diagnostic import build_diagnostic_zip
+    try:
+        zip_path = build_diagnostic_zip(config_name)
+        return {'success': True, 'path': str(zip_path)}
+    except Exception as e:
+        logger.exception(e)
+        return {'success': False, 'path': '', 'error': str(e)}

+ 47 - 0
script.py

@@ -318,6 +318,42 @@ class Script:
             if self.config.should_reload():
                 return False
 
+    @staticmethod
+    def _in_sleep_window(t, start, end) -> bool:
+        if start == end:
+            return False
+        if start < end:
+            return start <= t < end
+        return t >= start or t < end
+
+    @staticmethod
+    def _next_time_point(now: datetime, end) -> datetime:
+        candidate = now.replace(hour=end.hour, minute=end.minute, second=end.second, microsecond=0)
+        if candidate <= now:
+            candidate += timedelta(days=1)
+        return candidate
+
+    def _antiban_wake_time(self, now: datetime):
+        ab = self.config.script.anti_ban
+        if not ab.enable:
+            return None
+        wake = None
+        if self._in_sleep_window(now.time(), ab.sleep_start, ab.sleep_end):
+            wake = self._next_time_point(now, ab.sleep_end)
+        limit = ab.daily_active_limit.total_seconds()
+        if limit > 0:
+            if getattr(self, '_active_date', None) != now.date():
+                self._active_date = now.date()
+                self._active_seconds_today = 0
+            rest_until = getattr(self, '_rest_until', None)
+            if rest_until and now < rest_until:
+                wake = max(wake, rest_until) if wake else rest_until
+            elif getattr(self, '_active_seconds_today', 0) >= limit:
+                self._rest_until = now + ab.long_rest_duration
+                self._active_seconds_today = 0
+                wake = max(wake, self._rest_until) if wake else self._rest_until
+        return wake
+
     def get_next_task(self) -> str:
         """
         获取下一个任务的名字, 大驼峰。
@@ -329,6 +365,9 @@ class Script:
             if self.state_queue:
                 self.state_queue.put({"schedule": self.config.get_schedule_data()})
             now = datetime.now()
+            antiban_wake = self._antiban_wake_time(now)
+            if antiban_wake is not None:
+                task.next_run = max(task.next_run, antiban_wake)
             if not self._try_acquire_queue_token():
                 del_cached_property(self, "config")
                 continue
@@ -625,6 +664,9 @@ class Script:
         start_day = date.today()
         logger.info(f'Start scheduler loop: {self.config_name}')
         self.config.model.running_task = ''
+        self._active_seconds_today = 0
+        self._active_date = date.today()
+        self._rest_until = None
 
         # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
         if not self.config.script.device.run_background_only and IS_WINDOWS:
@@ -680,10 +722,15 @@ class Script:
             self.device.click_record_clear()
             logger.hr(task, level=0)
             self.config.model.running_task = task
+            _task_start = datetime.now()
             success = self.run(inflection.camelize(task))
             self.config.model.running_task = ''
             logger.info(f'Scheduler: End task `{task}`')
             self.is_first_task = False
+            if self._active_date != date.today():
+                self._active_date = date.today()
+                self._active_seconds_today = 0
+            self._active_seconds_today += (datetime.now() - _task_start).total_seconds()
 
             # Check failures
             # failed = deep_get(self.failure_record, keys=task, default=0)

+ 47 - 42
tasks/ActivityShikigami/script_task.py

@@ -19,6 +19,7 @@ from module.exception import TaskEnd
 from module.logger import logger
 
 from tasks.base_task import BaseTask
+from tasks.Component.GeneralBattle.battle_wait import battle_wait_strategy
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from tasks.ActivityShikigami.config import SwitchSoulConfig, GeneralBattleConfig, ActivityShikigami
@@ -296,48 +297,52 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         # 运行战斗
         self.run_general_battle(config=self.get_general_battle_conf())
 
-    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-        # 通用战斗结束判断
-        self.device.stuck_record_add("BATTLE_STATUS_S")
-        self.device.click_record_clear()
-        logger.info(f"Start {self.climb_type} battle process")
-        self.count_map[self.climb_type] = self.current_count
-        for btn in (self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM):
-            btn.name = "BATTLE_RANDOM"
-        ok_cnt, max_retry = 0, 8
-        while 1:
-            sleep(random.uniform(0.5, 1.5))
-            self.screenshot()
-            # 达到最大重试次数则直接交给上层处理
-            if ok_cnt > max_retry:
-                break
-            # 识别到挑战说明已经退出战斗
-            if ok_cnt > 0 and self.ocr_appear(self.O_FIRE):
-                return True
-            # 战斗失败
-            if self.appear(self.I_FALSE):
-                logger.warning("Battle failed")
-                self.ui_click_until_smt_disappear(self.random_reward_click(click_now=False), self.I_FALSE, interval=1.5)
-                return False
-            # 战斗成功
-            if self.appear_then_click(self.I_WIN, interval=2):
-                continue
-            #  出现 “魂” 和 紫蛇皮
-            if self.appear(self.I_REWARD) or self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) or \
-                    self.appear(self.I_REWARD_GOLD) or self.appear(self.I_REWARD_GOLD_SNAKE_SKIN):
-                self.random_reward_click(exclude_click=[self.C_RANDOM_TOP, self.C_RANDOM_LEFT])
-                ok_cnt += 1
-                continue
-            # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
-            if ok_cnt > 3 and not self.is_in_battle(False):
-                self.random_reward_click(exclude_click=[self.C_RANDOM_TOP, self.C_RANDOM_LEFT])
-                self.device.stuck_record_clear()
-                ok_cnt += 1
-                continue
-            # 战斗中随机滑动
-            if ok_cnt == 0 and random_click_swipt_enable:
-                self.random_click_swipt()
-        return True
+    # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+    #     # 通用战斗结束判断
+    #     self.device.stuck_record_add("BATTLE_STATUS_S")
+    #     self.device.click_record_clear()
+    #     logger.info(f"Start {self.climb_type} battle process")
+    #     self.count_map[self.climb_type] = self.current_count
+    #     for btn in (self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM):
+    #         btn.name = "BATTLE_RANDOM"
+    #     ok_cnt, max_retry = 0, 8
+    #     while 1:
+    #         sleep(random.uniform(0.5, 1.5))
+    #         self.screenshot()
+    #         # 达到最大重试次数则直接交给上层处理
+    #         if ok_cnt > max_retry:
+    #             break
+    #         # 识别到挑战说明已经退出战斗
+    #         if ok_cnt > 0 and self.ocr_appear(self.O_FIRE):
+    #             return True
+    #         # 战斗失败
+    #         if self.appear(self.I_FALSE):
+    #             logger.warning("Battle failed")
+    #             self.ui_click_until_smt_disappear(self.random_reward_click(click_now=False), self.I_FALSE, interval=1.5)
+    #             return False
+    #         # 战斗成功
+    #         if self.appear_then_click(self.I_WIN, interval=2):
+    #             continue
+    #         #  出现 “魂” 和 紫蛇皮
+    #         if self.appear(self.I_REWARD) or self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) or \
+    #                 self.appear(self.I_REWARD_GOLD) or self.appear(self.I_REWARD_GOLD_SNAKE_SKIN):
+    #             self.random_reward_click(exclude_click=[self.C_RANDOM_TOP, self.C_RANDOM_LEFT])
+    #             ok_cnt += 1
+    #             continue
+    #         # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
+    #         if ok_cnt > 3 and not self.is_in_battle(False):
+    #             self.random_reward_click(exclude_click=[self.C_RANDOM_TOP, self.C_RANDOM_LEFT])
+    #             self.device.stuck_record_clear()
+    #             ok_cnt += 1
+    #             continue
+    #         # 战斗中随机滑动
+    #         if ok_cnt == 0 and random_click_swipt_enable:
+    #             self.random_click_swipt()
+    #     return True
+
+    @battle_wait_strategy('reserve_default', 'idle_default', failure='default', success='soul')
+    def battle_wait(self, *args, **kwargs):
+        return self.battle_wait_with_strategy(*args, **kwargs)
 
     def switch_soul(self, enter_button: RuleImage, cur_img: RuleImage):
         conf = self.conf.switch_soul_config

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

@@ -51,6 +51,7 @@ class ShikigamiType(str, Enum):
     COSTUME_SHIKIGAMI_8 = 'costume_shikigami_8'  # 童梦基地
     COSTUME_SHIKIGAMI_9 = 'costume_shikigami_9'  # 鹿眠之森
     COSTUME_SHIKIGAMI_10 = 'costume_shikigami_10'  # 今宵胧明
+    COSTUME_SHIKIGAMI_11 = 'costume_shikigami_11'  # 花札幕台
 
 # 签到主题
 class SignType(str, Enum):

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

@@ -69,7 +69,7 @@ shikigami_costume_model = {
         'I_ST_SOULS': f'I_ST_SOULS_{i}',
         'I_ST_REPLACE': f'I_ST_REPLACE_{i}',
     }
-    for i in range(1, 11)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_10
+    for i in range(1, 12)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_10
 }
 
 class CostumeBase:

+ 44 - 1
tasks/Component/CostumeShikigami/assets.py

@@ -96,6 +96,49 @@ class CostumeShikigamiAssets:
 	I_ST_REPLACE_10 = RuleImage(roi_front=(878,224,63,39), roi_back=(855,175,110,130), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_st_replace_10.png")
 
 
+	# Image Rule Assets
+	# description 
+	I_CHECK_RECORDS_11 = RuleImage(roi_front=(276,81,31,36), roi_back=(269,73,44,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_check_records_11.png")
+	# description 
+	I_RECORD_SOUL_BACK_11 = RuleImage(roi_front=(17,13,43,47), roi_back=(12,10,52,55), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_record_soul_back_11.png")
+	# description 
+	I_SOU_CHECK_GROUP_1_11 = RuleImage(roi_front=(1095,83,14,50), roi_back=(1092,81,21,55), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_1_11.png")
+	# description 
+	I_SOU_CHECK_GROUP_2_11 = RuleImage(roi_front=(1095,155,14,39), roi_back=(1092,149,20,51), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_2_11.png")
+	# description 
+	I_SOU_CHECK_GROUP_3_11 = RuleImage(roi_front=(1096,225,8,50), roi_back=(1093,220,17,56), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_3_11.png")
+	# description 
+	I_SOU_CHECK_GROUP_4_11 = RuleImage(roi_front=(1093,295,11,47), roi_back=(1090,293,19,51), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_4_11.png")
+	# description 
+	I_SOU_CHECK_GROUP_5_11 = RuleImage(roi_front=(1093,364,16,49), roi_back=(1092,361,19,55), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_5_11.png")
+	# description 
+	I_SOU_CHECK_GROUP_6_11 = RuleImage(roi_front=(1093,442,14,37), roi_back=(1088,437,24,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_6_11.png")
+	# description 
+	I_SOU_CHECK_GROUP_7_11 = RuleImage(roi_front=(1093,506,6,41), roi_back=(1091,500,13,53), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_7_11.png")
+	# description 
+	I_SOU_SWITCH_1_11 = RuleImage(roi_front=(977,138,32,30), roi_back=(969,129,48,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_1_11.png")
+	# description 
+	I_SOU_SWITCH_2_11 = RuleImage(roi_front=(973,293,37,32), roi_back=(968,287,50,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_2_11.png")
+	# description 
+	I_SOU_SWITCH_3_11 = RuleImage(roi_front=(981,445,26,35), roi_back=(979,443,32,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_3_11.png")
+	# description 
+	I_SOU_SWITCH_4_11 = RuleImage(roi_front=(979,602,28,25), roi_back=(973,598,39,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_4_11.png")
+	# description 
+	I_SOU_TEAM_PRESENT_11 = RuleImage(roi_front=(734,77,100,41), roi_back=(726,71,115,54), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_team_present_11.png")
+	# description 
+	I_SOU_SWITCH_SURE_11 = RuleImage(roi_front=(702,401,116,55), roi_back=(690,399,148,64), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_sure_11.png")
+	# description 
+	I_SOUL_PRESET_11 = RuleImage(roi_front=(342,85,74,31), roi_back=(338,77,83,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_soul_preset_11.png")
+	# description 
+	I_ST_REPLACE_11 = RuleImage(roi_front=(884,169,63,67), roi_back=(872,155,86,99), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_st_replace_11.png")
+	# description 
+	I_ST_SOULS_11 = RuleImage(roi_front=(1192,237,40,67), roi_back=(1182,229,59,86), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_st_souls_11.png")
+	# description 
+	I_SOU_CHECK_IN_11 = RuleImage(roi_front=(274,74,43,49), roi_back=(271,69,48,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_check_in_11.png")
+	# description 
+	I_SOU_CLICK_PRESENT_11 = RuleImage(roi_front=(975,292,34,34), roi_back=(971,134,42,530), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk11/sk11_sou_click_present_11.png")
+
+
 	# Image Rule Assets
 	# 用于判断在式神录 
 	I_CHECK_RECORDS_2 = RuleImage(roi_front=(267,76,51,46), roi_back=(265,74,55,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_check_records_2.png")
@@ -227,7 +270,7 @@ class CostumeShikigamiAssets:
 
 	# Image Rule Assets
 	# 用于判断在式神录 
-	I_CHECK_RECORDS_5 = RuleImage(roi_front=(267,76,51,46), roi_back=(265,74,55,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_check_records_5.png")
+	I_CHECK_RECORDS_5 = RuleImage(roi_front=(313,75,44,43), roi_back=(308,70,54,53), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_check_records_5.png")
 	# 退出式神录 
 	I_RECORD_SOUL_BACK_5 = RuleImage(roi_front=(19,9,51,44), roi_back=(19,9,51,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_record_soul_back_5.png")
 	# 预设 

+ 182 - 0
tasks/Component/CostumeShikigami/sk11/image.json

@@ -0,0 +1,182 @@
+[
+  {
+    "itemName": "check_records_11",
+    "imageName": "sk11_check_records_11.png",
+    "roiFront": "276,81,31,36",
+    "roiBack": "269,73,44,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "record_soul_back_11",
+    "imageName": "sk11_record_soul_back_11.png",
+    "roiFront": "17,13,43,47",
+    "roiBack": "12,10,52,55",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_1_11",
+    "imageName": "sk11_sou_check_group_1_11.png",
+    "roiFront": "1095,83,14,50",
+    "roiBack": "1092,81,21,55",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_2_11",
+    "imageName": "sk11_sou_check_group_2_11.png",
+    "roiFront": "1095,155,14,39",
+    "roiBack": "1092,149,20,51",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_3_11",
+    "imageName": "sk11_sou_check_group_3_11.png",
+    "roiFront": "1096,225,8,50",
+    "roiBack": "1093,220,17,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_4_11",
+    "imageName": "sk11_sou_check_group_4_11.png",
+    "roiFront": "1093,295,11,47",
+    "roiBack": "1090,293,19,51",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_5_11",
+    "imageName": "sk11_sou_check_group_5_11.png",
+    "roiFront": "1093,364,16,49",
+    "roiBack": "1092,361,19,55",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_6_11",
+    "imageName": "sk11_sou_check_group_6_11.png",
+    "roiFront": "1093,442,14,37",
+    "roiBack": "1088,437,24,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_7_11",
+    "imageName": "sk11_sou_check_group_7_11.png",
+    "roiFront": "1093,506,6,41",
+    "roiBack": "1091,500,13,53",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_switch_1_11",
+    "imageName": "sk11_sou_switch_1_11.png",
+    "roiFront": "977,138,32,30",
+    "roiBack": "969,129,48,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_switch_2_11",
+    "imageName": "sk11_sou_switch_2_11.png",
+    "roiFront": "973,293,37,32",
+    "roiBack": "968,287,50,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_switch_3_11",
+    "imageName": "sk11_sou_switch_3_11.png",
+    "roiFront": "981,445,26,35",
+    "roiBack": "979,443,32,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_switch_4_11",
+    "imageName": "sk11_sou_switch_4_11.png",
+    "roiFront": "979,602,28,25",
+    "roiBack": "973,598,39,34",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_team_present_11",
+    "imageName": "sk11_sou_team_present_11.png",
+    "roiFront": "734,77,100,41",
+    "roiBack": "726,71,115,54",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_switch_sure_11",
+    "imageName": "sk11_sou_switch_sure_11.png",
+    "roiFront": "702,401,116,55",
+    "roiBack": "690,399,148,64",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "soul_preset_11",
+    "imageName": "sk11_soul_preset_11.png",
+    "roiFront": "342,85,74,31",
+    "roiBack": "338,77,83,44",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "st_replace_11",
+    "imageName": "sk11_st_replace_11.png",
+    "roiFront": "884,169,63,67",
+    "roiBack": "872,155,86,99",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "st_souls_11",
+    "imageName": "sk11_st_souls_11.png",
+    "roiFront": "1192,237,40,67",
+    "roiBack": "1182,229,59,86",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_in_11",
+    "imageName": "sk11_sou_check_in_11.png",
+    "roiFront": "274,74,43,49",
+    "roiBack": "271,69,48,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_click_present_11",
+    "imageName": "sk11_sou_click_present_11.png",
+    "roiFront": "975,292,34,34",
+    "roiBack": "971,134,42,530",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/Component/CostumeShikigami/sk11/sk11_check_records_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_record_soul_back_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_1_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_2_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_3_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_4_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_5_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_6_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_group_7_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_check_in_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_click_present_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_1_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_2_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_3_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_4_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_switch_sure_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_sou_team_present_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_soul_preset_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_st_replace_11.png


BIN
tasks/Component/CostumeShikigami/sk11/sk11_st_souls_11.png


+ 2 - 2
tasks/Component/CostumeShikigami/sk5/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "check_records_5",
     "imageName": "sk5_check_records_5.png",
-    "roiFront": "267,76,51,46",
-    "roiBack": "265,74,55,50",
+    "roiFront": "313,75,44,43",
+    "roiBack": "308,70,54,53",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "用于判断在式神录"

+ 502 - 0
tasks/Component/GeneralBattle/battle_wait.py

@@ -0,0 +1,502 @@
+import random
+import time
+
+
+from functools import wraps
+from dataclasses import dataclass
+from typing import TypeVar, ParamSpec, Callable
+from enum import Enum, auto
+
+from module.logger import logger
+from module.base.timer import Timer
+
+from tasks.base_task import BaseTask
+
+
+P = ParamSpec('P')
+T = TypeVar('T')
+
+
+class HookSignal(Enum):
+    CONTINUE = auto()  # 无事发生
+    BUSY = auto()  # 处理了,继续
+    DONE = auto()  # 流程结束
+
+@dataclass
+class BattleWaitContext:
+    completion = False
+    success = False
+
+    def __getattr__(self, name):
+        if name in self.__dict__:
+            return self.__dict__[name]
+        return None
+
+class BattleWaitPlan:
+    """
+    就是一个超级大的状态机,这里拆成了很多hook
+    """
+    HOOKS_DEFAULT = ('setup', 'completion', 'interrupt', 'success', 'failure', 'idle')
+    SEQUENCE_DEFAULT = 'completion > interrupt > success > failure >'
+
+    def __init__(self, *arg, **kwargs):
+        extra_sequence: str = ''
+        #
+        for event_strategy in arg:
+            if not isinstance(event_strategy, str):
+                raise TypeError(
+                    'Battle wait hook must be a string in '
+                    '"event_strategy" format; '
+                    f'got {event_strategy!r}'
+                )
+
+            if not event_strategy:
+                raise ValueError(
+                    'Battle wait hook cannot be empty; '
+                    'expected "event_strategy" format'
+                )
+            event, separator, strategy = event_strategy.partition('_')
+            if not separator or not event or not strategy:
+                raise ValueError(
+                    'Invalid battle wait hook '
+                    f'{event_strategy!r}; expected "event_strategy" format'
+                )
+            setattr(self, event, strategy)
+            if event not in self.HOOKS_DEFAULT:
+                extra_sequence += f'{event} > '
+
+        #
+        for event, strategy in kwargs.items():
+            if not event or not isinstance(event, str) or not isinstance(strategy, str):
+                raise TypeError(f'{event} or {strategy} is not a string')
+            if getattr(self, event, None) is not None:
+                raise ValueError(
+                    f'Battle wait event {event!r} was configured more than once'
+                )
+            setattr(self, event, strategy)
+            if event not in self.HOOKS_DEFAULT:
+                extra_sequence += f'{event} > '
+
+        # 补齐默认的
+        for event in self.HOOKS_DEFAULT:
+            if getattr(self, event, None) is None:
+                setattr(self, event, 'default')
+
+        #
+        self.sequence = kwargs.get('sequence', None)
+        if self.sequence is None:
+            self.sequence = f'{BattleWaitPlan.SEQUENCE_DEFAULT} {extra_sequence} idle'
+        if not isinstance(self.sequence, str):
+            raise TypeError(
+                'Battle wait sequence must be a string containing event names '
+                "separated by '>'; "
+                f'got {self.sequence!r}'
+            )
+        self.sequence: str = self.sequence.replace(' ', '').replace('\n', '').replace('\r', '').replace('setup', '')
+        for event_name in self.sequence.split('>'):
+            event_name = event_name.strip()
+            if event_name == "sequence":
+                continue
+            if getattr(self, event_name, None) is None:
+                raise ValueError(
+                    f'Unknown battle wait event {event_name!r} in '
+                    f'sequence {self.sequence!r}'
+                )
+        for event in self.HOOKS_DEFAULT:
+            if event != 'setup' and  event not in self.sequence:
+                raise ValueError(
+                    f'Battle wait sequence is missing required event {event!r}; '
+                    f'got {self.sequence!r}'
+                )
+
+    def __str__(self):
+        lines = [f"{self.__class__.__name__}:", f"  sequence: {self.sequence}", "  hooks:"]
+        for event_name in self.HOOKS_DEFAULT:
+            strategy_name = getattr(self, event_name, None)
+            if callable(strategy_name):
+                if hasattr(strategy_name, '__name__'):
+                    func_name = strategy_name.__name__
+                else:
+                    func_name = repr(strategy_name)
+                val_str = f"<function {func_name}>"
+            else:
+                val_str = repr(strategy_name)
+            lines.append(f"    {event_name}: {val_str}")
+        return "\n".join(lines)
+
+    def __repr__(self):
+        return self.__str__()
+
+    @property
+    def function_setup_name(self) -> str:
+        if getattr(self, 'setup', None) is None:
+            self.setup = 'default'
+        return f'_bw_setup_{self.setup}'
+
+    def sequence_function_names(self) -> list[str]:
+        function_names = []
+        for event_name in self.sequence.split('>'):
+            event_name = event_name.strip()
+            if not event_name:
+                continue
+
+            if not hasattr(self, event_name):
+                raise ValueError(f'Unknown battle wait event: {event_name}')
+
+            strategy_name = getattr(self, event_name)
+            if not isinstance(strategy_name, str) or not strategy_name:
+                raise ValueError(
+                    f'Invalid strategy for battle wait event {event_name}: '
+                    f'{strategy_name!r}'
+                )
+
+            function_names.append(f'_bw_{event_name}_{strategy_name}')
+        return function_names
+
+    def override(self, *arg, **kwargs):
+        if kwargs:
+            raise TypeError(
+                'sequence is not supported' if 'sequence' in kwargs else f'Unexpected keyword arguments: {tuple(kwargs)}')
+        if not arg:
+            return self
+
+        events = [event for event in self.sequence.split('>') if event]
+        if 'idle' not in events:
+            raise ValueError(f'Sequence {self.sequence!r} must contain "idle"')
+        idle_index = events.index('idle')
+
+        for event_strategy in arg:
+            if not isinstance(event_strategy, str):
+                raise TypeError(f'event_strategy must be a string, got {event_strategy!r}')
+
+            event, separator, strategy = event_strategy.partition('_')
+            if not separator or not event or not strategy:
+                raise ValueError(f'Invalid event_strategy: {event_strategy!r}')
+            if event == 'sequence':
+                raise ValueError('sequence cannot be overridden')
+
+            is_new = not hasattr(self, event)
+            setattr(self, event, strategy)
+            if is_new:
+                events.insert(idle_index, event)
+                idle_index += 1
+
+        self.sequence = '>'.join(events)
+        return self
+
+class battle_wait_strategy:
+    """
+    使用with 上下文临时修改  battle_wait_plan
+    首次装饰 func 初始化 battle_wait_plan
+    """
+    battle_wait_plan: BattleWaitPlan = None
+
+
+    def __init__(self, *arg, **kwargs):
+        self._temp_battle_wait_plan = None
+        if battle_wait_strategy.battle_wait_plan is None:
+            # 首次装饰 func 初始化 battle_wait_plan
+            battle_wait_strategy.battle_wait_plan = BattleWaitPlan(*arg, **kwargs)  # pylint: disable=unused-argument
+        elif self._temp_battle_wait_plan is None:
+            # 使用 with 上下文临时修改 battle_wait_plan
+            self._temp_battle_wait_plan = BattleWaitPlan(*arg, **kwargs)
+
+    def __enter__(self):
+        self._previous_plan = battle_wait_strategy.battle_wait_plan
+
+        if self._temp_battle_wait_plan is not None:
+            battle_wait_strategy.battle_wait_plan = self._temp_battle_wait_plan
+        return self
+
+    def __exit__(self, *exc):
+        battle_wait_strategy.battle_wait_plan = self._previous_plan
+        return False
+
+    def __str__(self):
+        temp_plan = getattr(self, '_temp_battle_wait_plan', None)
+        default_plan = getattr(self, 'battle_wait_plan', None)
+
+        if temp_plan is not None:
+            plan = temp_plan
+            scope = 'temporary'
+        else:
+            plan = default_plan
+            scope = 'decorator'
+
+        if plan is None:
+            return f'{type(self).__name__}(plan=None)'
+
+        return (
+            f'{type(self).__name__}('
+            f'scope={scope}, '
+            f'plan=\n{plan}'
+            f')'
+        )
+    def __repr__(self):
+        return self.__str__()
+
+
+    def _recreate_cm(self):
+        return self
+
+    def __call__(self, func: Callable[P, T]) -> Callable[P, T]:
+        @wraps(func)
+        def inner(owner, *args: P.args, **kwargs: P.kwargs) -> T:
+            # 兼容性处理
+            #-----------------------------------------------------------------------
+            if kwargs:
+                override_kwargs = {}
+                override_args = list()
+                for key, value in kwargs.items():
+                    if key == 'random_click_swipt_enable' and value:
+                        override_kwargs['randomclick'] = 'default'
+                        override_args.append('randomclick_default')
+                battle_wait_strategy.battle_wait_plan =\
+                    battle_wait_strategy.battle_wait_plan.override(*override_args)
+            # -----------------------------------------------------------------------
+            # kwargs.setdefault(
+            #     'battle_wait_plan',
+            #     self.battle_wait_plan,
+            # )
+            return func(owner, battle_wait_plan=battle_wait_strategy.battle_wait_plan)
+
+        return inner
+
+
+class BattleWait(BaseTask):
+    # build in
+    # ------------------------------------------------------------------------------------------------------------------
+    def _bw_setup_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        self.C_REWARD_1.name = 'C_REWARD'
+        self.C_REWARD_2.name = 'C_REWARD'
+        self.C_REWARD_3.name = 'C_REWARD'
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        logger.info('Start battle process')
+        return HookSignal.DONE
+
+    def _bw_completion_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        if bw_ctx.completion:
+            logger.info('Battle done')
+            return HookSignal.DONE
+        return HookSignal.CONTINUE
+
+    def _bw_interrupt_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        return HookSignal.CONTINUE
+
+    def _bw_success_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        if self.appear_then_click(self.I_WIN, interval=0.8):
+            return HookSignal.CONTINUE
+        appear_ghost, appear_reward, appear_gold = (
+            self.appear(self.I_GREED_GHOST),
+            self.appear(self.I_REWARD),
+            self.appear(self.I_REWARD_GOLD)
+        )
+        if not any([appear_ghost, appear_reward, appear_gold]):
+            return HookSignal.CONTINUE
+        logger.info('Win battle')
+        timer = Timer(20).start()
+        while 1:
+            self.screenshot()
+
+            _appear_ghost, _appear_reward, _appear_gold = (
+                self.appear(self.I_GREED_GHOST, threshold=0.6),
+                self.appear(self.I_REWARD),
+                self.appear(self.I_REWARD_GOLD)
+            )
+            # logger.info(f'_appear_ghost: {_appear_ghost} _appear_reward: {_appear_reward} _appear_gold: {_appear_gold}')
+            if any([_appear_ghost, _appear_reward, _appear_gold]):
+                action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
+                self.click(action_click, interval=1.5)
+            else:
+                logger.info('Get all reward')
+                bw_ctx.success = True
+                bw_ctx.completion = True
+                return HookSignal.CONTINUE
+            if timer.reached_and_reset():
+                logger.warning('battle ')
+                break
+        return HookSignal.CONTINUE
+
+
+    def _bw_failure_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        if self.appear(self.I_FALSE, threshold=0.8):
+            logger.warning('False battle')
+            self.ui_click_until_disappear(self.I_FALSE)
+            bw_ctx.completion = True
+            return True
+        return True
+
+    def _bw_idle_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        return HookSignal.CONTINUE
+
+    def _bw_reserve_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        return HookSignal.CONTINUE
+
+    def _bw_randomclick_default(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        if 0 <= random.randint(0, 500) <= 20:  # 百分之4的概率
+            rand_type = random.randint(0, 2)
+            match rand_type:
+                case 0:
+                    self.click(self.C_RANDOM_CLICK, interval=20)
+                case 1:
+                    self.swipe(self.S_BATTLE_RANDOM_LEFT, interval=20)
+                case 2:
+                    self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
+            # 重新设置为长战斗
+            # self.device.stuck_record_add('BATTLE_STATUS_S')
+        else:
+            time.sleep(0.4)  # 这样的好像不对
+        return HookSignal.CONTINUE
+
+    # custom
+    # ------------------------------------------------------------------------------------------------------------------
+    def _bw_success_soul(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        if self.appear_then_click(self.I_WIN, interval=0.8):
+            return HookSignal.CONTINUE
+        appear_ghost, appear_reward, appear_gold, appear_skin = (
+            self.appear(self.I_GREED_GHOST),
+            self.appear(self.I_REWARD),
+            self.appear(self.I_REWARD_GOLD),
+            self.appear(self.I_REWARD_GOLD_SNAKE_SKIN)
+        )
+        if not any([appear_ghost, appear_reward, appear_gold, appear_skin]):
+            return HookSignal.CONTINUE
+        logger.info('Win battle')
+        timer = Timer(20).start()
+        while 1:
+            self.screenshot()
+
+            _appear_ghost, _appear_reward, _appear_gold, _appear_skin = (
+                self.appear(self.I_GREED_GHOST, threshold=0.6),
+                self.appear(self.I_REWARD),
+                self.appear(self.I_REWARD_GOLD),
+                self.appear(self.I_REWARD_GOLD_SNAKE_SKIN)
+            )
+            # logger.info(f'_appear_ghost: {_appear_ghost} _appear_reward: {_appear_reward} _appear_gold: {_appear_gold} _appear_skin: {_appear_skin}')
+            if any([_appear_ghost, _appear_reward, _appear_gold, _appear_skin]):
+                action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
+                self.click(action_click, interval=1.5)
+            else:
+                logger.info('Get all reward')
+                bw_ctx.success = True
+                bw_ctx.completion = True
+                return HookSignal.CONTINUE
+            if timer.reached_and_reset():
+                logger.warning('battle ')
+                break
+        return HookSignal.CONTINUE
+
+
+    # def _bw_idle_random_click(self, bw_ctx: BattleWaitContext):
+    #     if 0 <= random.randint(0, 500) <= 3:  # 百分之4的概率
+    #         rand_type = random.randint(0, 2)
+    #         match rand_type:
+    #             case 0:
+    #                 self.click(self.C_RANDOM_CLICK, interval=20)
+    #             case 1:
+    #                 self.swipe(self.S_BATTLE_RANDOM_LEFT, interval=20)
+    #             case 2:
+    #                 self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
+    #         # 重新设置为长战斗
+    #         # self.device.stuck_record_add('BATTLE_STATUS_S')
+    #     else:
+    #         time.sleep(0.4)  # 这样的好像不对
+    #
+    # def _bw_random_click(self, bw_ctx: BattleWaitContext):
+    #     if 0 <= random.randint(0, 500) <= 3:  # 百分之4的概率
+    #         rand_type = random.randint(0, 2)
+    #         match rand_type:
+    #             case 0:
+    #                 self.click(self.C_RANDOM_CLICK, interval=20)
+    #             case 1:
+    #                 self.swipe(self.S_BATTLE_RANDOM_LEFT, interval=20)
+    #             case 2:
+    #                 self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
+    #         # 重新设置为长战斗
+    #         # self.device.stuck_record_add('BATTLE_STATUS_S')
+    #     else:
+    #         time.sleep(0.4)  # 这样的好像不对
+
+    # ------------------------------------------------------------------------------------------------------------------
+    def battle_wait_with_strategy(self, *args, **kwargs) -> bool:
+        """
+        三种自定义配置方法:
+        1. 使用装饰器battle_wait_strategy
+            @battle_wait_strategy( 'reserve_default', 'idle_default', failure='default')
+            def battle_wait(self, *args, **kwargs):
+                return self.battle_wait_with_strategy(*args, **kwargs)
+        2. 使用 with 上下文 (!在1基础上)
+            with battle_wait_strategy('reserve_default'):
+                test_battle_wait.battle_wait()
+        3. 调用时动态传参 (!在2基础上)
+            obj.battle_wait(random_click_swipt_enable=1)  # 详细参数看 battle_wait_strategy.__call__()
+
+        理解 event + strategy 概念: 把战斗过程抽象为一系列触发事件以及对应的实现函数,也称hook。
+        默认定义的 hook 有 BattleWaitPlan.HOOKS_DEFAULT = ('setup', 'completion', 'interrupt', 'success', 'failure', 'idle')
+        这些 hook 跑在一个 while 里面,默认的调用顺序 BattleWaitPlan.SEQUENCE_DEFAULT = 'completion > interrupt > success > failure > idle'
+        setup 没有跑在 while里面 而是在 while之前
+
+        event + strategy 拼成了一个hook, 一个 event 在一次战斗过程中只能挂载一个 strategy】
+        自定义hook就是字符串拼起来:  battle_wait_strategy的入参可以有 ‘event_strategy’ 或者 'event=strategy'
+        可以添加任意 event 以及其对应的 strategy。比如 ‘yyy_default’ 'abcd_edf'
+        但是必须要实现对应的hook 上面的比如 _bw_yyy_default() 以及 _bw_abcd_edf()
+
+        hook 可以自定义顺序,比如 battle_wait_strategy(sequence='completion > interrupt > success > failure > idle')
+        如果指定sequence, 新增的event会按照传参时候从左到右排序,左边高优先级,新增的会插入到 failure 和 idle 之间
+        """
+        battle_wait_plan = kwargs.get('battle_wait_plan')
+        if battle_wait_plan is None:
+            battle_wait_plan = BattleWaitPlan()
+        # print(battle_wait_plan)
+        # print(battle_wait_plan.sequence_function_names())
+
+        bw_ctx = BattleWaitContext()
+        setup_func = getattr(self, battle_wait_plan.function_setup_name, self._bw_setup_default)
+        setup_func(bw_ctx)
+        handlers = [getattr(self, func_name, None) for func_name in battle_wait_plan.sequence_function_names()]
+
+        while True:
+            self.screenshot()
+            for handler in handlers:
+                result = handler(bw_ctx)
+                if handler.__name__.startswith('_bw_completion') and result == HookSignal.DONE:
+                    return True
+
+            # bw_ctx.completion = True
+
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+    c = Config('oas1')
+    d = Device(c)
+
+
+    class TestBattleWait(GeneralBattle, BattleWait):
+        def _bw_settlement(self):
+            pass
+
+        @battle_wait_strategy( 'reserve_default', 'idle_default', failure='default')
+        def battle_wait(self, *args, **kwargs):
+            return self.battle_wait_with_strategy(*args, **kwargs)
+
+    test_battle_wait = TestBattleWait(c,d)
+    test_battle_wait.battle_wait(random_click_swipt_enable=1)
+    with battle_wait_strategy(sequence='completion > interrupt > success > failure > idle'):
+        test_battle_wait.battle_wait()
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -15,11 +15,12 @@ from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
 from tasks.Component.GeneralBattle.config_general_battle import GreenMarkType, GeneralBattleConfig
 from tasks.Component.GeneralBuff.config_buff import BuffClass
 from tasks.Component.GeneralBuff.general_buff import GeneralBuff
+from tasks.Component.GeneralBattle.battle_wait import BattleWait
 
 from module.logger import logger
 
 
-class GeneralBattle(GeneralBuff, GeneralBattleAssets):
+class GeneralBattle(BattleWait, GeneralBuff, GeneralBattleAssets):
     """
     使用这个通用的战斗必须要求这个任务的config有config_general_battle
     """

+ 2 - 0
tasks/Duel/assets.py

@@ -58,6 +58,8 @@ class DuelAssets:
 	I_D_CHECK_BAN = RuleImage(roi_front=(611,36,56,62), roi_back=(590,14,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_check_ban.png")
 	# 斗技荣誉图标 
 	I_DUEL_HONOR = RuleImage(roi_front=(211,636,20,20), roi_back=(200,601,130,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_duel_honor.png")
+	# 队伍试用 
+	I_D_TRY = RuleImage(roi_front=(667,356,111,30), roi_back=(667,356,111,30), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_try.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/Duel/duel/duel_d_try.png


+ 9 - 0
tasks/Duel/duel/image.json

@@ -178,5 +178,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "斗技荣誉图标"
+  },
+  {
+    "itemName": "d_try",
+    "imageName": "duel_d_try.png",
+    "roiFront": "667,356,111,30",
+    "roiBack": "667,356,111,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "队伍试用"
   }
 ]

+ 2 - 0
tasks/GameUi/page.py

@@ -5,6 +5,7 @@ import random
 import traceback
 from module.atom.click import RuleClick
 from tasks.BondlingFairyland.assets import BondlingFairylandAssets
+from tasks.Duel.assets import DuelAssets
 from tasks.GlobalGame.assets import GlobalGameAssets as GGA
 from tasks.GameUi.assets import GameUiAssets as G
 from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
@@ -123,6 +124,7 @@ page_exploration.link(button=G.I_EXPLORATION_GOTO_HERO_TEST, destination=page_he
 # ************************************* 町中部分 *****************************************#
 # 斗技 duel
 page_duel = Page(G.I_CHECK_DUEL)
+page_duel.additional = [DuelAssets.I_D_TRY]
 page_duel.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_DUEL, destination=page_duel)
 # 逢魔之时 demon_encounter

+ 2 - 1
tasks/KekkaiUtilize/config.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 from enum import Enum
-from datetime import datetime, time
+from datetime import datetime, time, timedelta
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
@@ -31,6 +31,7 @@ class UtilizeConfig(BaseModel):
     select_friend_list: SelectFriendList = Field(default=SelectFriendList.SAME_SERVER, description='select_friend_list_help')
     shikigami_class: ShikigamiClass = Field(default=ShikigamiClass.N, description='shikigami_class_help')
     shikigami_order: int = Field(default=4, description='shikigami_order_help')
+    min_run_interval: TimeDelta = Field(default=timedelta(0), description='min_run_interval_help')
     harvest_guild_max_times: int = Field(default=3, description='收取寮资金或体力失败的最大尝试次数')
     utilize_enable: bool = Field(default=True, description='是否蹭卡,小号可以选择不蹭卡')
     guild_ap_enable: bool = Field(default=True, description='guild_ap_enable_help')

+ 3 - 0
tasks/KekkaiUtilize/script_task.py

@@ -92,6 +92,9 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
                 # 已经蹭上卡了,设置下次蹭卡时间  # 减少30秒
                 # remaining_time = remaining_time - timedelta(seconds=30)
                 next_time = datetime.now() + remaining_time
+                min_interval = con.min_run_interval
+                if min_interval and min_interval.total_seconds() > 0:
+                    next_time = max(next_time, datetime.now() + min_interval)
                 self.set_next_run(task='KekkaiUtilize', target=next_time)
                 return
             if not self.grown_goto_utilize():

+ 1 - 1
tasks/RichMan/assets.py

@@ -301,7 +301,7 @@ class RichManAssets:
 	# 多少号位 
 	O_SCA_DEMON_POSTION = RuleOcr(roi=(960,244,88,41), area=(960,244,88,41), mode="Single", method="Default", keyword="", name="sca_demon_postion")
 	# 朴素的御魂 
-	O_SCA_RES_OROCHI = RuleOcr(roi=(610,9,127,37), area=(610,9,127,37), mode="DigitCounter", method="Default", keyword="", name="sca_res_orochi")
+	O_SCA_RES_OROCHI = RuleOcr(roi=(547,8,127,37), area=(547,9,127,37), mode="DigitCounter", method="Default", keyword="", name="sca_res_orochi")
 	# 首领御魂数量 
 	O_SCA_RES_DEMON = RuleOcr(roi=(968,11,102,35), area=(968,11,102,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
 	# 永生之海 

+ 2 - 2
tasks/RichMan/mall/scales/ocr.json

@@ -37,8 +37,8 @@
   },
   {
     "itemName": "sca_res_orochi",
-    "roiFront": "610,9,127,37",
-    "roiBack": "610,9,127,37",
+    "roiFront": "547,8,127,37",
+    "roiBack": "547,9,127,37",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 2 - 0
tasks/RyouToppa/script_task.py

@@ -322,6 +322,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RyouToppaAssets):
                 click_failure_count += 1
                 continue
             if self.click(rcl, interval=5):
+                # https://github.com/runhey/OnmyojiAutoScript/issues/1748
+                time.sleep(random.uniform(0, 0.3))
                 click_failure_count += 1
                 continue
 

+ 3 - 1
tasks/Script/config.py

@@ -6,9 +6,11 @@ from pydantic import BaseModel, Field
 from tasks.Script.config_device import Device
 from tasks.Script.config_error import Error
 from tasks.Script.config_optimization import Optimization
+from tasks.Script.config_antiban import AntiBan
 
 
 class Script(BaseModel):
     device: Device = Field(default_factory=Device)
     error: Error = Field(default_factory=Error)
-    optimization: Optimization = Field(default_factory=Optimization)
+    optimization: Optimization = Field(default_factory=Optimization)
+    anti_ban: AntiBan = Field(default_factory=AntiBan)

+ 18 - 0
tasks/Script/config_antiban.py

@@ -0,0 +1,18 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+from datetime import timedelta
+from pydantic import BaseModel, Field
+
+from tasks.Component.config_base import Time, TimeDelta
+
+
+class AntiBan(BaseModel):
+    enable: bool = Field(default=False, description='antiban_enable_help')
+    sleep_start: Time = Field(default=Time(hour=2, minute=0, second=0),
+                              description='sleep_start_help')
+    sleep_end: Time = Field(default=Time(hour=8, minute=0, second=0),
+                            description='sleep_end_help')
+    daily_active_limit: TimeDelta = Field(default=timedelta(hours=0),
+                                          description='daily_active_limit_help')
+    long_rest_duration: TimeDelta = Field(default=timedelta(hours=2),
+                                          description='long_rest_duration_help')