Przeglądaj źródła

Merge branch 'dev' into dev_hya

Azure 1 rok temu
rodzic
commit
36a9dc4a93
48 zmienionych plików z 723 dodań i 401 usunięć
  1. 7 0
      module/atom/list.py
  2. 7 0
      module/base/timer.py
  3. 3 3
      module/device/platform2/platform_windows.py
  4. 1 2
      module/server/updater.py
  5. 3 0
      script.py
  6. BIN
      tasks/ActivityShikigami/as/as_entry_activity.png
  7. 3 3
      tasks/ActivityShikigami/as/image.json
  8. 4 4
      tasks/ActivityShikigami/as/ocr.json
  9. 3 3
      tasks/ActivityShikigami/assets.py
  10. 53 0
      tasks/ActivityShikigami/page.py
  11. 37 9
      tasks/ActivityShikigami/script_task.py
  12. 73 114
      tasks/AreaBoss/script_task.py
  13. 19 0
      tasks/Component/BaseActivity/config_activity.py
  14. 2 0
      tasks/Component/Buy/assets.py
  15. 5 1
      tasks/Component/Buy/buy.py
  16. BIN
      tasks/Component/Buy/buy/buy_buy_success.png
  17. 9 0
      tasks/Component/Buy/buy/image.json
  18. 11 0
      tasks/Component/GeneralBattle/general_battle.py
  19. 10 6
      tasks/Component/ReplaceShikigami/assets.py
  20. 12 8
      tasks/Component/ReplaceShikigami/replace_shikigami.py
  21. 30 12
      tasks/Component/ReplaceShikigami/rs/image.json
  22. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_material.png
  23. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_n.png
  24. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_r.png
  25. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png
  26. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png
  27. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png
  28. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png
  29. BIN
      tasks/Component/ReplaceShikigami/rs/rs_rs_ur_selected.png
  30. 12 0
      tasks/Dokan/assets.py
  31. 13 0
      tasks/Dokan/res/goto_list.json
  32. 20 2
      tasks/Dokan/res/image.json
  33. 9 1
      tasks/Dokan/res/ocr.json
  34. 46 3
      tasks/Dokan/script_task.py
  35. 3 3
      tasks/Duel/script_task.py
  36. 125 89
      tasks/GameUi/game_ui.py
  37. 20 57
      tasks/GameUi/page.py
  38. 10 1
      tasks/Hunt/config.py
  39. 7 10
      tasks/Hunt/script_task.py
  40. 2 4
      tasks/RichMan/mall/medal.py
  41. 0 11
      tasks/RichMan/script_task.py
  42. 1 0
      tasks/Utils/config_enum.py
  43. 4 0
      tasks/WeeklyTrifles/assets.py
  44. BIN
      tasks/WeeklyTrifles/broken_amulet/broken_amulet_bmt_check.png
  45. 9 0
      tasks/WeeklyTrifles/broken_amulet/image.json
  46. 9 0
      tasks/WeeklyTrifles/broken_amulet/ocr.json
  47. 51 39
      tasks/WeeklyTrifles/script_task.py
  48. 90 16
      tasks/base_task.py

+ 7 - 0
module/atom/list.py

@@ -43,6 +43,13 @@ class RuleList:
         self._target = None  # 目标
         self.targets = {}  # 目标列表 只是针对image
 
+    @property
+    def name(self):
+        return f'RuleList[{self.__hash__()}]'
+
+    def __hash__(self):
+        return hash((self.folder, self.is_vertical, self.is_image, self.is_ocr, tuple(self.roi_back), tuple(self.size), tuple(self.array)))
+
     def swipe_pos(self, number: int=2, after: bool=True) -> tuple:
         """
         返回滑动的起始位置和终点位置

+ 7 - 0
module/base/timer.py

@@ -159,6 +159,13 @@ class Timer:
         from module.logger import logger
         logger.info(str(self))
 
+    def remain(self):
+        """
+        remain time
+        :return:
+        """
+        return self._current + self.limit - time.time()
+
     def __str__(self):
         return f'Timer(limit={round(self.current(), 3)}/{self.limit}, count={self._reach_count}/{self.count})'
 

+ 3 - 3
module/device/platform2/platform_windows.py

@@ -342,7 +342,7 @@ class PlatformWindows(PlatformBase, EmulatorManager):
                 else:
                     new_window = 0
             try:
-                logger.info('Try to connect emulator, please waiting......')
+                logger.info(f'Try to connect emulator, remain[{timeout.remain():.1f}s]')
                 # Check device connection
                 devices = self.list_device().select(serial=serial)
                 # logger.info(devices)
@@ -417,7 +417,7 @@ class PlatformWindows(PlatformBase, EmulatorManager):
 
     def emulator_start(self):
         logger.hr('Emulator start', level=1)
-        for _ in range(3):
+        for i in range(3):
             # Stop
             if not self._emulator_function_wrapper(self._emulator_stop):
                 return False
@@ -426,7 +426,7 @@ class PlatformWindows(PlatformBase, EmulatorManager):
                 # Success
                 if self.emulator_start_watch():
                     return True
-                # Failed to connect or start, try again
+                logger.attr(2 - i, f'Failed to connect or start, try again')
                 continue
             else:
                 # Failed to start, stop and start again

+ 1 - 2
module/server/updater.py

@@ -63,8 +63,7 @@ class Updater(DeployConfig, GitManager, PipManager):
             return logs
 
     def current_branch(self) -> str:
-        branch = self.execute_output(f'{self.git} branch --show-current')
-        return branch.strip()
+        return self.Branch
 
     def current_commit(self) -> str:
         return self.get_commit()

+ 3 - 0
script.py

@@ -356,6 +356,9 @@ class Script:
         # 处理御魂溢出
         from tasks.Utils.post_diagnotor import PostDiagnotor, AnalyzeType
         image = getattr(self.device, 'image', None)
+        # image为None则不做处理
+        if image is None:
+            return
         analyse_type = PostDiagnotor().handle(e=e, command=command, image=image)
         if analyse_type == AnalyzeType.SoulOverflow:
             self.config.task_call('SoulsTidy')

BIN
tasks/ActivityShikigami/as/as_entry_activity.png


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

@@ -236,10 +236,10 @@
   {
     "itemName": "entry_activity",
     "imageName": "as_entry_activity.png",
-    "roiFront": "567,258,46,42",
-    "roiBack": "254,56,774,524",
+    "roiFront": "508,318,46,42",
+    "roiBack": "56,56,971,633",
     "method": "Template matching",
-    "threshold": 0.5,
+    "threshold": 0.7,
     "description": "进入门票活动"
   },
   {

+ 4 - 4
tasks/ActivityShikigami/as/ocr.json

@@ -37,8 +37,8 @@
   },
   {
     "itemName": "entry_activity",
-    "roiFront": "72,279,98,32",
-    "roiBack": "73,279,98,32",
+    "roiFront": "73,189,98,32",
+    "roiBack": "72,188,98,32",
     "mode": "Single",
     "method": "Default",
     "keyword": "临战演武",
@@ -73,8 +73,8 @@
   },
   {
     "itemName": "enter_ap100",
-    "roiFront": "72,187,95,32",
-    "roiBack": "7,172,256,108",
+    "roiFront": "73,98,95,32",
+    "roiBack": "5,79,256,108",
     "mode": "Single",
     "method": "Default",
     "keyword": "将魂试炼",

+ 3 - 3
tasks/ActivityShikigami/assets.py

@@ -111,7 +111,7 @@ class ActivityShikigamiAssets:
 	# 爬塔活动buff页 
 	I_CHECK_BUFF = RuleImage(roi_front=(91,12,130,47), roi_back=(77,0,156,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_buff.png")
 	# 进入门票活动 
-	I_ENTRY_ACTIVITY = RuleImage(roi_front=(567,258,46,42), roi_back=(254,56,774,524), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_entry_activity.png")
+	I_ENTRY_ACTIVITY = RuleImage(roi_front=(508,318,46,42), roi_back=(56,56,971,633), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_entry_activity.png")
 	# 活动列表页爬塔活动 
 	I_CHECK_ACT_LIST_CLIMB_ACT = RuleImage(roi_front=(538,194,497,193), roi_back=(415,67,773,390), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_act_list_climb_act.png")
 	# 活动地图切换 
@@ -132,7 +132,7 @@ class ActivityShikigamiAssets:
 	# 活动票数(没有百分比) 
 	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(1115,25,88,29), area=(1107,14,103,50), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
 	# 从左侧进入战斗 
-	O_ENTRY_ACTIVITY = RuleOcr(roi=(72,279,98,32), area=(73,279,98,32), mode="Single", method="Default", keyword="临战演武", name="entry_activity")
+	O_ENTRY_ACTIVITY = RuleOcr(roi=(73,189,98,32), area=(72,188,98,32), mode="Single", method="Default", keyword="临战演武", name="entry_activity")
 	# boss剩余攻击次数 
 	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(1099,659,162,52), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
 	# 挑战 
@@ -140,6 +140,6 @@ class ActivityShikigamiAssets:
 	# 100体活动门票检测 
 	O_REMAIN_AP100 = RuleOcr(roi=(922,21,112,39), area=(913,8,131,62), mode="Digit", method="Default", keyword="", name="remain_ap100")
 	# 进入100体活动标识 
-	O_ENTER_AP100 = RuleOcr(roi=(72,187,95,32), area=(7,172,256,108), mode="Single", method="Default", keyword="将魂试炼", name="enter_ap100")
+	O_ENTER_AP100 = RuleOcr(roi=(73,98,95,32), area=(5,79,256,108), mode="Single", method="Default", keyword="将魂试炼", name="enter_ap100")
 
 

+ 53 - 0
tasks/ActivityShikigami/page.py

@@ -0,0 +1,53 @@
+from tasks.ActivityShikigami.assets import ActivityShikigamiAssets as asa
+from tasks.GameUi.page import Page, page_main, page_act_list_climb_act, page_reward, random_click, page_failed, page_battle, page_shikigami_records
+from tasks.GlobalGame.assets import GlobalGameAssets as gga
+from tasks.GameUi.assets import GameUiAssets as G
+from tasks.base_task import BaseTask as BT
+
+# 爬塔活动界面
+page_climb_act = Page(asa.I_BATTLE)
+page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT, asa.I_RED_EXIT_2]
+page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
+page_act_list_climb_act.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
+# 爬塔活动副界面
+page_climb_act_2 = Page(asa.I_CHECK_BATTLE_2)
+page_climb_act_2.additional = [asa.I_ACT_MAP_SWITCH, asa.I_PASS_ACT_LOCAT, asa.I_SKIP_BUTTON, asa.I_RED_EXIT,
+                               asa.I_RED_EXIT_2]
+page_climb_act_2.link(button=G.I_BACK_BATTLE, destination=page_climb_act)
+page_climb_act.link(button=asa.I_BATTLE, destination=page_climb_act_2)
+# 门票爬塔活动界面
+page_climb_act_pass = Page(asa.I_AP_ACTIVITY)
+page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT, ]
+page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+page_climb_act_2.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
+# 体力爬塔活动界面
+page_climb_act_ap = Page(asa.I_AP)
+page_climb_act_ap.additional = [asa.O_ENTRY_ACTIVITY, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD,
+                                asa.I_RED_EXIT]
+page_climb_act_ap.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap)
+# 体力, 门票互相跳转
+# page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
+# page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
+# 100体爬塔活动界面
+page_climb_act_ap100 = Page(asa.I_CHECK_AP100)
+page_climb_act_2.link(button=asa.O_ENTER_AP100, destination=page_climb_act_ap100)
+page_climb_act_ap100.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+# 爬塔活动boss战界面
+page_climb_act_boss = Page(asa.I_CHECK_BOSS)
+page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
+page_climb_act_boss.link(button=G.I_BACK_Y, destination=page_climb_act)
+page_climb_act.link(button=asa.I_BOSS, destination=page_climb_act_boss)
+# 爬塔活动加成界面
+page_climb_act_buff = Page(asa.I_CHECK_BUFF)
+page_climb_act_buff.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
+page_climb_act_buff.link(button=G.I_BACK_Y, destination=page_climb_act)
+page_climb_act.link(button=asa.I_BUFF_CHANGE_BUTTON, destination=page_climb_act_buff)
+
+page_reward.link(button=random_click(), destination=page_climb_act_pass)
+page_reward.link(button=random_click(), destination=page_climb_act_ap)
+page_reward.link(button=random_click(), destination=page_climb_act_boss)
+
+page_failed.link(button=random_click(), destination=page_climb_act_pass)
+page_failed.link(button=random_click(), destination=page_climb_act_ap)
+page_failed.link(button=random_click(), destination=page_climb_act_boss)

+ 37 - 9
tasks/ActivityShikigami/script_task.py

@@ -12,6 +12,7 @@ from datetime import datetime, timedelta, time
 from module.atom.click import RuleClick
 from module.atom.ocr import RuleOcr
 from module.base.protect import random_sleep
+from module.base.timer import Timer
 from module.exception import TaskEnd
 from module.logger import logger
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
@@ -20,7 +21,7 @@ from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.config_activity import GeneralClimb
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
-import tasks.GameUi.page as game
+import tasks.ActivityShikigami.page as game
 from typing import Any
 
 
@@ -129,11 +130,8 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                     self.lock_team(self.conf.general_battle)
                     self.check_tickets_enough()
                     self.start_battle()
-                case game.page_battle_auto:
-                    self.battle_wait(getattr(self.conf.general_battle, f'enable_{self.climb_type}_anti_detect',
-                                             False))
-                case game.page_battle_hand:
-                    self.ui_click_until_disappear(game.page_battle_hand.check_button)
+                case game.page_battle:
+                    self.battle_wait(getattr(self.conf.general_battle, f'enable_{self.climb_type}_anti_detect', False))
                 case _:
                     if self.check(Status.GOTO_ACT_FAILED):
                         logger.warning(f'Climb type[{self.climb_type}] goto failed')
@@ -157,7 +155,6 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         # 点击战斗前随机休息
         if self.conf.general_climb.random_sleep:
             random_sleep(probability=0.2)
-        logger.info("Click battle")
         click_times, max_times = 0, random.randint(2, 4)
         while 1:
             self.screenshot()
@@ -183,6 +180,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             # 点击挑战
             if self.ocr_appear_click(self.O_FIRE, interval=2):
                 click_times += 1
+                logger.info(f'Try click fire, remain times[{max_times - click_times}]')
                 continue
             if ((self.appear_then_click(self.I_C_CONFIRM1, interval=0.6) or
                  self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1) or
@@ -201,6 +199,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         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, 5
+        single_start_time = datetime.now()
         while 1:
             sleep(random.uniform(1, 1.5))
             self.screenshot()
@@ -216,21 +215,50 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 self.ui_click_until_smt_disappear(self.random_reward_click(click_now=False), self.I_FALSE, interval=1.5)
                 return False
             # 奖励界面
-            if self.ui_page_appear(game.page_reward):
+            if self.ui_page_appear(game.page_reward, interval=0.6):
                 logger.info(f'Battle success, try close reward page[{ok_cnt}]')
                 self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
                 ok_cnt += 1
                 continue
             # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
-            if ok_cnt > 0 and not self.ui_page_appear(game.page_battle_auto):
+            if ok_cnt > 0 and not self.is_in_battle(False):
                 self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
                 ok_cnt += 1
                 continue
+            # 单局到时间自动退出战斗
+            if ok_cnt == 0 and datetime.now() - single_start_time > self.conf.general_climb.get_single_limit_time(
+                    self.climb_type, timedelta(days=1)):
+                logger.attr(self.climb_type, 'Time limit arrived, close current battle')
+                self.exit_battle(skip_first=True)
+                ok_cnt += 1
+                continue
             # 战斗中随机滑动
             if ok_cnt == 0 and random_click_swipt_enable:
                 self.random_click_swipt()
         return True
 
+    def exit_battle(self, skip_first: bool = False) -> bool:
+        """
+        在战斗的时候强制退出战斗
+        :param skip_first: 是否跳过第一次截屏
+        :return: 退出战斗成功True or 失败False
+        """
+        timeout_timer = Timer(6).start()
+        exit_clicked = False
+        while not timeout_timer.reached():
+            self.maybe_screenshot(skip_first)
+            skip_first = False
+            # 不在战斗界面, 认为退出成功
+            if not self.is_in_battle(False):
+                return True
+            if exit_clicked:
+                self.appear_then_click(self.I_EXIT_ENSURE)
+            if not exit_clicked and self.appear_then_click(self.I_EXIT):
+                exit_clicked = True
+            sleep(random.uniform(0.5, 1.5))
+        # 还在战斗界面且超时则退出失败
+        return False
+
     def switch_soul(self, conf: SwitchSoulConfig):
         """
         根据当前爬塔类型自动切换御魂

