Bläddra i källkod

fix(GameUI): fix page and improve page switching speed, add act boss single battle limit time

Azure 1 år sedan
förälder
incheckning
7c47d25770

+ 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:
         """
         返回滑动的起始位置和终点位置

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

+ 36 - 8
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
@@ -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.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):
         """
         根据当前爬塔类型自动切换御魂

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

+ 82 - 67
tasks/GameUi/game_ui.py

@@ -43,14 +43,14 @@ class GameUi(BaseTask, GameUiAssets):
         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
+        page_battle, 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 home_explore(self) -> bool:
@@ -81,35 +81,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.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,12 +152,8 @@ 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()
+            self.screenshot(skip_first_screenshot)
+            skip_first_screenshot = False
             # 如果20S还没有到底,那么就抛出异常
             if timeout.reached():
                 break
@@ -169,14 +164,12 @@ 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()
+            # wait to ui
+            sleep(0.3)
             app_check()
             minicap_check()
             rotation_check()
@@ -247,36 +240,44 @@ 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)
         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.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 +285,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 +305,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 +322,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 +331,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.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
 
     # ------------------------------------------------------------------------------------------------------------------
     # 下面的这些是一些特殊的页面,需要额外处理

+ 7 - 7
tasks/GameUi/page.py

@@ -4,6 +4,8 @@ import traceback
 from module.atom.click import RuleClick
 
 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
 
@@ -35,7 +37,7 @@ class Page:
 page_login = Page(G.I_CHECK_LOGIN_FORM)
 # Main Home 主页
 page_main = Page(G.I_CHECK_MAIN)
-page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS]
+page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS, RestartAssets.I_LOGIN_SCROOLL_CLOSE]
 # 召唤summon
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)
@@ -159,6 +161,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
@@ -237,10 +240,7 @@ page_climb_act.link(button=asa.I_BUFF_CHANGE_BUTTON, destination=page_climb_act_
 
 # ************************************* 战斗部分 *****************************************#
 # 战斗界面
-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]:
@@ -262,10 +262,10 @@ page_reward = Page(check_button=[GeneralBattleAssets.I_REWARD_PURPLE_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()})
+                          page_area_boss: random_click(), page_climb_act_boss: random_click()})
 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_area_boss: random_click(), page_climb_act_boss: random_click()})
 page_failed.additional = [random_click()]

+ 39 - 15
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
@@ -115,12 +115,14 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             self.set_next_run(task='WantedQuests', target=datetime.now().replace(microsecond=0))
         return True
 
-    def screenshot(self):
+    def screenshot(self, soft_skip: bool = False):
         """
         截图 引入中间函数的目的是 为了解决如协作的这类突发的事件
+        :param soft_skip: True跳过截图(但保证设备一定有图才跳过,否则依然截图)
         :return:
         """
-        self.device.screenshot()
+        if not soft_skip or not self.exist_image():
+            self.device.screenshot()
         # 判断勾协
         self._burst()
 
@@ -136,6 +138,13 @@ class BaseTask(GlobalGameAssets, CostumeBase):
 
         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,
@@ -360,7 +369,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         点击或者长按
         :param interval:
         :param click:
-        :return:
+        :return: 返回值不是click是否成功,而是interval是否设置以及是否到时间
         """
         if not click:
             return False
@@ -460,11 +469,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 +484,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:
+    def list_appear_click(self, target: RuleList, interval: float = None) -> 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])
-        if not appear:
-            return False
-        if isinstance(appear, tuple):
+        if isinstance(appear, tuple) and interval:
             x, y = appear
             self.device.click(x, y)
+            self.interval_timer[target.name].reset()
             return True
         return False