Преглед изворни кода

Merge pull request #1149 from BluettDream/dev_fix_climb

dev_fix_climb
huangrunheng пре 1 година
родитељ
комит
2c3a2cf787

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

@@ -165,7 +165,7 @@
     "itemName": "red_exit_2",
     "imageName": "as_red_exit_2.png",
     "roiFront": "1097,177,46,45",
-    "roiBack": "1069,152,100,100",
+    "roiBack": "931,128,237,164",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "爬塔活动页面的红色退出"

+ 1 - 1
tasks/ActivityShikigami/assets.py

@@ -95,7 +95,7 @@ class ActivityShikigamiAssets:
 	# 爬塔活动副页检查标志 
 	I_CHECK_BATTLE_2 = RuleImage(roi_front=(22,632,61,69), roi_back=(1,601,109,117), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_2.png")
 	# 爬塔活动页面的红色退出 
-	I_RED_EXIT_2 = RuleImage(roi_front=(1097,177,46,45), roi_back=(1069,152,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit_2.png")
+	I_RED_EXIT_2 = RuleImage(roi_front=(1097,177,46,45), roi_back=(931,128,237,164), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit_2.png")
 	# 卸载buff 
 	I_BUFF_DOWN = RuleImage(roi_front=(428,625,100,37), roi_back=(177,600,1040,98), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_down.png")
 	# 切换buff按钮 

+ 180 - 160
tasks/ActivityShikigami/script_task.py

@@ -1,6 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+from enum import Enum, auto
 from time import sleep
 
 import cv2
@@ -18,8 +19,9 @@ 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
-from tasks.GameUi.page import page_main, page_shikigami_records, page_climb_act, page_climb_act_pass, \
-    page_climb_act_boss, page_climb_act_ap, Page, page_climb_act_buff, page_climb_act_2
+import tasks.GameUi.page as game
+from tasks.GameUi.page import page_battle_auto
+from typing import Any
 
 
 def get_run_order_list(climb_conf: GeneralClimb) -> list[str]:
@@ -30,50 +32,37 @@ def get_run_order_list(climb_conf: GeneralClimb) -> list[str]:
 
 
 def _prepare_image_for_ocr(image: np.ndarray, asset: RuleOcr) -> np.ndarray:
-
     image_copy = image.copy()
     x, y, w, h = asset.roi
-
     roi_to_process = image_copy[y:y + h, x:x + w]
     if len(roi_to_process.shape) == 3:
         gray_image = cv2.cvtColor(roi_to_process, cv2.COLOR_BGR2GRAY)
     else:
         gray_image = roi_to_process
-
     # 自适应二值化
     _, binary_norm = cv2.threshold(gray_image, 127, 255, cv2.THRESH_BINARY | cv2.THRESH_OTSU)
     _, binary_inv = cv2.threshold(gray_image, 127, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)
-
     if cv2.countNonZero(binary_norm) < cv2.countNonZero(binary_inv):
         binary_correct = binary_norm
     else:
         binary_correct = binary_inv
-
     kernel = cv2.getStructuringElement(cv2.MORPH_RECT, (5, 1))
     dilated_image = cv2.dilate(binary_correct, kernel, iterations=1)
-
     # 找轮廓
     contours, _ = cv2.findContours(dilated_image, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
-
     processed_roi_content = None
     if contours:
         all_points = np.concatenate(contours, axis=0)
         bx, by, bw, bh = cv2.boundingRect(all_points)
-
         processed_roi_content = binary_correct[by:by + bh, bx:bx + bw]
-
     centered_roi = np.full((h, w), 255, dtype=np.uint8)  # 255代表白色
-
     if processed_roi_content is not None:
         content_h, content_w = processed_roi_content.shape
-
         if content_h <= h and content_w <= w:
             # 计算居中粘贴的位置,放到中间
             start_y = (h - content_h) // 2
             start_x = (w - content_w) // 2
-
             paste_area = centered_roi[start_y:start_y + content_h, start_x:start_x + content_w]
-
             paste_area[processed_roi_content == 255] = 0
         else:
             logger.warning(f"Content for asset '{asset.name}' is larger than ROI. Skipping centering.")
@@ -81,29 +70,58 @@ def _prepare_image_for_ocr(image: np.ndarray, asset: RuleOcr) -> np.ndarray:
             centered_roi = cv2.bitwise_not(binary_correct)
     else:
         logger.warning(f"No content found in ROI for asset: {asset.name}. ROI will be blank.")
-
     processed_roi_bgr = cv2.cvtColor(centered_roi, cv2.COLOR_GRAY2BGR)
     image_copy[y:y + h, x:x + w] = processed_roi_bgr
-
     return image_copy
 
 
+class Status(Enum):
+    TIME_OUT = auto()
+    DOWN = auto()
+    ALL_DOWN = auto()
+    ALREADY_SWITCH_SOUL = auto()
+    ALREADY_LOCK_TEAM = auto()
+    ALREADY_SWITCH_BUFF = auto()
+    GOTO_ACT_FAILED = auto()
+
+
 class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
-    # key: climb type value: run count
+    # key: climb type, value: run count
     count_map: dict[str, int] = {
         'pass': 0,
         'ap': 0,
         'boss': 0
     }
-    page_map: dict[str, Page] = {
-        'pass': page_climb_act_pass,
-        'ap': page_climb_act_ap,
-        'boss': page_climb_act_boss,
+    page_map: dict[str, game.Page] = {
+        'pass': game.page_climb_act_pass,
+        'ap': game.page_climb_act_ap,
+        'boss': game.page_climb_act_boss,
     }
+    # key: climb type, value: {status: value}
+    check_map: dict[str, dict[Status, Any]] = {}
 
     climb_type: str = 'pass'
     run_idx: int = 0
 
+    def put_status(self):
+        # 超过运行时间
+        if self.limit_time is not None and datetime.now() - self.start_time >= self.limit_time:
+            logger.info(f"{self.climb_type} time out")
+            self.put_check(Status.TIME_OUT, True)
+        # 次数达到限制
+        if self.get_count() >= self.get_limit(self.config.activity_shikigami.general_climb):
+            logger.warn(f"{self.climb_type} count out")
+            self.put_check(Status.DOWN, True)
+
+    def check(self, status: Status) -> Any:
+        if len(self.check_map) == 0:
+            self.check_map = {climb_type: {state: None for state in list(Status)} for climb_type in
+                              get_run_order_list(self.config.activity_shikigami.general_climb)}
+        return self.check_map[self.climb_type][status]
+
+    def put_check(self, status: Status, value: Any):
+        self.check_map[self.climb_type][status] = value
+
     def run(self) -> None:
         config = self.config.activity_shikigami
         self.limit_time: timedelta = config.general_climb.limit_time
@@ -112,36 +130,40 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                                         seconds=self.limit_time.second)
         # 初始化爬塔类型
         self.climb_type = get_run_order_list(config.general_climb)[0]
-        while 1:
-            # 切换御魂
-            self.switch_soul(config.switch_soul_config)
-            # 进入爬塔活动主界面
-            self.home_main()
-            # 切换buff
-            # self.switch_buff(config.general_climb)
-            # 锁定阵容
-            self.lock_team(config.general_battle)
-            while 1:
-                switch = False
-                # 超时退出
-                if self.limit_time is not None and datetime.now() - self.start_time >= self.limit_time:
-                    logger.info(f"{self.climb_type} time out")
-                    break
-                # 次数达到限制切换下一种爬塔
-                if self.get_count() >= self.get_limit(config.general_climb):
-                    logger.warn(f"{self.climb_type} count out, switch to next")
-                    switch = self.switch_next()
-                    break
-                # 判断是否可以运行
-                can_run = self.check_can_run()
-                if not can_run:
-                    logger.warn(f'{self.climb_type} tickets not enough, switch to next')
-                    switch = self.switch_next()
-                    break
-                # 开始战斗
-                self.start_battle()
-            if not switch:
+        max_failed_times = 3
+        while True:
+            self.put_status()
+            if self.check(Status.TIME_OUT) or self.check(Status.ALL_DOWN):
                 break
+            if self.check(Status.DOWN):
+                self.switch_next()
+                continue
+            current_page = self.ui_get_current_page(False)
+            if not self.check(Status.ALREADY_SWITCH_SOUL):
+                self.switch_soul(config.switch_soul_config)
+                continue
+            match current_page:
+                case game.page_main:
+                    self.home_main()
+                case game.page_climb_act | game.page_climb_act_2:
+                    # self.ui_goto(game.page_climb_act_buff)
+                    self.goto_act()
+                case game.page_climb_act_buff:
+                    self.switch_buff(config.general_climb)
+                    self.goto_act()
+                case game.page_climb_act_pass | game.page_climb_act_ap | game.page_climb_act_boss:
+                    if not self.check_can_run():
+                        continue
+                    self.lock_team(config.general_battle)
+                    self.start_battle()
+                case _:
+                    if self.check(Status.GOTO_ACT_FAILED):
+                        logger.warning(f'Climb type[{self.climb_type}] goto failed')
+                        self.put_check(Status.DOWN, True)
+                        continue
+                    self.put_check(Status.GOTO_ACT_FAILED, True)
+                    # 任何活动界面都没有识别到, 尝试主动前往爬塔活动
+                    self.goto_act()
         # 返回庭院
         self.main_home()
         if config.general_climb.active_souls_clean:
@@ -149,17 +171,90 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         self.set_next_run(task="ActivityShikigami", success=True)
         raise TaskEnd
 
+    def start_battle(self):
+        # 点击战斗前随机休息
+        if self.config.activity_shikigami.general_climb.random_sleep:
+            random_sleep(probability=0.2)
+        logger.info("Click battle")
+        click_times, max_times = 0, 3
+        while 1:
+            self.screenshot()
+            if self.is_in_battle(False):
+                break
+            if click_times >= max_times:
+                logger.warning(f'{self.climb_type} enter fail, try next')
+                self.put_check(Status.DOWN, True)
+                return
+            # 点击挑战
+            if self.ocr_appear_click(self.O_FIRE, interval=2):
+                click_times += 1
+                continue
+            if self.appear_then_click(self.I_C_CONFIRM1, interval=0.6):
+                continue
+            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                continue
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                continue
+            if self.appear_then_click(self.I_N_CONFIRM, interval=1):
+                continue
+        # 运行战斗
+        if self.run_general_battle(config=self.get_general_battle_conf()):
+            self.count_map[self.climb_type] += 1
+            logger.info("General battle success")
+
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        # 通用战斗结束判断
+        self.device.stuck_record_add("BATTLE_STATUS_S")
+        self.device.click_record_clear()
+        logger.info("Start battle process")
+
+        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
+        while 1:
+            self.screenshot()
+            sleep(0.5)
+            # 已经回到对应挑战界面
+            if self.ui_page_appear(self.page_map[self.climb_type]):
+                break
+            # 达到最大重试次数且还没有识别到活动界面
+            if ok_cnt > max_retry:
+                # 跳出循环交由外部处理
+                break
+            # 失败
+            if self.appear(self.I_FALSE):
+                logger.warning("False battle")
+                self.ui_click_until_smt_disappear(self.random_reward_click(), self.I_FALSE, interval=1.5)
+                return False
+            # 奖励界面
+            if self.ui_page_appear(game.page_reward):
+                logger.info(f'Battle end, try close {ok_cnt}')
+                self.random_reward_click(exclude_bottom=True, get_click=False)
+                ok_cnt += 1
+                continue
+            # 已经不在战斗中了, 且奖励也识别过了还不在活动界面, 则随机点击
+            if ok_cnt > 0 and not self.ui_page_appear(game.page_battle_auto):
+                self.random_reward_click(exclude_bottom=True, get_click=False)
+                ok_cnt += 1
+                continue
+            # 战斗中随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
+        return True
+
     def switch_soul(self, conf: SwitchSoulConfig):
         """
         根据当前爬塔类型自动切换御魂
         :param conf: 切换御魂配置
         :return:
         """
+        if self.check(Status.ALREADY_SWITCH_SOUL):
+            return
+        self.put_check(Status.ALREADY_SWITCH_SOUL, True)
         enable_switch = getattr(conf, f"enable_switch_{self.climb_type}", False)
         enable_by_name = getattr(conf, f"enable_switch_{self.climb_type}_by_name", False)
         if enable_switch or enable_by_name:
-            self.ui_get_current_page()
-            self.ui_goto(page_shikigami_records)
+            self.ui_goto(game.page_shikigami_records)
         if enable_by_name:
             group_name = getattr(conf, f"{self.climb_type}_group_team_name", '-1,-1')
             if not group_name or len(group_name.split(',')) != 2:
@@ -169,6 +264,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         elif enable_switch:
             group_team = getattr(conf, f"{self.climb_type}_group_team", '-1,-1')
             self.run_switch_soul(group_team)
+        self.goto_act()
 
     def lock_team(self, battle_conf: GeneralBattleConfig):
         """
@@ -176,7 +272,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         :param battle_conf: 战斗配置
         :return:
         """
-        self.goto_act()
+        if self.check(Status.ALREADY_LOCK_TEAM):
+            return
+        self.put_check(Status.ALREADY_LOCK_TEAM, True)
         enable_preset = getattr(battle_conf, f"enable_{self.climb_type}_preset", False)
         if not enable_preset:
             logger.info(f'Lock {self.climb_type} team')
@@ -195,6 +293,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 break
 
     def switch_buff(self, climb_conf: GeneralClimb):
+        if self.check(Status.ALREADY_SWITCH_BUFF):
+            return
+        self.put_check(Status.ALREADY_SWITCH_BUFF, True)
         buffs = getattr(climb_conf, f'{self.climb_type}_buff', None)
         if not buffs or len(buffs.split(',')) == 1:
             logger.info('Not set buff, skip')
@@ -203,8 +304,6 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         if not buff_list:
             logger.info('Buff incorrect formatting, skip')
             return
-        self.ui_get_current_page()
-        self.ui_goto(page_climb_act_buff)
         buff_box_list = [self.C_BUFF_1_BOX, self.C_BUFF_2_BOX]
         buff_box_empty_list = [self.I_BUFF_BOX_1_EMPTY, self.I_BUFF_BOX_2_EMPTY]
         buff_up_map = {
@@ -253,9 +352,11 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         boss: 剩余挑战次数>0
         :return: True 可以运行 or False
         """
-        self.goto_act()
-        logger.info(f'Check the {self.climb_type} can work')
-        self.wait_until_appear(self.O_FIRE)
+        logger.hr(f'Check the {self.climb_type}', 3)
+        if not self.wait_until_appear(self.O_FIRE, wait_time=5):
+            logger.info(f'Detect fire fail, try next')
+            self.put_check(Status.DOWN, True)
+            return False
         self.screenshot()
         remain_times = 0
         if self.climb_type == 'pass':
@@ -266,6 +367,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_AP))
         if self.climb_type == 'boss':
             _, remain_times, _ = self.O_REMAIN_BOSS.ocr_digit_counter(self.device.image)
+        self.put_check(Status.DOWN, remain_times <= 0)
         return remain_times > 0
 
     def get_limit(self, climb_conf: GeneralClimb) -> int:
@@ -277,7 +379,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         limit = getattr(climb_conf, f'{self.climb_type}_limit', 0)
         return 0 if not limit else limit
 
-    def switch_next(self) -> bool:
+    def switch_next(self):
         """
         切换下一种爬塔类型
         :return: True 切换成功 or False
@@ -285,37 +387,16 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         self.run_idx += 1
         climb_type_list = get_run_order_list(self.config.activity_shikigami.general_climb)
         if self.run_idx >= len(climb_type_list):
-            logger.info('All tower climbing activities have been completed')
-            return False
+            logger.info('All climbing activities have been completed')
+            self.put_check(Status.ALL_DOWN, True)
+            return
+        # 切换爬塔类型了, 恢复所有状态
         self.climb_type = climb_type_list[self.run_idx]
         self.current_count = 0
-        return True
-
-    def start_battle(self):
-        self.goto_act()
-        # 点击战斗前随机休息
-        if self.config.activity_shikigami.general_climb.random_sleep:
-            random_sleep(probability=0.2)
-        logger.info("Click battle")
-        while 1:
-            self.screenshot()
-            # 点击挑战
-            if self.ocr_appear_click(self.O_FIRE, interval=2):
-                continue
-            if self.is_in_battle(False):
-                break
-            if self.appear_then_click(self.I_C_CONFIRM1, interval=0.6):
-                continue
-            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
-                continue
-            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
-                continue
-            if self.appear_then_click(self.I_N_CONFIRM, interval=1):
-                continue
-        # 运行战斗
-        if self.run_general_battle(config=self.get_general_battle_conf()):
-            self.count_map[self.climb_type] += 1
-            logger.info("General battle success")
+        self.put_check(Status.ALREADY_SWITCH_SOUL, False)
+        self.put_check(Status.ALREADY_LOCK_TEAM, False)
+        self.put_check(Status.GOTO_ACT_FAILED, False)
+        logger.hr(f'Climb type switch to {self.climb_type}', 2)
 
     def get_general_battle_conf(self) -> tasks.Component.GeneralBattle.config_general_battle.GeneralBattleConfig:
         from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig as gbc
@@ -331,7 +412,8 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                    preset_team=team if enable_preset else 1,
                    green_enable=getattr(conf.general_battle, f'enable_{self.climb_type}_green', False),
                    green_mark=getattr(conf.general_battle, f'{self.climb_type}_green_mark'),
-                   random_click_swipt_enable=getattr(conf.general_battle, f'enable_{self.climb_type}_anti_detect', False), )
+                   random_click_swipt_enable=getattr(conf.general_battle, f'enable_{self.climb_type}_anti_detect',
+                                                     False), )
 
     def home_main(self) -> bool:
         """
@@ -339,8 +421,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         :return:
         """
         logger.hr("Enter Shikigami", 2)
-        self.ui_get_current_page(False)
-        self.ui_goto(page_climb_act)
+        self.ui_goto(game.page_climb_act)
 
     def main_home(self) -> bool:
         """
@@ -349,81 +430,20 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         """
         logger.hr("Exit Shikigami", 2)
         self.ui_get_current_page(False)
-        self.ui_goto(page_main)
+        self.ui_goto(game.page_main)
 
     def goto_act(self):
-        page = self.ui_get_current_page(False)
-        if page == self.page_map[self.climb_type]:
-            return
-        # # 门票活动特殊处理
-        # if self.climb_type == 'pass':
-        #     self.ui_goto(page_climb_act_2)
-        #     return
-        # 其余走page默认逻辑
-        self.ui_goto(self.page_map[self.climb_type])
-
-    def random_reward_click(self, exclude_bottom=False):
+        self.ui_goto(self.page_map[self.climb_type], timeout=20)
+
+    def random_reward_click(self, exclude_bottom=False, get_click=True):
         options = [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP]
         if not exclude_bottom:
             options.append(self.C_RANDOM_BOTTOM)
         target = random.choice(options)
+        if get_click:
+            return target
         self.click(target, interval=1.8)
-        return 1
-
-    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-        # 通用战斗结束判断
-        self.device.stuck_record_add("BATTLE_STATUS_S")
-        self.device.click_record_clear()
-        logger.info("Start battle process")
-
-        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
-        while 1:
-            self.screenshot()
-            sleep(0.5)
-            # 已经回到对应挑战界面
-            if self.ui_page_appear(self.page_map[self.climb_type]):
-                break
-            # 达到最大重试次数且没有回到活动界面
-            if ok_cnt > max_retry:
-                self.click(self.random_reward_click(exclude_bottom=True), interval=1)
-                break
-            # 已经胜利但是后续识别失败则重新识别并点击
-            if 0 < ok_cnt <= max_retry:
-                # 紫蛇皮消失
-                self.ui_click_until_smt_disappear(self.random_reward_click(exclude_bottom=True),
-                                                  self.I_REWARD_PURPLE_SNAKE_SKIN, interval=1.6)
-                self.ui_get_current_page()
-                self.ui_goto(self.page_map[self.climb_type])
-                ok_cnt += 1
-                continue
-            # 胜利(鼓 | 魂 | 获得奖励)
-            if self.appear(self.I_WIN) or self.appear(self.I_REWARD) or self.appear(self.I_UI_REWARD):
-                if ok_cnt == 0:
-                    logger.info("Win battle")
-                # 鼓消失
-                self.ui_click_until_smt_disappear(self.random_reward_click(), self.I_WIN, interval=1.1)
-                # 魂消失
-                self.ui_click_until_smt_disappear(self.random_reward_click(exclude_bottom=True), self.I_REWARD,
-                                                  interval=1.3)
-                # 紫蛇皮消失
-                self.ui_click_until_smt_disappear(self.random_reward_click(exclude_bottom=True),
-                                                  self.I_REWARD_PURPLE_SNAKE_SKIN, interval=1.6)
-                # 获得奖励消失
-                self.ui_click_until_smt_disappear(self.random_reward_click(),
-                                                  self.I_UI_REWARD, interval=1.6)
-                ok_cnt += 1
-                continue
-            # 失败
-            if self.appear(self.I_FALSE):
-                logger.warning("False battle")
-                self.ui_click_until_smt_disappear(self.random_reward_click(), self.I_FALSE, interval=1.5)
-                return False
-            # 战斗中随机滑动
-            if random_click_swipt_enable:
-                self.random_click_swipt()
-        return True
+        return None
 
 
 if __name__ == '__main__':

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

@@ -140,6 +140,8 @@ class GeneralBattleAssets:
 	# Image Rule Assets
 	# description 
 	I_GREED_GHOST = RuleImage(roi_front=(56,40,45,45), roi_back=(56,40,45,45), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_greed_ghost.png")
+	# 确认按钮 
+	I_CONFIRM = RuleImage(roi_front=(732,383,83,43), roi_back=(330,228,615,286), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_confirm.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/Component/GeneralBattle/gb/gb_confirm.png


+ 9 - 0
tasks/Component/GeneralBattle/gb/img_supplement.json

@@ -7,5 +7,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "confirm",
+    "imageName": "gb_confirm.png",
+    "roiFront": "732,383,83,43",
+    "roiBack": "330,228,615,286",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "确认按钮"
   }
 ]

+ 7 - 0
tasks/GameUi/assets.py

@@ -225,6 +225,13 @@ class GameUiAssets:
 					 array=["日之"])
 
 
+	# Ocr Rule Assets
+	# 战斗界面自动标识 
+	O_BATTLE_AUTO = RuleOcr(roi=(37,642,51,36), area=(0,589,133,128), mode="Single", method="Default", keyword="自动", name="battle_auto")
+	# 战斗页面手动标志 
+	O_BATTLE_HAND = RuleOcr(roi=(35,644,52,34), area=(0,589,136,129), mode="Single", method="Default", keyword="手动", name="battle_hand")
+
+
 	# Image Rule Assets
 	# 左上角蓝色的返回 
 	I_BACK_BL = RuleImage(roi_front=(32,31,50,53), roi_back=(1,2,139,120), threshold=0.8, method="Template matching", file="./tasks/GameUi/res/res_back_blue.png")

+ 115 - 81
tasks/GameUi/game_ui.py

@@ -3,8 +3,7 @@
 # github https://github.com/runhey
 import time
 from time import sleep
-
-import random
+from collections import deque
 from module.atom.image import RuleImage
 from module.atom.list import RuleList
 from module.atom.ocr import RuleOcr
@@ -37,10 +36,12 @@ class GameUi(BaseTask, GameUiAssets):
         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_3, page_climb_act_pass, page_climb_act_ap,
-        page_climb_act_boss, page_climb_act_buff
+        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_battle_auto, page_battle_hand, page_reward
     ]
-    ui_close = [GameUiAssets.I_BACK_MALL,
+    ui_close = [GameUiAssets.I_BACK_MALL, GeneralBattleAssets.I_CONFIRM,
                 BaseTask.I_UI_BACK_RED, BaseTask.I_UI_BACK_YELLOW, BaseTask.I_UI_BACK_BLUE,
                 GameUiAssets.I_BACK_FRIENDS, GameUiAssets.I_BACK_DAILY,
                 GameUiAssets.I_REALM_RAID_GOTO_EXPLORATION,
@@ -79,8 +80,26 @@ class GameUi(BaseTask, GameUiAssets):
         """
         判断当前页面是否为page
         """
+        if isinstance(page.check_button, list):
+            for button in page.check_button:
+                if self.appear(button):
+                    return True
+            return False
         return self.appear(page.check_button)
 
+    def ui_wait_until_appear(self, page: Page, timeout: int = 3, interval: float = 0.5) -> bool:
+        """
+        等待页面出现
+        """
+        logger.info(f'Waiting for {page}')
+        timeout_timer = Timer(timeout).start()
+        while not timeout_timer.reached():
+            self.screenshot()
+            if self.ui_page_appear(page):
+                return True
+            sleep(interval)
+        return False
+
     def ensure_scroll_open(self):
         """
         判断庭院界面卷轴是否打开
@@ -128,15 +147,12 @@ class GameUi(BaseTask, GameUiAssets):
                     self.screenshot()
             else:
                 self.screenshot()
-
-            # End
             # 如果20S还没有到底,那么就抛出异常
             if timeout.reached():
                 break
-
             # Known pages
             for page in self.ui_pages:
-                if page.check_button is None:
+                if not page.check_button:
                     continue
                 if self.ui_page_appear(page=page):
                     logger.attr("UI", page.name)
@@ -149,17 +165,9 @@ class GameUi(BaseTask, GameUiAssets):
                 if self.appear_then_click(close, interval=1.5):
                     logger.info('Trying to switch to supported page')
                     timeout = Timer(10, count=20).start()
-            # Unknown page but able to handle
-            # logger.info("Unknown ui page")
-            # if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=2) or self.ui_additional():
-            #     timeout.reset()
-            #     continue
-
             app_check()
             minicap_check()
             rotation_check()
-
-
         # Unknown page, need manual switching
         logger.warning("Unknown ui page")
         logger.attr("EMULATOR__SCREENSHOT_METHOD", self.config.script.device.screenshot_method)
@@ -179,86 +187,112 @@ class GameUi(BaseTask, GameUiAssets):
         """
         pass
 
-    def ui_goto(self, destination: Page, confirm_wait=0, skip_first_screenshot=True):
+    def build_reverse_paths(self, destination: Page) -> list[tuple[Page, list[Page]]]:
+        """
+        构建从每个页面到目标页面的最短路径(反向 BFS)
+        并按路径长度从短到长排序返回。
+
+        Returns:
+            list[tuple[Page, list[Page]]] -> [(start_page, [path...destinationPage]), ...]
+        """
+        paths = {destination: [destination]}
+        queue = deque([destination])
+        while queue:
+            cur = queue.popleft()
+            for page in self.ui_pages:
+                if page not in paths and cur in page.links:
+                    # page -> cur
+                    paths[page] = [page] + paths[cur]
+                    queue.append(page)
+        # 转换成列表并按路径长度排序, 短到长
+        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 = 45):
         """
         Args:
             destination (Page):
             confirm_wait:
             skip_first_screenshot:
+        :return: find destination page or timeout reached
         """
-        # Reset connection
-        for page in self.ui_pages:
-            page.parent = None
-
-        # Create connection
-        visited = [destination]
-        visited = set(visited)
-        # 广度优先搜索
-        while 1:
-            new = visited.copy()
-            for page in visited:
-                for link in self.ui_pages:
-                    if link in visited:
-                        continue
-                    if page in link.links:
-                        link.parent = page
-                        new.add(link)
-            # 没有新的页面加入,说明已经遍历完毕
-            if len(new) == len(visited):
-                break
-            visited = new
-
         logger.hr(f"UI goto {destination}")
+        # 初始化
+        timeout_timer = Timer(timeout).start()
         confirm_timer = Timer(confirm_wait, count=int(confirm_wait // 0.5)).start()
-        while 1:
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-            else:
-                self.screenshot()
+        try_close_unknown_timer = Timer(3).start()
+        # 构建路径映射并排序
+        paths = self.build_reverse_paths(destination)
 
-            # Destination additional button
-            if destination.additional and isinstance(destination.additional, list):
-                appear = False
-                for button in destination.additional:
-                    if self.appear_then_click(button, interval=0.6) or (
-                            isinstance(button, RuleOcr) and self.ocr_appear_click(button, interval=2)):
-                        appear = True
-                        logger.info(f'Page {destination} AB {button} clicked')
-                if appear:
-                    continue
-
-            # Destination page
-            if self.appear(destination.check_button):
+        while not timeout_timer.reached():
+            if not skip_first_screenshot:
+                self.screenshot()
+            skip_first_screenshot = False
+            # 已经在目标页面
+            if self.ui_page_appear(destination):
                 if confirm_timer.reached():
                     logger.info(f'Page arrive: {destination}')
                     break
-            else:
                 confirm_timer.reset()
-
-            # Other pages
-            clicked = False
-            for page in visited:
-                if page.parent is None or page.check_button is None:
-                    continue
-                # 获取当前页面的要点击的按钮
-                if self.appear(page.check_button, interval=4):
-                    logger.info(f'Page switch: {page} -> {page.parent}')
-                    button = page.links[page.parent]
-                    if (isinstance(button, RuleList) and self.list_appear_click(button)) or self.appear_then_click(
-                            button, interval=2) or (
-                            isinstance(button, RuleOcr) and self.ocr_appear_click(button, interval=2)):
-                        self.ui_button_interval_reset(button)
-                        confirm_timer.reset()
-                        clicked = True
-                        break
-
-            if clicked:
                 continue
+            # 尝试关闭未知页面
+            if try_close_unknown_timer.reached():
+                for close in self.ui_close:
+                    if self.appear_then_click(close, interval=1.5):
+                        logger.warning('Trying to switch to supported page')
+                try_close_unknown_timer.reset()
+            # 遍历所有路径,优先尝试最短路径
+            for page, path in paths:
+                if not self.ui_page_appear(page):
+                    continue
+                logger.info(f"Current page: {page}, following shortest path: {[p.name for p in path]}")
+                if self._execute_path(path, confirm_timer, timeout_timer):
+                    return True
             sleep(0.5)
+        else:
+            logger.error(f'Cannot goto page[{destination}], timeout[{timeout}s] reached')
+        return False
 
-        # Reset connection
-        for page in self.ui_pages:
-            page.parent = None
+    def _execute_path(self, path, confirm_timer, timeout_timer):
+        """
+        执行路径
+        :param path: currentPage,page1,page2,...,destinationPage
+        :param confirm_timer: 确认定时器
+        :param timeout_timer: 超时定时器
+        :return: currentPage==destinationPage
+        """
+        for i in range(len(path) - 1):
+            current_page, next_page = path[i], path[i + 1]
+            # 已超时则不再遍历
+            if timeout_timer.reached():
+                return False
+            # 等待当前页面出现
+            self.ui_wait_until_appear(current_page)
+            logger.info(f'Page switch: {current_page} -> {next_page}')
+            # 执行附加操作
+            if current_page.additional:
+                for button in current_page.additional:
+                    if ((isinstance(button, RuleClick) and self.click(button)) or
+                            self.appear_then_click(button, interval=0.6) or
+                            (isinstance(button, RuleOcr) and self.ocr_appear_click(button, interval=2))):
+                        logger.info(f'Page {current_page} additional {button} clicked')
+            # 执行页面跳转
+            button = current_page.links.get(next_page)
+            if not button:
+                logger.warning(f"No link from {current_page} to {next_page}")
+                return False
+            # 执行对应操作
+            if ((isinstance(button, RuleList) and self.list_appear_click(button)) or
+                    (isinstance(button, RuleClick) and self.click(button)) or
+                    self.appear_then_click(button, interval=2) or
+                    (isinstance(button, RuleOcr) and self.ocr_appear_click(button, interval=2))):
+                self.ui_button_interval_reset(button)
+                confirm_timer.reset()
+            else:
+                logger.warning(f"Failed to click {button} on {current_page}")
+                return False
+        # 最后确认目标页面
+        return self.ui_page_appear(path[-1])
 
     # ------------------------------------------------------------------------------------------------------------------
     # 下面的这些是一些特殊的页面,需要额外处理

+ 48 - 18
tasks/GameUi/page.py

@@ -1,16 +1,19 @@
+import random
+
 import traceback
+from module.atom.click import RuleClick
 
 from tasks.GameUi.assets import GameUiAssets as G
 from tasks.base_task import BaseTask as BT
 from tasks.RyouToppa.assets import RyouToppaAssets
 
-class Page:
-    parent = None
-
 
-    def __init__(self, check_button):
+class Page:
+    def __init__(self, check_button, links=None):
+        if links is None:
+            links = {}
         self.check_button = check_button
-        self.links = {}
+        self.links = links
         self.additional: list = None  # 附加按钮或者是ocr检测按钮
         (filename, line_number, function_name, text) = traceback.extract_stack()[-2]
         self.name = text[:text.find('=')].strip()
@@ -29,10 +32,10 @@ class Page:
 
 
 #登录login
-page_login=Page(G.I_CHECK_LOGIN_FORM)
+page_login = Page(G.I_CHECK_LOGIN_FORM)
 # Main Home 主页
 page_main = Page(G.I_CHECK_MAIN)
-page_main.additional = [G.I_BACK_Y, G.I_BACK_MALL, G.I_AD_CLOSE_RED, G.I_BACK_YOLLOW, G.I_BACK_FRIENDS, G.I_BACK_DAILY, G.I_BACK_BLUE, G.I_BACK_ACT_LIST]
+page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS]
 # 召唤summon
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)
@@ -174,10 +177,10 @@ page_act_list.additional = [G.I_PAPER_DOLL_CLOSE]
 page_act_list.link(button=G.I_BACK_ACT_LIST, destination=page_main)
 page_main.link(button=G.I_ACT_LIST_EXPAND, destination=page_act_list)
 
-
 # 道馆
 from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
 from tasks.Dokan.assets import DokanAssets
+
 page_dokan = Page(DokanAssets.I_RYOU_DOKAN_CHECK)
 page_dokan.additional = [GeneralBattleAssets.I_EXIT, DokanAssets.I_RYOU_DOKAN_EXIT_ENSURE, G.I_BACK_BLUE]
 page_dokan.link(button=G.I_BACK_Y, destination=page_main)
@@ -185,32 +188,30 @@ 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_2]
+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_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
+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_3 = Page(asa.I_ENTRY_ACTIVITY)
-page_climb_act_3.additional = [asa.I_PASS_ACT_LOCAT, ]
-page_climb_act_2.link(button=asa.I_ACT_MAP_SWITCH, destination=page_climb_act_3)
-page_climb_act_3.link(button=asa.I_ACT_MAP_SWITCH, 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_3)
-page_climb_act_3.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
+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.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)
 # 体力, 门票互相跳转
@@ -226,3 +227,32 @@ 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)
+
+
+def random_click(low: int = None, high: int = None) -> RuleClick | list[RuleClick]:
+    """
+    随机生成RuleClick, 不传入参数则返回1个RuleClick, 传入参数则生成范围内的click数组
+    :return: RuleClick或者RuleClick的数组
+    """
+    click = random.choice([asa.C_RANDOM_LEFT, asa.C_RANDOM_RIGHT, asa.C_RANDOM_TOP])
+    if low is None or high is None:
+        return click
+    return [click for _ in range(random.randint(low, high))]
+
+
+# 奖励界面
+page_reward = Page(check_button=[GeneralBattleAssets.I_REWARD_PURPLE_SNAKE_SKIN, GeneralBattleAssets.I_REWARD,
+                                 GeneralBattleAssets.I_REWARD_EXP_SOUL_4,
+                                 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()})
+page_reward.additional = random_click(1, 3)

+ 20 - 0
tasks/GameUi/page/page_ocr.json

@@ -0,0 +1,20 @@
+[
+  {
+    "itemName": "battle_auto",
+    "roiFront": "37,642,51,36",
+    "roiBack": "0,589,133,128",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "自动",
+    "description": "战斗界面自动标识"
+  },
+  {
+    "itemName": "battle_hand",
+    "roiFront": "35,644,52,34",
+    "roiBack": "0,589,136,129",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "手动",
+    "description": "战斗页面手动标志"
+  }
+]

+ 5 - 6
tasks/base_task.py

@@ -136,7 +136,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         return self.device.image
 
     def appear(self,
-               target: RuleImage | RuleGif,
+               target: RuleImage | RuleGif | RuleOcr,
                interval: float = None,
                threshold: float = None):
         """
@@ -146,9 +146,6 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         :param threshold:
         :return:
         """
-        if not isinstance(target, RuleImage) and not isinstance(target, RuleGif):
-            return False
-
         if interval:
             if target.name in self.interval_timer:
                 if self.interval_timer[target.name].limit != interval:
@@ -157,8 +154,10 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 self.interval_timer[target.name] = Timer(interval)
             if not self.interval_timer[target.name].reached():
                 return False
-
-        appear = target.match(self.device.image, threshold=threshold)
+        if isinstance(target, RuleOcr):
+            appear = self.ocr_appear(target, interval)
+        else:
+            appear = target.match(self.device.image, threshold=threshold)
 
         if appear and interval:
             self.interval_timer[target.name].reset()