+ 73 - 114
tasks/AreaBoss/script_task.py

@@ -45,11 +45,10 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.ui_get_current_page()
         self.ui_goto(page_area_boss)
 
-        self.open_filter()
         # 已挑战鬼王数量
         boss_fought = 0
         if con.boss_reward:
-            if self.fight_reward_boss(): #挑战成功则加一
+            if self.fight_reward_boss():  # 挑战成功则加一
                 boss_fought += 1
 
         self.open_filter()
@@ -260,125 +259,84 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
     def fight_reward_boss(self):
         BOSS_REWARD_PHOTO1 = [self.C_AB_BOSS_REWARD_PHOTO_1, self.C_AB_BOSS_REWARD_PHOTO_2, self.C_AB_BOSS_REWARD_PHOTO_3]
         BOSS_REWARD_PHOTO2 = [self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, self.C_AB_BOSS_REWARD_PHOTO_MINUS_1]
-        filter_statue, bossName = self.get_hot_in_reward() # 获取挑战人数最多的Boss的名字
-        if bossName == "direct_attack":
-            return self.boss_fight(self.I_BATTLE_1, True, fileter_open=False)
-        else:
-            if not filter_statue:
-                self.open_filter()
-            # 滑动到最顶层
-            logger.info("Swipe to top")
-            for i in range(random.randint(1, 3)):
-                self.swipe(self.S_AB_FILTER_DOWN)
-
-            for PHOTO in BOSS_REWARD_PHOTO1:
-                name = self.get_bossName(PHOTO)
-                if self.check_common_chars(str(name), bossName):
-                    return self.boss_fight(PHOTO, True, fileter_open=False)
-                else:
-                    self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-                    self.open_filter()
-            # 倒数一和二
-            for i in range(random.randint(1, 3)):
-                self.swipe(self.S_AB_FILTER_UP)
-            for PHOTO in BOSS_REWARD_PHOTO2:
-                name = self.get_bossName(PHOTO)
-                if self.check_common_chars(str(name), bossName):
-                    return self.boss_fight(PHOTO, True, fileter_open=False)
-                else:
-                    self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-                    self.open_filter()
+        need_open_filter, boss_name, photo = self.get_hot_in_reward()  # 获取挑战人数最多的Boss的名字
+        if photo is None or boss_name == '声望不够':
+            return False
+        logger.info(f'Select reward boss:{boss_name}')
+        # 不需要打开筛选界面说明直接找到了目标boss, 直接挑战
+        if not need_open_filter:
+            return self.boss_fight(photo, True, fileter_open=False)
+        self.open_filter()
+        # 滑动到最顶层
+        logger.info("Swipe to top")
+        for i in range(random.randint(1, 3)):
+            self.swipe(self.S_AB_FILTER_DOWN)
+        for PHOTO in BOSS_REWARD_PHOTO1:
+            if photo.name != PHOTO.name:
+                continue
+            name = self.get_bossName(PHOTO)
+            if self.check_common_chars(str(name), boss_name):
+                return self.boss_fight(PHOTO, True, fileter_open=False)
+        # 倒数一和二
+        for i in range(random.randint(1, 3)):
+            self.swipe(self.S_AB_FILTER_UP)
+        for PHOTO in BOSS_REWARD_PHOTO2:
+            if photo.name != PHOTO.name:
+                continue
+            name = self.get_bossName(PHOTO)
+            if self.check_common_chars(str(name), boss_name):
+                return self.boss_fight(PHOTO, True, fileter_open=False)
+        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
 
     def get_hot_in_reward(self):
         """
             返回挑战人数最多的悬赏鬼王
-        @return:    index
+        @return: 是否打开筛选界面, boss名称
         @rtype:
         """
         self.switch_to_reward()
-        lst = []
-        boosName = []
-        filter_open_flag = False
-        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
-        #如果num为0则不再进行nameOcr
-        if num:
-            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
-                logger.info("The number of challenges is enough")
-                return filter_open_flag, str("direct_attack")
-            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
-        else:
-            name = "声望不够"
-        lst.append(num)
-        boosName.append(name)
-        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-        #
-        self.open_filter()
-        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
-        if num:
-            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
-                logger.info("The number of challenges is enough")
-                return filter_open_flag, str("direct_attack")
-            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
-        else:
-            name = "声望不够"
-        boosName.append(name)
-        lst.append(num)
-        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-        #
-        self.open_filter()
-        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
-        if num:
-            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
-                logger.info("The number of challenges is enough")
-                return filter_open_flag, str("direct_attack")
-            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
-        else:
-            name = "声望不够"
-        boosName.append(name)
-        lst.append(num)
-        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-        #
-        self.open_filter()
-        for i in range(random.randint(1, 3)):
-            self.swipe(self.S_AB_FILTER_UP)
-        self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, wait_time=1)
-        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
-        if num:
-            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
-                logger.info("The number of challenges is enough")
-                return filter_open_flag, str("direct_attack")
-            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
-        else:
-            name = "声望不够"
-        boosName.append(name)
-        lst.append(num)
-        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-        #
-        self.open_filter()
-        for i in range(random.randint(1, 3)):
-            self.swipe(self.S_AB_FILTER_UP)
-        self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, wait_time=1)
-        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
-        if num:
-            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
-                logger.info("The number of challenges is enough")
-                return filter_open_flag, str("direct_attack")
-            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
-        else:
-            name = "声望不够"
-            filter_open_flag = True
-        boosName.append(name)
-        lst.append(num)
-        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-
-
-        index = 0
-        num = 0
-        for idx, val in enumerate(lst):
-            if val > num:
-                index = idx
-                num = val
-        return filter_open_flag, boosName[index]
+        boss_configs = [
+            {"photo": self.C_AB_BOSS_REWARD_PHOTO_1, "need_swipe": False},
+            {"photo": self.C_AB_BOSS_REWARD_PHOTO_2, "need_swipe": False},
+            {"photo": self.C_AB_BOSS_REWARD_PHOTO_3, "need_swipe": False},
+            {"photo": self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, "need_swipe": True},
+            {"photo": self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, "need_swipe": True},
+        ]
+
+        def check_boss(photo):
+            """检查boss是否满足条件"""
+            self.open_filter()
+            num = self.get_num_challenge(photo) or 0
+            if not num:
+                name = '声望不够'
+            else:
+                name = self.get_bossName(photo)
+                if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
+                    logger.info("The number of challenges is enough")
+                    return True, num, name
+            # 没找到满足的则关闭boss页面
+            self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+            return False, num, name
+
+        mx_challenge_boss_name = None
+        mx_challenge_num = 0
+        photo = None
+        # 遍历所有boss配置
+        for cfg in boss_configs:
+            if cfg["need_swipe"]:
+                self.open_filter()
+                for _ in range(random.randint(1, 3)):
+                    self.swipe(self.S_AB_FILTER_UP)
+                self.wait_until_appear(cfg["photo"], wait_time=1)
+            ret, challenge_num, boss_name = check_boss(cfg["photo"])
+            if ret:
+                return False, boss_name, cfg["photo"]
+            if challenge_num > mx_challenge_num:
+                mx_challenge_num = challenge_num
+                mx_challenge_boss_name = boss_name
+                photo = cfg['photo']
+        # 没有最优boss则找挑战人数最多的boss
+        return True, mx_challenge_boss_name if mx_challenge_boss_name else '声望不够', photo if mx_challenge_boss_name else None
 
     def get_num_challenge(self, click_area):
         """
@@ -442,6 +400,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         pass
 
     def open_filter(self):
+        """打开筛选界面"""
         logger.info("openFilter")
         self.ui_click(self.I_FILTER, self.I_AB_FILTER_OPENED, interval=3)
 

+ 19 - 0
tasks/Component/BaseActivity/config_activity.py

@@ -8,6 +8,7 @@ from enum import Enum
 from module.logger import logger
 
 from tasks.Component.config_base import ConfigBase, TimeDelta, Time
+from typing import Optional
 
 
 class ApMode(str, Enum):
@@ -17,6 +18,7 @@ class ApMode(str, Enum):
 
 class GeneralClimb(ConfigBase):
     limit_time: Time = Field(default=Time(minute=30), description='限制爬塔运行总时间')
+    boss_limit_time: Time = Field(default=Time(minute=5), description='boss单局限制时间')
     pass_limit: int = Field(default=50, description='门票爬塔的最大次数')
     ap_limit: int = Field(default=300, description='体力爬塔的最大次数')
     boss_limit: int = Field(default=20, description='boss战爬塔的最大次数')
@@ -46,6 +48,23 @@ class GeneralClimb(ConfigBase):
         self.valid_run_sequence()
         return [climb_type.strip() for climb_type in self.run_sequence.split(',')]
 
+    def get_single_limit_time(self, climb_type: str, default: timedelta = None) -> Optional[timedelta]:
+        """
+        获取单局限制时间
+        :param climb_type: 爬塔类型
+        :param default: 默认限制时间
+        :return: 单局限制时间 or default
+        """
+        if not climb_type:
+            return default
+        if getattr(self, f'{climb_type}_limit_time', None) is not None:
+            limit_time = getattr(self, f'{climb_type}_limit_time')
+            if isinstance(limit_time, time):
+                return timedelta(hours=limit_time.hour, minutes=limit_time.minute,
+                                 seconds=limit_time.second)
+            return limit_time
+        return default
+
     # @model_validator(mode='after')
     def valid_run_sequence(self):
         if not self.run_sequence or not self.run_sequence.strip():

+ 2 - 0
tasks/Component/Buy/assets.py

@@ -28,6 +28,8 @@ class BuyAssets:
 	I_BUY_SUB = RuleImage(roi_front=(467,429,50,48), roi_back=(452,412,85,147), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_sub.png")
 	# 出现用魂玉购买 
 	I_BUY_RMB = RuleImage(roi_front=(610,532,35,32), roi_back=(548,483,178,119), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_rmb.png")
+	# 购买成功 
+	I_BUY_SUCCESS = RuleImage(roi_front=(512,53,261,44), roi_back=(449,0,405,167), threshold=0.8, method="Template matching", file="./tasks/Component/Buy/buy/buy_buy_success.png")
 
 
 	# Ocr Rule Assets

+ 5 - 1
tasks/Component/Buy/buy.py

@@ -3,6 +3,7 @@
 # github https://github.com/runhey
 import time
 
+from tasks.GameUi.page import random_click
 from typing import Union
 
 from module.atom.image import RuleImage
@@ -53,6 +54,10 @@ class Buy(BaseTask, BuyAssets):
                         continue
                 return False
 
+            if self.appear(self.I_BUY_SUCCESS):
+                self.ui_click_until_smt_disappear(random_click(), self.I_BUY_SUCCESS, interval=0.8)
+                logger.info('Get reward success')
+                break
 
             if self.ui_reward_appear_click():
                 while 1:
@@ -71,7 +76,6 @@ class Buy(BaseTask, BuyAssets):
 
         return True
 
-
     def buy_more(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
                  number: int = None):
         """

BIN
tasks/Component/Buy/buy/buy_buy_success.png


+ 9 - 0
tasks/Component/Buy/buy/image.json

@@ -34,5 +34,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "出现用魂玉购买"
+  },
+  {
+    "itemName": "buy_success",
+    "imageName": "buy_buy_success.png",
+    "roiFront": "512,53,261,44",
+    "roiBack": "449,0,405,167",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "购买成功"
   }
 ]

+ 11 - 0
tasks/Component/GeneralBattle/general_battle.py

@@ -422,6 +422,7 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
     def is_in_battle(self, is_screenshot: bool = True) -> bool:
         """
         判断是否在战斗中
+        tip: 因为有friends判别, 所以即使在准备界面也会识别在战斗中
         :return:
         """
         if is_screenshot:
@@ -435,6 +436,16 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
         else:
             return False
 
+    def is_in_real_battle(self, is_screenshot: bool = True):
+        """
+        判断是否在真正的战斗中(不是战斗准备界面也不是战斗结束界面)
+        :param is_screenshot:
+        :return:
+        """
+        if is_screenshot:
+            self.screenshot()
+        return self.appear(self.I_BATTLE_INFO)
+
     def is_in_prepare(self, is_screenshot: bool = True) -> bool:
         """
         判断是否在准备中

+ 10 - 6
tasks/Component/ReplaceShikigami/assets.py

@@ -52,17 +52,17 @@ class ReplaceShikigamiAssets:
 	# description 
 	I_RS_NO_ADD = RuleImage(roi_front=(276,222,100,212), roi_back=(28,181,1232,293), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_no_add.png")
 	# 素材 
-	I_RS_MATERIAL = RuleImage(roi_front=(32,283,59,56), roi_back=(32,283,59,56), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material.png")
+	I_RS_MATERIAL = RuleImage(roi_front=(38,286,54,52), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material.png")
 	# description 
-	I_RS_N = RuleImage(roi_front=(138,299,57,59), roi_back=(138,299,57,59), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_n.png")
+	I_RS_N = RuleImage(roi_front=(129,298,47,49), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_n.png")
 	# description 
-	I_RS_R = RuleImage(roi_front=(230,344,64,61), roi_back=(230,344,64,61), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_r.png")
+	I_RS_R = RuleImage(roi_front=(209,335,48,47), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_r.png")
 	# description 
-	I_RS_SR = RuleImage(roi_front=(307,421,62,58), roi_back=(307,421,62,58), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png")
+	I_RS_SR = RuleImage(roi_front=(279,388,48,47), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png")
 	# description 
-	I_RS_SSR = RuleImage(roi_front=(354,517,63,58), roi_back=(354,517,63,58), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png")
+	I_RS_SSR = RuleImage(roi_front=(331,457,53,46), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png")
 	# description 
-	I_RS_SP = RuleImage(roi_front=(372,621,58,60), roi_back=(372,621,58,60), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png")
+	I_RS_SP = RuleImage(roi_front=(368,537,48,47), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png")
 	# description 
 	I_RS_MATERIAL_SELECTED = RuleImage(roi_front=(27,620,68,65), roi_back=(27,620,68,65), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_material_selected.png")
 	# description 
@@ -81,6 +81,10 @@ class ReplaceShikigamiAssets:
 	I_RS_LEVEL_MAX = RuleImage(roi_front=(487,248,23,21), roi_back=(52,238,1118,37), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_level_max.png")
 	# 智能放入 
 	I_RS_SMART_EXCHANGE = RuleImage(roi_front=(1150,507,40,44), roi_back=(1128,488,86,162), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_smart_exchange.png")
+	# description 
+	I_RS_UR = RuleImage(roi_front=(377,627,49,46), roi_back=(0,265,1072,454), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png")
+	# description 
+	I_RS_UR_SELECTED = RuleImage(roi_front=(36,620,54,58), roi_back=(14,601,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_ur_selected.png")
 
 
 	# Image Rule Assets

+ 12 - 8
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -34,13 +34,15 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
                           ShikigamiClass.R: self.I_RS_R_SELECTED,
                           ShikigamiClass.SR: self.I_RS_SR_SELECTED,
                           ShikigamiClass.SSR: self.I_RS_SSR_SELECTED,
-                          ShikigamiClass.SP: self.I_RS_SP_SELECTED}
+                          ShikigamiClass.SP: self.I_RS_SP_SELECTED,
+                          ShikigamiClass.UR: self.I_RS_UR_SELECTED}
         match_click = {ShikigamiClass.MATERIAL: self.I_RS_MATERIAL,
                        ShikigamiClass.N: self.I_RS_N,
                        ShikigamiClass.R: self.I_RS_R,
                        ShikigamiClass.SR: self.I_RS_SR,
                        ShikigamiClass.SSR: self.I_RS_SSR,
-                       ShikigamiClass.SP: self.I_RS_SP}
+                       ShikigamiClass.SP: self.I_RS_SP,
+                       ShikigamiClass.UR: self.I_RS_UR}
         check_selected = match_selected[shikigami_class]
         check_click = match_click[shikigami_class]
         # 选择式神的种类
@@ -49,7 +51,9 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
 
             if self.appear(check_selected):
                 break
-            if self.appear_then_click(check_click, interval=1):
+            if self.appear(check_click, interval=1):
+                if self.wait_until_pos_stable(check_click, stable_time=0.8, timeout=3):
+                    self.click(check_click)
                 continue
             if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3):
                 continue
@@ -125,10 +129,10 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
     def detect_no_shikigami(self) -> bool:
         self.screenshot()
         if self.appear(self.I_DETECT_EMPTY_1)\
-            and self.appear(self.I_DETECT_EMPTY_2) \
-                and self.appear(self.I_DETECT_EMPTY_3) \
-                and self.appear(self.I_DETECT_EMPTY_4) \
-                and self.appear(self.I_DETECT_EMPTY_5) \
-                and self.appear(self.I_DETECT_EMPTY_6):
+            or self.appear(self.I_DETECT_EMPTY_2) \
+                or self.appear(self.I_DETECT_EMPTY_3) \
+                or self.appear(self.I_DETECT_EMPTY_4) \
+                or self.appear(self.I_DETECT_EMPTY_5) \
+                or self.appear(self.I_DETECT_EMPTY_6):
             return True
         return False

+ 30 - 12
tasks/Component/ReplaceShikigami/rs/image.json

@@ -11,8 +11,8 @@
   {
     "itemName": "rs_material",
     "imageName": "rs_rs_material.png",
-    "roiFront": "32,283,59,56",
-    "roiBack": "32,283,59,56",
+    "roiFront": "38,286,54,52",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "素材"
@@ -20,8 +20,8 @@
   {
     "itemName": "rs_n",
     "imageName": "rs_rs_n.png",
-    "roiFront": "138,299,57,59",
-    "roiBack": "138,299,57,59",
+    "roiFront": "129,298,47,49",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "rs_r",
     "imageName": "rs_rs_r.png",
-    "roiFront": "230,344,64,61",
-    "roiBack": "230,344,64,61",
+    "roiFront": "209,335,48,47",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "rs_sr",
     "imageName": "rs_rs_sr.png",
-    "roiFront": "307,421,62,58",
-    "roiBack": "307,421,62,58",
+    "roiFront": "279,388,48,47",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -47,8 +47,8 @@
   {
     "itemName": "rs_ssr",
     "imageName": "rs_rs_ssr.png",
-    "roiFront": "354,517,63,58",
-    "roiBack": "354,517,63,58",
+    "roiFront": "331,457,53,46",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -56,8 +56,8 @@
   {
     "itemName": "rs_sp",
     "imageName": "rs_rs_sp.png",
-    "roiFront": "372,621,58,60",
-    "roiBack": "372,621,58,60",
+    "roiFront": "368,537,48,47",
+    "roiBack": "0,265,1072,454",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -142,5 +142,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "智能放入"
+  },
+  {
+    "itemName": "rs_ur",
+    "imageName": "rs_rs_ur.png",
+    "roiFront": "377,627,49,46",
+    "roiBack": "0,265,1072,454",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "rs_ur_selected",
+    "imageName": "rs_rs_ur_selected.png",
+    "roiFront": "36,620,54,58",
+    "roiBack": "14,601,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_material.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_n.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_r.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_sp.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_sr.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_ssr.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_ur.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_rs_ur_selected.png


+ 12 - 0
tasks/Dokan/assets.py

@@ -33,6 +33,12 @@ class DokanAssets:
 	C_DOKAN_BATTLE_QUIT_AREA = RuleClick(roi_front=(10,36,50,14), roi_back=(10,36,50,14), name="dokan_battle_quit_area")
 
 
+	# List Rule Assets
+	# 前往按钮列表
+	L_GOTO_CHEERING = RuleList(folder="./tasks/Dokan/res", direction="vertical", mode="ocr", roi_back=(950,172,54,324), size=(53, 62), 
+					 array=["前往"])
+
+
 	# Image Rule Assets
 	# 阴阳寮->神社的按钮 
 	I_RYOU_SHENSHE = RuleImage(roi_front=(850,660,100,60), roi_back=(850,660,100,60), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_shenshe.png")
@@ -150,6 +156,10 @@ class DokanAssets:
 	I_RYOU_DOKAN_DOKAN_QUIT = RuleImage(roi_front=(0,2,80,80), roi_back=(0,2,80,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_dokan_quit.png")
 	# 道馆攻破后夺得资金界面 
 	I_RYOU_DOKAN_SPOILS_OF_DOKAN = RuleImage(roi_front=(480,400,400,100), roi_back=(480,400,400,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_spoils_of_dokan.png")
+	# 助威可点击 
+	I_RYOU_DOKAN_CHEERING = RuleImage(roi_front=(65,601,71,33), roi_back=(44,568,112,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cheering.png")
+	# 助威灰色不可点击 
+	I_RYOU_DOKAN_CHEERING_GRAY = RuleImage(roi_front=(65,601,71,33), roi_back=(44,568,112,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cheering_gray.png")
 
 
 	# List Rule Assets
@@ -171,6 +181,8 @@ class DokanAssets:
 	O_DOKAN_RIGHTPAD_BOUNTY = RuleOcr(roi=(0,0,0,0), area=(0,0,0,0), mode="Single", method="Default", keyword="", name="dokan_rightpad_bounty")
 	# 查找道馆时,中间卡片上防守人数 
 	O_DOKAN_CENTER_PEOPLE_NUMBER = RuleOcr(roi=(0,0,0,0), area=(0,0,0,0), mode="Full", method="Default", keyword="", name="dokan_center_people_number")
+	# 道馆失败CD 
+	O_DOKEN_FAIL_CD = RuleOcr(roi=(1066,499,193,31), area=(1061,490,207,47), mode="Full", method="Default", keyword="", name="doken_fail_cd")
 
 
 	# Swipe Rule Assets

+ 13 - 0
tasks/Dokan/res/goto_list.json

@@ -0,0 +1,13 @@
+{
+  "name": "goto_cheering",
+  "direction": "vertical",
+  "type": "ocr",
+  "roiBack": "950,172,54,324",
+  "description": "前往按钮列表",
+  "list": [
+    {
+      "itemName": "前往",
+      "roiFront": "950,234,53,62"
+    }
+  ]
+}

+ 20 - 2
tasks/Dokan/res/image.json

@@ -516,9 +516,27 @@
     "itemName": "ryou_dokan_spoils_of_dokan",
     "imageName": "res_ryou_dokan_spoils_of_dokan.png",
     "roiFront": "480,400,400,100",
-    "roiBack":  "480,400,400,100",
+    "roiBack": "480,400,400,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "道馆攻破后夺得资金界面"
+  },
+  {
+    "itemName": "ryou_dokan_cheering",
+    "imageName": "res_ryou_dokan_cheering.png",
+    "roiFront": "65,601,71,33",
+    "roiBack": "44,568,112,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "助威可点击"
+  },
+  {
+    "itemName": "ryou_dokan_cheering_gray",
+    "imageName": "res_ryou_dokan_cheering_gray.png",
+    "roiFront": "65,601,71,33",
+    "roiBack": "44,568,112,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "助威灰色不可点击"
   }
-]
+]

+ 9 - 1
tasks/Dokan/res/ocr.json

@@ -44,7 +44,6 @@
     "keyword": "",
     "description": "查找道馆时,右侧边栏中的赏金"
   },
-
   {
     "itemName": "dokan_center_people_number",
     "roiFront": "0,0,0,0",
@@ -53,5 +52,14 @@
     "method": "Default",
     "keyword": "",
     "description": "查找道馆时,中间卡片上防守人数"
+  },
+  {
+    "itemName": "doken_fail_cd",
+    "roiFront": "1066,499,193,31",
+    "roiBack": "1061,490,207,47",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "道馆失败CD"
   }
 ]

+ 46 - 3
tasks/Dokan/script_task.py

@@ -32,7 +32,7 @@ from tasks.Dokan.dokan_scene import DokanScene, DokanSceneDetector
 from tasks.Dokan.ex_green_mark import ExtendGreenMark
 from tasks.Dokan.utils import detect_safe_area2
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_shikigami_records, page_guild, page_main
+from tasks.GameUi.page import page_shikigami_records, page_guild, page_main, random_click
 from tasks.Hyakkiyakou.utils.fast_device import FastDevice
 
 
@@ -770,8 +770,51 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
         return res_list
 
     def start_cheering(self):
-        # TODO 待实现
-        logger.info("start cheering")
+        cd_text = self.O_DOKEN_FAIL_CD.detect_text(self.device.image)
+        match = re.search(r'\d+', cd_text)
+        remain_seconds = int(match.group()) if match else None
+        if not remain_seconds:
+            logger.info(f'No remain seconds, exit cheering, cd_text[{cd_text}]')
+            return
+        cheering_timer = Timer(remain_seconds).start()
+        logger.info(f"start cheering, remain seconds:{remain_seconds}s")
+        while not cheering_timer.reached():
+            self.screenshot()
+            # 出现观战标志点击观战
+            if self.appear_then_click(self.I_RYOU_DOKAN_CD, interval=2.5):
+                sleep(1)  # 等待一下寮排名展示动画
+                continue
+            # 寻找前往按钮并点击
+            if self.list_appear_click(self.L_GOTO_CHEERING, interval=3, max_swipe=3):
+                break
+            # 没有找到前往(全军覆没or没人上)则随机点击其他位置关闭弹窗
+            self.click(random_click(), interval=5)
+        logger.info('Enter battle to cheer')
+        cheer_cnt = 0
+        self.device.stuck_record_add('PAUSE')
+        while not cheering_timer.reached():
+            self.screenshot()
+            # 道馆成员战斗成功或失败或馆主战结束出现排名, 交给上层处理
+            if self.appear(self.I_RYOU_DOKAN_WIN, interval=1) or self.appear(self.I_FALSE) or self.appear(self.I_RYOU_DOKAN_TOPPA_RANK):
+                self.click(random_click(), interval=1)
+                logger.info(f'Cheer finish, count[{cheer_cnt}]')
+                self.device.stuck_record_clear()
+                return
+            # 灰色助威
+            if self.is_in_battle(False) and self.appear(self.I_RYOU_DOKAN_CHEERING_GRAY, interval=1):
+                continue
+            # 亮色助威
+            if self.is_in_battle(False) and self.appear_then_click(self.I_RYOU_DOKAN_CHEERING, interval=1.5):
+                cheer_cnt += 1
+                logger.attr(cheer_cnt, f'cheer, count time[{cheering_timer.current():.1f}s]')
+                self.device.stuck_record_clear()
+                self.device.click_record_clear()
+                self.device.stuck_record_add('PAUSE')
+                continue
+            sleep(random.uniform(0.8, 1.6))
+        # 助威时间到了且道馆还未结束, 则退出观战交给上层重新挑战
+        self.exit_battle()
+        self.device.stuck_record_clear()
         return
 
     def update_remain_attack_count(self) -> int:

+ 3 - 3
tasks/Duel/script_task.py

@@ -364,7 +364,6 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, DuelAssets):
             if self.appear(self.I_D_PREPARE):
                 # 低段位有的准备
                 self.ui_click_until_disappear(self.I_D_PREPARE)
-                self.wait_until_disappear(self.I_D_PREPARE_DONE)
                 logger.info('Duel prepare')
                 break
             # 如果对方直接秒退,那自己就是赢的
@@ -373,12 +372,13 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, DuelAssets):
                 self.battle_win_copy = self.battle_win_count
                 self.battle_win_count += 1
                 return
-        timer = Timer(10)
+        timer = Timer(15)
         timer.start()
         while 1:
             if timer.reached():
                 break
-            if self.is_in_battle():
+            # 此处必须是真正战斗界面,否则低段位进去就是战斗界面会直接跳过该循环
+            if self.is_in_real_battle():
                 break
         while 1:
             self.screenshot()

+ 125 - 89
tasks/GameUi/game_ui.py

@@ -2,11 +2,16 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+
+import importlib
+from pathlib import Path
+
 from datetime import datetime
 from time import sleep
 
 import random
 from collections import deque
+from module.atom.click import RuleClick
 from module.atom.gif import RuleGif
 from module.atom.image import RuleImage
 from module.atom.list import RuleList
@@ -15,8 +20,9 @@ from module.base.decorator import run_once
 from module.base.timer import Timer
 from module.exception import (GameNotRunningError, GamePageUnknownError)
 from module.logger import logger
+from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
 from tasks.GameUi.assets import GameUiAssets
-from tasks.GameUi.page import *
+from tasks.GameUi.page import Page, PageRegistry, page_main, random_click
 from tasks.Restart.assets import RestartAssets
 from tasks.SixRealms.assets import SixRealmsAssets
 from tasks.base_task import BaseTask
@@ -25,34 +31,39 @@ from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 
 class GameUi(BaseTask, GameUiAssets):
     ui_current: Page = None
-    ui_pages = [
-        # 登录
-        page_login,
-        # 主页
-        page_main, page_summon, page_exploration, page_town,
-        # 探索的
-        page_awake_zones, page_soul_zones, page_realm_raid, page_goryou_realm, page_delegation,
-        page_secret_zones, page_area_boss, page_heian_kitan, page_six_gates, page_bondling_fairyland,
-        page_kekkai_toppa,
-        # 町中的
-        page_duel, page_demon_encounter, page_hunt, page_hunt_kirin, page_draft_duel, page_hyakkisen,
-        # 庭院里面的
-        page_shikigami_records, page_onmyodo, page_friends, page_daily, page_mall, page_guild, page_team,
-        page_collection, page_act_list,
-        # 爬塔活动
-        page_act_list_climb_act, page_climb_act, page_climb_act_2, page_climb_act_pass, page_climb_act_ap,
-        page_climb_act_boss, page_climb_act_buff, page_climb_act_ap100,
-        # 战斗
-        page_battle_auto, page_battle_hand, page_reward, page_failed
-    ]
     ui_close = [GameUiAssets.I_BACK_MALL, GeneralBattleAssets.I_CONFIRM,
-                BaseTask.I_UI_BACK_RED, BaseTask.I_UI_BACK_YELLOW, BaseTask.I_UI_BACK_BLUE,
+                BaseTask.I_UI_BACK_RED, BaseTask.I_UI_BACK_YELLOW,
                 GameUiAssets.I_BACK_FRIENDS, GameUiAssets.I_BACK_DAILY,
                 GameUiAssets.I_REALM_RAID_GOTO_EXPLORATION,
                 GameUiAssets.I_SIX_GATES_GOTO_EXPLORATION, SixRealmsAssets.I_EXIT_SIXREALMS,
-                ActivityShikigamiAssets.I_SKIP_BUTTON, ActivityShikigamiAssets.I_RED_EXIT,
+                ActivityShikigamiAssets.I_SKIP_BUTTON, ActivityShikigamiAssets.I_RED_EXIT, BaseTask.I_UI_BACK_BLUE,
                 ActivityShikigamiAssets.I_RED_EXIT_2]
 
+    def __init__(self, config, device):
+        super().__init__(config, device)
+        # 初始化时动态导入所有 page 模块
+        self._import_all_pages()
+
+    @staticmethod
+    def _import_all_pages():
+        """动态加载 tasks/**/page.py"""
+        base_dir = Path(__file__).resolve().parent.parent  # tasks 目录
+        for task_dir in base_dir.iterdir():
+            if not task_dir.is_dir():
+                continue
+            page_file = task_dir / "page.py"
+            if not page_file.exists():
+                continue
+            module_name = f"tasks.{task_dir.name}.page"
+            spec = importlib.util.spec_from_file_location(module_name, page_file)
+            if spec and spec.loader:
+                module = importlib.util.module_from_spec(spec)
+                spec.loader.exec_module(module)
+
+    @property
+    def ui_pages(self) -> list[Page]:
+        return PageRegistry.all()
+
     def home_explore(self) -> bool:
         """
         使用ocr识别到探索按钮并点击
@@ -81,35 +92,34 @@ class GameUi(BaseTask, GameUiAssets):
         logger.info(f'Click {self.I_HOME_SHIKIKAMI.name}')
         return True
 
-    def ui_page_appear(self, page: Page, skip_first_screenshot: bool = True, interval: float = random.uniform(0.5, 1)):
+    def ui_page_appear(self, page: Page, skip_first_screenshot: bool = True, interval: float = None):
         """
         判断当前页面是否为page
         """
-        if interval:
-            interval_timer = Timer(interval).start()
-            interval_timer.wait()
-        if not skip_first_screenshot:
-            self.screenshot()
+        self.maybe_screenshot(skip_first_screenshot)
         if isinstance(page.check_button, list):
             for button in page.check_button:
-                if self.appear(button):
+                if self.appear(button, interval):
                     return True
             return False
-        return self.appear(page.check_button)
+        return self.appear(page.check_button, interval)
 
-    def ui_wait_until_appear(self, page: Page, timeout: float = 3, interval: float = 0.5,
+    def ui_wait_until_appear(self, page: Page, timeout: float = 5, interval: float = 0.5,
                              skip_first_screenshot: bool = True) -> bool:
         """
         等待页面出现
+        :param page: 等待的页面
+        :param timeout: 超时时间
+        :param interval: 检查间隔时间
+        :param skip_first_screenshot:
+        :return: 页面出现返回True, 否则返回False
         """
         logger.info(f'Waiting for {page}')
         timeout_timer = Timer(timeout).start()
-        interval_timer = Timer(interval).start()
         while not timeout_timer.reached():
-            if self.ui_page_appear(page, skip_first_screenshot):
+            if self.ui_page_appear(page, skip_first_screenshot, interval=interval):
                 return True
             skip_first_screenshot = False
-            interval_timer.wait().reset()
         return False
 
     def ensure_scroll_open(self):
@@ -153,13 +163,9 @@ class GameUi(BaseTask, GameUiAssets):
 
         timeout = Timer(10, count=20).start()
         while 1:
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-                if not hasattr(self.device, "image") or self.device.image is None:
-                    self.screenshot()
-            else:
-                self.screenshot()
-            # 如果20S还没有到底,那么就抛出异常
+            self.maybe_screenshot(skip_first_screenshot)
+            skip_first_screenshot = False
+            # 如果10S还没有到底,那么就抛出异常
             if timeout.reached():
                 break
             # Known pages
@@ -169,14 +175,15 @@ class GameUi(BaseTask, GameUiAssets):
                 if self.ui_page_appear(page=page, interval=None):
                     logger.attr("UI", page.name)
                     self.ui_current = page
-                    if page == page_main and self.ensure_scroll_open():
-                        self.ui_click_until_disappear(RestartAssets.I_LOGIN_SCROOLL_CLOSE)
                     return page
             # Try to close unknown page
-            for close in self.ui_close:
-                if self.appear_then_click(close, interval=1.5):
-                    logger.info('Trying to switch to supported page')
-                    timeout = Timer(10, count=20).start()
+            if self.try_close_unknown_page():
+                timeout = Timer(10, count=20).start()
+            else:
+                # entirely unknown page, click safe random area
+                self.click(random_click(), interval=4)
+            # wait to ui
+            sleep(0.3)
             app_check()
             minicap_check()
             rotation_check()
@@ -231,7 +238,13 @@ class GameUi(BaseTask, GameUiAssets):
         sorted_paths = sorted(paths.items(), key=lambda kv: len(kv[1]))
         return sorted_paths
 
-    def ui_goto(self, destination: Page, confirm_wait=0, skip_first_screenshot=True, timeout: int = 60):
+    def ui_goto_page(self, dest_page: Page, confirm_wait=0, skip_first_screenshot=True, timeout: int = 60) -> bool:
+        """前往指定page, 自动调用获取当前页面方法, 其他参数同ui_goto
+        """
+        self.ui_get_current_page()
+        return self.ui_goto(dest_page, confirm_wait, skip_first_screenshot, timeout)
+
+    def ui_goto(self, destination: Page, confirm_wait=0, skip_first_screenshot=True, timeout: int = 60) -> bool:
         """
         Args:
             destination (Page):
@@ -247,36 +260,45 @@ class GameUi(BaseTask, GameUiAssets):
         # 构建路径映射
         path_dict = self.build_reverse_path_dict(destination)
 
+        found = False
         while not timeout_timer.reached():
-            # 已经在目标页面
-            if self.ui_page_appear(destination, skip_first_screenshot):
-                if confirm_timer.reached():
-                    logger.info(f'Page arrive: {destination}')
-                    return True
-                continue
-            skip_first_screenshot = False
-            # 尝试关闭未知页面
-            if close_unknown_timer.reached_and_reset():
-                logger.warning('Trying to switch to supported page')
-                for close in self.ui_close:
-                    if self.appear_then_click(close, interval=1.5):
-                        logger.info(f'[{close_unknown_timer.current():.1f}s]Click {close} on {self.ui_current} success')
+            if found:
+                confirm_timer.wait()
+                return True
             confirm_timer.reset()
             path = path_dict.get(self.ui_current, None)
             # 找不到路径则重新获取页面重试
             if not path:
                 self.ui_get_current_page(skip_first_screenshot)
                 continue
+            skip_first_screenshot = False
             logger.info(f"Current page: {self.ui_current}. Following shortest path:")
             show_paths: str = ' -> '.join([p.name for p in path])
             logger.info(f"{show_paths}")
             # 遍历路径
-            if self._execute_path(path, timeout_timer) and confirm_timer.reached():
-                return True
+            found = self._execute_path(path, timeout_timer)
+            if not found:
+                if close_unknown_timer.reached_and_reset():
+                    self.try_close_unknown_page(skip_screenshot=False)
+                    self.ui_current = None
         else:
             logger.error(f'Cannot goto page[{destination}], timeout[{timeout}s] reached')
         return False
 
+    def try_close_unknown_page(self, skip_screenshot: bool = True):
+        """
+        尝试关闭未知界面
+        :return: 执行了关闭返回True, 否则False
+        """
+        self.maybe_screenshot(skip_screenshot)
+        timer = Timer(None).start()
+        for close in self.ui_close:
+            if self.appear_then_click(close, interval=1.5):
+                logger.warning('Trying to switch to supported page')
+                logger.info(f'[{timer.current():.1f}s]Click {close} on {self.ui_current} success')
+                return True
+        return False
+
     def _execute_path(self, path: list, timeout_timer):
         """
         执行路径
@@ -284,18 +306,19 @@ class GameUi(BaseTask, GameUiAssets):
         :param timeout_timer: 超时定时器
         :return: currentPage==destinationPage
         """
-        for i in range(len(path) - 1):
-            current_page, next_page = path[i], path[i + 1]
+        for i, current_page in enumerate(path):
             if timeout_timer.reached():
                 return False
             # 当前页不等于路径中对应页, 尝试下一页
             if self.ui_current != current_page:
                 continue
-            # 执行附加操作
-            if current_page.additional:
-                for button in current_page.additional:
-                    if self.appear_then_operate(button, skip_first_screenshot=False, interval=random.uniform(0.4, 0.6)):
-                        logger.info(f'Page {current_page} additional {button} clicked')
+            self.run_additional(current_page, interval=0.6, skip_first_screenshot=False)
+            # 如果已经是最后一页,不再跳转
+            if i == len(path) - 1:
+                if len(path) == 1:
+                    logger.info(f'Page arrived {current_page}')
+                break
+            next_page = path[i + 1]
             logger.info(f'Page switch: {current_page} -> {next_page}')
             # 获取页面跳转操作
             button = current_page.links.get(next_page)
@@ -303,14 +326,14 @@ class GameUi(BaseTask, GameUiAssets):
                 logger.warning(f"No link from {current_page} to {next_page}")
                 continue
             # 跳转页面
-            max_wait_timer = Timer(5).start()
+            max_wait_timer = Timer(6).start()
             while not max_wait_timer.reached():
                 if timeout_timer.reached():
                     return False
-                if self.appear_then_operate(button, skip_first_screenshot=False):
+                if self.appear_then_operate(button, interval=0.8, skip_first_screenshot=False):
                     break
                 logger.warning(f"[{max_wait_timer.current():.1f}s]Failed click {button} on {current_page}, retry...")
-                sleep(0.3)
+                sleep(0.8)
             else:
                 self.ui_get_current_page(skip_first_screenshot=False)
                 # 当前页面不是对应路径的页面, 则尝试下一个页面
@@ -320,8 +343,7 @@ class GameUi(BaseTask, GameUiAssets):
             while not max_wait_timer.reached():
                 if timeout_timer.reached():
                     return False
-                if self.ui_wait_until_appear(next_page, timeout=1.5, interval=random.uniform(0.4, 0.8),
-                                             skip_first_screenshot=False):
+                if self.ui_wait_until_appear(next_page, timeout=2.5, skip_first_screenshot=False):
                     logger.info(f'[{max_wait_timer.current():.1f}s]Page arrived {next_page}')
                     self.ui_current = next_page
                     break
@@ -330,21 +352,35 @@ class GameUi(BaseTask, GameUiAssets):
                 self.ui_get_current_page(skip_first_screenshot=False)
         return self.ui_current == path[-1]
 
+    def run_additional(self, page: Page, interval: float = None, skip_first_screenshot: bool = True):
+        """执行页面附加操作"""
+        if not page.additional:
+            return
+        for btn in page.additional:
+            if self.appear_then_operate(btn, interval=interval, skip_first_screenshot=skip_first_screenshot):
+                logger.info(f'Page {page} additional {btn} clicked')
+                skip_first_screenshot = False
+
     def appear_then_operate(self, target: RuleList | RuleImage | RuleGif | RuleOcr | RuleClick,
-                            interval: float = random.uniform(0.6, 1.2), skip_first_screenshot: bool = True):
-        self.ui_button_interval_reset(target)
-        interval_timer = Timer(interval).start()
-        interval_timer.wait()
-        if not skip_first_screenshot:
-            self.screenshot()
+                            interval: float = None, skip_first_screenshot: bool = True):
+        """
+        出现对应目标执行操作(点击图像, 滑动列表至array第一个元素并点击, 点击OCR, 点击)
+        :param target: 目标
+        :param interval: 间隔
+        :param skip_first_screenshot: 是否跳过首次截图
+        :return: 是否成功操作
+        """
+        self.maybe_screenshot(skip_first_screenshot)
+        operated = False
         if isinstance(target, RuleList):
-            return self.list_appear_click(target)
-        if isinstance(target, (RuleImage, RuleGif)):
-            return self.appear_then_click(target)
-        if isinstance(target, RuleOcr):
-            return self.ocr_appear_click(target)
-        if isinstance(target, RuleClick):
-            return self.click(target)
+            operated = self.list_appear_click(target, interval=interval)
+        elif isinstance(target, (RuleImage, RuleGif)):
+            operated = self.appear_then_click(target, interval=interval)
+        elif isinstance(target, RuleOcr):
+            operated = self.ocr_appear_click(target, interval=interval)
+        elif isinstance(target, RuleClick):
+            operated = self.click(target, interval=interval)
+        return operated
 
     # ------------------------------------------------------------------------------------------------------------------
     # 下面的这些是一些特殊的页面,需要额外处理

+ 20 - 57
tasks/GameUi/page.py

@@ -2,13 +2,26 @@ import random
 
 import traceback
 from module.atom.click import RuleClick
-
+from tasks.GlobalGame.assets import GlobalGameAssets as GGA
 from tasks.GameUi.assets import GameUiAssets as G
+from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
 from tasks.Restart.assets import RestartAssets
 from tasks.base_task import BaseTask as BT
 from tasks.RyouToppa.assets import RyouToppaAssets
 
 
+class PageRegistry:
+    _registry = []
+
+    @classmethod
+    def register(cls, page):
+        cls._registry.append(page)
+
+    @classmethod
+    def all(cls):
+        return list(cls._registry)
+
+
 class Page:
     def __init__(self, check_button, links=None):
         if links is None:
@@ -18,6 +31,7 @@ class Page:
         self.additional: list = None  # 附加按钮或者是ocr检测按钮
         (filename, line_number, function_name, text) = traceback.extract_stack()[-2]
         self.name = text[:text.find('=')].strip()
+        PageRegistry.register(self)
 
     def __eq__(self, other):
         return self.name == other.name
@@ -51,10 +65,6 @@ page_town = Page(G.I_CHECK_TOWN)
 page_town.link(button=G.I_TOWN_GOTO_MAIN, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_TOWN, destination=page_town)
 
-# Unknown
-# page_unknown = Page(None)
-# page_unknown.link(button=G.I_CHECK_MAIN, destination=page_main)
-
 # ************************************* 探索部分 *****************************************#
 # 觉醒 awake zones
 page_awake_zones = Page(G.I_CHECK_AWAKE)
@@ -132,7 +142,6 @@ page_hyakkiyakou = Page(G.I_CHECK_KYAKKIYAKOU)
 page_hyakkiyakou.link(button=G.I_HYAKKIYAKOU_CLOSE, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_HYAKKIYAKOU, destination=page_hyakkiyakou)
 
-
 # ************************************* 庭院部分 *****************************************#
 # 式神录 shikigami_records
 page_shikigami_records = Page(G.I_CHECK_RECORDS)
@@ -161,6 +170,7 @@ page_mall.link(button=G.I_BACK_BLUE, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_MALL, destination=page_mall)
 # 阴阳寮 guild
 page_guild = Page(G.I_CHECK_GUILD)
+page_guild.additional = [KekkaiUtilizeAssets.I_PLANT_TREE_CLOSE]
 page_guild.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_GUILD, destination=page_guild)
 # 组队 team
@@ -191,58 +201,15 @@ page_dokan.link(button=G.I_BACK_Y, destination=page_main)
 
 # ************************************* 活动部分 *****************************************#
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets as asa
-from tasks.GlobalGame.assets import GlobalGameAssets as gga
 
 # 活动列表页爬塔活动
 page_act_list_climb_act = Page(asa.I_CHECK_ACT_LIST_CLIMB_ACT)
 page_act_list.link(button=G.L_ACT_LIST_OCR, destination=page_act_list_climb_act)
 page_act_list_climb_act.link(button=G.I_BACK_ACT_LIST, destination=page_main)
-# 爬塔活动界面
-page_climb_act = Page(asa.I_BATTLE)
-page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT, asa.I_RED_EXIT_2]
-page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
-page_act_list_climb_act.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
-# 爬塔活动副界面
-page_climb_act_2 = Page(asa.I_CHECK_BATTLE_2)
-page_climb_act_2.additional = [asa.I_ACT_MAP_SWITCH, asa.I_PASS_ACT_LOCAT, asa.I_SKIP_BUTTON, asa.I_RED_EXIT,
-                               asa.I_RED_EXIT_2]
-page_climb_act_2.link(button=G.I_BACK_BATTLE, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BATTLE, destination=page_climb_act_2)
-# 门票爬塔活动界面
-page_climb_act_pass = Page(asa.I_AP_ACTIVITY)
-page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT, ]
-page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-page_climb_act_2.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
-# 体力爬塔活动界面
-page_climb_act_ap = Page(asa.I_AP)
-page_climb_act_ap.additional = [asa.O_ENTRY_ACTIVITY, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD,
-                                asa.I_RED_EXIT]
-page_climb_act_ap.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap)
-# 体力, 门票互相跳转
-# page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
-# page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
-# 100体爬塔活动界面
-page_climb_act_ap100 = Page(asa.I_CHECK_AP100)
-page_climb_act_2.link(button=asa.O_ENTER_AP100, destination=page_climb_act_ap100)
-page_climb_act_ap100.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-# 爬塔活动boss战界面
-page_climb_act_boss = Page(asa.I_CHECK_BOSS)
-page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
-page_climb_act_boss.link(button=G.I_BACK_Y, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BOSS, destination=page_climb_act_boss)
-# 爬塔活动加成界面
-page_climb_act_buff = Page(asa.I_CHECK_BUFF)
-page_climb_act_buff.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
-page_climb_act_buff.link(button=G.I_BACK_Y, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BUFF_CHANGE_BUTTON, destination=page_climb_act_buff)
 
 # ************************************* 战斗部分 *****************************************#
 # 战斗界面
-page_battle_auto = Page(G.O_BATTLE_AUTO)
-page_battle_hand = Page(G.O_BATTLE_HAND)
-page_battle_auto.link(button=G.O_BATTLE_AUTO, destination=page_battle_hand)
-page_battle_hand.link(button=G.O_BATTLE_HAND, destination=page_battle_auto)
+page_battle = Page(GeneralBattleAssets.I_BATTLE_INFO)
 
 
 def random_click(low: int = None, high: int = None) -> RuleClick | list[RuleClick]:
@@ -251,7 +218,7 @@ def random_click(low: int = None, high: int = None) -> RuleClick | list[RuleClic
     :return: RuleClick或者RuleClick的数组
     """
     click = random.choice([asa.C_RANDOM_LEFT, asa.C_RANDOM_RIGHT, asa.C_RANDOM_TOP])
-    click.name = "BATTLE_RANDOM"
+    click.name = "SAFE_RANDOM_CLICK"
     if low is None or high is None:
         return click
     return [click for _ in range(random.randint(low, high))]
@@ -262,12 +229,8 @@ page_reward = Page(check_button=[GeneralBattleAssets.I_REWARD_PURPLE_SNAKE_SKIN,
                                  GeneralBattleAssets.I_REWARD_EXP_SOUL_4, GeneralBattleAssets.I_WIN,
                                  GeneralBattleAssets.I_REWARD_GOLD, GeneralBattleAssets.I_REWARD_GOLD_SNAKE_SKIN,
                                  GeneralBattleAssets.I_REWARD_SOUL_5, GeneralBattleAssets.I_REWARD_SOUL_6,
-                                 gga.I_UI_REWARD, ],
-                   links={page_climb_act_pass: random_click(), page_climb_act_ap: random_click(),
-                          page_area_boss: random_click()})
+                                 GGA.I_UI_REWARD, ])
 page_reward.additional = [random_click()]
 # 失败界面
-page_failed = Page(check_button=GeneralBattleAssets.I_FALSE,
-                   links={page_climb_act_pass: random_click(), page_climb_act_ap: random_click(),
-                          page_area_boss: random_click()})
+page_failed = Page(GeneralBattleAssets.I_FALSE)
 page_failed.additional = [random_click()]

+ 10 - 1
tasks/Hunt/config.py

@@ -3,21 +3,30 @@
 # github https://github.com/runhey
 from datetime import timedelta
 from pydantic import BaseModel, Field
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, Time
+from tasks.Component.config_base import ConfigBase, Time, dynamic_hide
+
 
 class HuntTime(ConfigBase):
     # 自定义运行时间
     kirin_time: Time = Field(default=Time(hour=19, minute=0, second=0))
     netherworld_time: Time = Field(default=Time(hour=19, minute=0, second=0))
 
+
 class HuntConfig(BaseModel):
     kirin_group_team: str = Field(default='-1,-1', description='switch_group_team_help')
     netherworld_group_team: str = Field(default='-1,-1')
 
 
+class HuntGeneralBattleConfig(GeneralBattleConfig):
+    hide_fields = dynamic_hide('lock_team_enable', 'green_enable', 'green_mark')
+
+
 class Hunt(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     hunt_time: HuntTime = Field(default_factory=HuntTime)
     hunt_config: HuntConfig = Field(default_factory=HuntConfig)
+    kirin_battle_config: HuntGeneralBattleConfig = Field(default_factory=HuntGeneralBattleConfig)
+    netherworld_battle_config: HuntGeneralBattleConfig = Field(default_factory=HuntGeneralBattleConfig)

+ 7 - 10
tasks/Hunt/script_task.py

@@ -17,6 +17,7 @@ from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Hunt.assets import HuntAssets
 
+
 class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
     kirin_day = True  # 不是麒麟就是阴界之门
     tomorrow_kirin_day = True  # 明天是麒麟还是阴界之门
@@ -117,8 +118,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 self.ui_click_until_disappear(self.I_UI_BACK_YELLOW)
                 return
         logger.info('Start battle')
-        self.run_general_battle()        
-
+        self.run_general_battle(self.config.hunt.kirin_battle_config)
 
     def netherworld(self):
         logger.hr('netherworld', 2)
@@ -143,8 +143,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 self.ui_click_until_disappear(self.I_UI_BACK_RED)
                 return
         logger.info('Start battle')
-        self.run_general_battle()
-
+        self.run_general_battle(self.config.hunt.netherworld_battle_config)
 
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
         """
@@ -175,6 +174,10 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 logger.info("Battle result is false")
                 self.ui_click_until_disappear(self.I_FALSE)
                 return False
+            if self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=1.5):
+                logger.info('Netherworld click prepare after maybe failed')
+                self.device.stuck_record_add('BATTLE_STATUS_S')
+                continue
             # 如果三分钟还没打完,再延长五分钟
             if stuck_timer and stuck_timer.reached():
                 stuck_timer = None
@@ -182,12 +185,6 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 self.device.stuck_record_add('BATTLE_STATUS_S')
 
 
-
-
-
-
-
-
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device

+ 2 - 4
tasks/RichMan/mall/medal.py

@@ -37,9 +37,8 @@ class Medal(FriendshipPoints):
                               money_ocr=self.O_MALL_RESOURCE_3, buy_money=120)
         # 随机御魂
         if con.random_soul:
-            pass
-            # self.buy_mall_one(buy_button=self.I_ME_SOULS, buy_check=self.I_ME_CHECK_SOULS,
-            #                   money_ocr=self.O_MALL_RESOURCE_5, buy_money=320)
+            self.buy_mall_one(buy_button=self.I_ME_SOULS, buy_check=self.I_ME_CHECK_SOULS,
+                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=320)
         # 两颗白蛋
         if con.white_daruma:
             self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,
@@ -62,7 +61,6 @@ class Medal(FriendshipPoints):
         time.sleep(1)
 
 
-
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device

+ 0 - 11
tasks/RichMan/script_task.py

@@ -34,17 +34,6 @@ class ScriptTask(Mall, Guild, ThousandThings, Shrine):
         raise TaskEnd('RichMan')
 
 
-
-
-
-
-
-
-
-
-
-
-
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device

+ 1 - 0
tasks/Utils/config_enum.py

@@ -4,6 +4,7 @@
 from enum import Enum
 
 class ShikigamiClass(str, Enum):
+    UR = 'UR'
     SP = 'SP'
     SSR = 'SSR'
     SR = 'SR'

+ 4 - 0
tasks/WeeklyTrifles/assets.py

@@ -35,6 +35,8 @@ class WeeklyTriflesAssets:
 	I_BM_CONFIRM = RuleImage(roi_front=(418,620,173,59), roi_back=(418,620,173,59), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_confirm.png")
 	# 再次召唤 
 	I_BM_AGAIN = RuleImage(roi_front=(686,617,178,60), roi_back=(686,617,178,60), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_again.png")
+	# 破碎符咒召唤次数选择标志 
+	I_BMT_CHECK = RuleImage(roi_front=(742,571,32,33), roi_back=(644,565,276,41), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bmt_check.png")
 
 
 	# Ocr Rule Assets
@@ -42,6 +44,8 @@ class WeeklyTriflesAssets:
 	O_BA_AMOUNT_1 = RuleOcr(roi=(535,11,124,36), area=(535,11,124,36), mode="Digit", method="Default", keyword="", name="ba_amount_1")
 	# 召唤的时候的数量 
 	O_BA_AMOUNT_2 = RuleOcr(roi=(762,570,125,35), area=(762,570,125,35), mode="DigitCounter", method="Default", keyword="", name="ba_amount_2")
+	# 破碎符咒召唤次数 
+	O_BA_TIMES = RuleOcr(roi=(741,564,174,44), area=(641,566,278,41), mode="Full", method="Default", keyword="", name="ba_times")
 
 
 	# Click Rule Assets

BIN
tasks/WeeklyTrifles/broken_amulet/broken_amulet_bmt_check.png


+ 9 - 0
tasks/WeeklyTrifles/broken_amulet/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "再次召唤"
+  },
+  {
+    "itemName": "bmt_check",
+    "imageName": "broken_amulet_bmt_check.png",
+    "roiFront": "742,571,32,33",
+    "roiBack": "644,565,276,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "破碎符咒召唤次数选择标志"
   }
 ]

+ 9 - 0
tasks/WeeklyTrifles/broken_amulet/ocr.json

@@ -16,5 +16,14 @@
     "method": "Default",
     "keyword": "",
     "description": "召唤的时候的数量"
+  },
+  {
+    "itemName": "ba_times",
+    "roiFront": "741,564,174,44",
+    "roiBack": "641,566,278,41",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "破碎符咒召唤次数"
   }
 ]

+ 51 - 39
tasks/WeeklyTrifles/script_task.py

@@ -2,13 +2,14 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+from time import sleep
 
 from module.exception import TaskEnd
 from module.logger import logger
 from module.base.timer import Timer
 
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_collection, page_area_boss, page_secret_zones, page_summon
+from tasks.GameUi.page import page_main, page_collection, page_area_boss, page_secret_zones, page_summon, random_click
 from tasks.WeeklyTrifles.config import Trifles
 from tasks.WeeklyTrifles.assets import WeeklyTriflesAssets
 
@@ -203,14 +204,14 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         # 返回
         self.ui_click(self.I_UI_BACK_BLUE, self.I_CHECK_MAIN)
 
-    def _broken_amulet(self, num: int):
+    def _broken_amulet(self, dest_num: int):
         """
 
-        :param num:
+        :param dest_num:
         :return:
         """
-        def click_confirm():
-            self.wait_until_appear(self.I_BM_CONFIRM)
+        def exit_amulet():
+            self.wait_until_appear(self.I_BM_CONFIRM, wait_time=3)
             while 1:
                 self.screenshot()
                 if not self.appear(self.I_BM_CONFIRM):
@@ -223,47 +224,58 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         self.ui_get_current_page()
         self.ui_goto(page_summon)
         self.screenshot()
-        number = self.O_BA_AMOUNT_1.ocr(self.device.image)
-        if number == 0:
+        real_num = self.O_BA_AMOUNT_1.ocr(self.device.image)
+        if real_num <= 0:
             logger.warning('No broken amulet')
             return
-        logger.info(f'Broken amulet: {number}')
+        logger.info(f'Broken amulet: {real_num}')
         count = 0
         self.wait_until_appear(self.I_BM_ENTER)
-        while 1:
-            self.screenshot()
-            if not self.appear(self.I_BM_ENTER):
-                break
-            if self.appear_then_click(self.I_BM_ENTER, interval=1):
-                continue
-        count += 10
         logger.info('Enter broken amulet')
-        while 1:
+        while count < dest_num:
             self.screenshot()
-            time.sleep(0.5)
-
-            if not self.appear(self.I_BM_CONFIRM):
-                continue
-            if count >= num:
-                logger.info(f'Broken amulet finished: {count}')
-                click_confirm()
-                break
-            cu, re, total = self.O_BA_AMOUNT_2.ocr(self.device.image)
-            if cu <= 10 and total == 10:
-                logger.info(f'Broken amulet count: {count}. Current: {cu}. Total: {total}')
-                click_confirm()
-                break
-            if self.appear_then_click(self.I_BM_AGAIN, interval=1):
-                logger.info(f'Broken amulet count: {count}. Current: {cu}')
+            real_num = self.O_BA_AMOUNT_1.ocr(self.device.image)
+            if real_num <= 0:
+                exit_amulet()
+                return
+            if self.appear_then_click(self.I_BM_ENTER, interval=1) or self.appear_then_click(self.I_BM_AGAIN, interval=1):
+                sleep(0.4)  # 等待动画开始
+                timeout_timer = Timer(5).start()
+                # 随机点击直到再次召唤出现或者超时
+                while not timeout_timer.reached():
+                    if not self.click(random_click(), interval=0.8):
+                        continue
+                    self.screenshot()
+                    if self.appear(self.I_BM_AGAIN, interval=0.8):
+                        break
+                else:
+                    logger.warning(f'Wait for again timeout:Count[{count}], Remain[{real_num}]')
+                    exit_amulet()
+                    return
+            else:
+                # 既没有出现召唤破碎符咒也没有出现再次召唤, 则退出(一般不会出现这种情况, 只是为了异常处理)
+                exit_amulet()
+                return
+            x_10, _, _, _ = self.O_BA_TIMES.ocr(self.device.image, '10次')
+            x_50, _, _, _ = self.O_BA_TIMES.ocr(self.device.image, '50次')
+            self.I_BMT_CHECK.match(self.device.image)
+            x_check, y_check, width_check, height_check = self.I_BMT_CHECK.roi_front
+            selected_10 = min(abs(x_10 - x_check), abs(x_50 - x_check)) == abs(x_10 - x_check)
+            logger.info(f'Current selected {"10" if selected_10 else "50"} amulet')
+            count += 10 if selected_10 else 50
+            logger.info(f'Broken amulet:Count[{count}], Remain[{real_num}]')
+            # 一次50票不超过限制且当前选择的是10票则切换50票
+            if count + 50 < dest_num and selected_10:
+                logger.hr('Switch to 50 amulet')
+                self.device.click(x=x_50 - width_check // 2, y=y_check + height_check // 2, control_name='Click_50')
                 self.device.click_record_clear()
-                count += 10
-                continue
-
-
-
-
-
-
+            # 一次50票会超过限制且当前选择的是50票则切换10票
+            if count + 50 >= dest_num and not selected_10:
+                logger.hr('Switch to 10 amulet')
+                self.device.click(x=x_10 - width_check // 2, y=y_check + height_check // 2, control_name='Click_10')
+                self.device.click_record_clear()
+        # 正常结束且还有票, 则执行一次退出
+        exit_amulet()
 
 
 if __name__ == '__main__':

+ 90 - 16
tasks/base_task.py

@@ -2,7 +2,7 @@
 # @author runhey
 # github https://github.com/runhey
 
-from time import sleep
+from time import sleep, time
 
 import random
 from datetime import datetime, timedelta
@@ -136,6 +136,23 @@ class BaseTask(GlobalGameAssets, CostumeBase):
 
         return self.device.image
 
+    def maybe_screenshot(self, soft_skip: bool = False):
+        """
+        可能截图
+        :param soft_skip: True跳过截图(但保证设备一定有图才跳过,否则依然截图)
+        :return:
+        """
+        if not soft_skip or not self.exist_image():
+            return self.screenshot()
+        return self.device.image
+
+    def exist_image(self) -> bool:
+        """
+        判断当前设备是否有图片
+        :return: 有返回True,没有返回False
+        """
+        return hasattr(self.device, 'image') and self.device.image is not None
+
     def appear(self,
                target: RuleImage | RuleGif | RuleOcr,
                interval: float = None,
@@ -145,7 +162,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         :param target: 匹配的目标可以是RuleImage, 也可以是RuleOcr
         :param interval:
         :param threshold:
-        :return:
+        :return: interval时间到达且匹配成功则返回True, 否则False
         """
         if interval:
             if target.name in self.interval_timer:
@@ -256,6 +273,48 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             if not self.appear(target):
                 break
 
+    def wait_until_pos_stable(self, target: RuleImage, stable_time: float = 0.3, timeout: float = 2,
+                              threshold: float = None, skip_first_screenshot: bool = True) -> bool:
+        """
+        等待直到在同一位置稳定出现
+        :param skip_first_screenshot:
+        :param threshold: target匹配阈值
+        :param target: 目标图像
+        :param stable_time: 判断是否稳定的时间
+        :param timeout: 等待稳定的超时时间
+        :return: timer时间内稳定出现则返回True, 否则False
+        """
+        logger.info(f'Wait until {target.name} position stable')
+        timeout_timer = Timer(timeout).start()
+        stable_timer = Timer(stable_time).start()
+        pre_roi_front, cur_roi_front = None, None
+        origin_roi_back = target.roi_back
+        while not timeout_timer.reached():
+            self.maybe_screenshot(skip_first_screenshot)
+            skip_first_screenshot = False
+            # 当前页面能够匹配到target
+            if target.match(self.device.image, threshold=threshold):
+                cur_roi_front = target.roi_front
+                logger.info(f'Current:{cur_roi_front}, pre:{pre_roi_front}')
+                target.roi_back = pre_roi_front
+                # 上一次匹配到的位置还能匹配到target
+                if pre_roi_front is not None and target.match(self.device.image, threshold=threshold):
+                    # 到达稳定时间
+                    if stable_timer.reached():
+                        logger.info(f'{target.name} position has stabilized')
+                        target.roi_back = origin_roi_back
+                        return True
+                else:
+                    stable_timer.reset()  # 上一次匹配到的位置这次匹配不到了, 重置定时器
+            else:
+                stable_timer.reset()  # 当前页面都匹配不到, 重置定时器
+            # 记录这一次的target位置
+            pre_roi_front = cur_roi_front
+            # 还原target的匹配区域
+            target.roi_back = origin_roi_back
+        logger.warning(f'Wait until pos stable({target}) timeout')
+        return False
+
     def wait_until_stable(self,
                           target: RuleImage,
                           timer=Timer(0.3, count=1),
@@ -355,12 +414,12 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             # logger.info(f'Swipe {swipe.name}')
             self.interval_timer[swipe.name].reset()
 
-    def click(self, click: Union[RuleClick, RuleLongClick] = None, interval: float = None) -> bool:
+    def click(self, click: Union[RuleClick, RuleLongClick, RuleImage, RuleOcr] = None, interval: float = None) -> bool:
         """
         点击或者长按
         :param interval:
         :param click:
-        :return:
+        :return: 返回值不是click是否成功,而是interval是否设置以及是否到时间
         """
         if not click:
             return False
@@ -460,11 +519,12 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             self.device.click(x=x, y=y, control_name=target.name)
         return True
 
-    def list_find(self, target: RuleList, name: str | list[str]) -> bool | tuple:
+    def list_find(self, target: RuleList, name: str | list[str], max_swipe: int = 10) -> bool | tuple:
         """
         会一致在列表寻找目标,找到了就退出。
         如果是图片列表会一直往下找
         如果是纯文字的,会自动识别自己的位置,根据位置选择向前还是向后翻
+        :param max_swipe: 最大滑动次数
         :param target:
         :param name:
         :return:
@@ -474,33 +534,47 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         result = None
         if not target:
             return False
-        while True:
+        appear = False
+        for _ in range(max_swipe):
             self.screenshot()
             if target.is_image:
                 result = target.image_appear(self.device.image, name=name)
                 swipe_down = True
             elif target.is_ocr:
                 result = target.ocr_appear(self.device.image, name=name)
-                swipe_down = isinstance(result, int) and result > 0
+                swipe_down = result is not None and isinstance(result, int) and result > 0
                 swipe_distance_ratio = 1
-            if not result:
-                return False
-            if isinstance(result, tuple):
-                return result
+            # 结果是坐标证明找到了, 非坐标都是没找到
+            if result is not None and isinstance(result, tuple):
+                appear = True
+                break
             if swipe_distance_ratio:
                 x1, y1, x2, y2 = target.swipe_pos(number=swipe_distance_ratio, after=swipe_down)
             else:
                 x1, y1, x2, y2 = target.swipe_pos(after=swipe_down)
             self.device.swipe(p1=(x1, y1), p2=(x2, y2))
             sleep(random.uniform(0.8, 1.3))  # 等待滑动完成, 待优化
+        if appear:
+            return result
+        return False
 
-    def list_appear_click(self, target: RuleList) -> bool:
-        appear = self.list_find(target, name=target.array[0])
-        if not appear:
-            return False
-        if isinstance(appear, tuple):
+    def list_appear_click(self, target: RuleList, interval: float = None, max_swipe: int = 10) -> bool:
+        if interval:
+            if target.name in self.interval_timer:
+                # 如果传入的限制时间不一样,则替换限制新的传入的时间
+                if self.interval_timer[target.name].limit != interval:
+                    self.interval_timer[target.name] = Timer(interval)
+            else:
+                # 如果没有限制时间,则创建限制时间
+                self.interval_timer[target.name] = Timer(interval)
+            # 如果时间还没到达,则不执行
+            if not self.interval_timer[target.name].reached():
+                return False
+        appear = self.list_find(target, name=target.array[0], max_swipe=max_swipe)
+        if isinstance(appear, tuple) and interval:
             x, y = appear
             self.device.click(x, y)
+            self.interval_timer[target.name].reset()
             return True
         return False