Procházet zdrojové kódy

Merge pull request #1157 from runhey/dev

Dev
huangrunheng před 1 rokem
rodič
revize
697bca1c3e
46 změnil soubory, kde provedl 707 přidání a 417 odebrání
  1. 13 3
      module/config/config.py
  2. 1 0
      module/config/config_model.py
  3. 6 0
      module/ocr/base_ocr.py
  4. 15 8
      module/server/script_router.py
  5. 6 1
      module/server/script_websocket.py
  6. 48 37
      script.py
  7. binární
      tasks/ActivityShikigami/as/as_act_map_switch.png
  8. binární
      tasks/ActivityShikigami/as/as_ap_activity.png
  9. binární
      tasks/ActivityShikigami/as/as_battle.png
  10. binární
      tasks/ActivityShikigami/as/as_boss.png
  11. binární
      tasks/ActivityShikigami/as/as_check_act_list_climb_act.png
  12. binární
      tasks/ActivityShikigami/as/as_check_battle_2.png
  13. binární
      tasks/ActivityShikigami/as/as_check_boss.png
  14. binární
      tasks/ActivityShikigami/as/as_entry_activity.png
  15. binární
      tasks/ActivityShikigami/as/as_fire.png
  16. binární
      tasks/ActivityShikigami/as/as_fire_org.png
  17. binární
      tasks/ActivityShikigami/as/as_lock.png
  18. binární
      tasks/ActivityShikigami/as/as_pass_act_locat.png
  19. binární
      tasks/ActivityShikigami/as/as_unlock.png
  20. 51 24
      tasks/ActivityShikigami/as/image.json
  21. 17 8
      tasks/ActivityShikigami/as/ocr.json
  22. 23 15
      tasks/ActivityShikigami/assets.py
  23. 211 160
      tasks/ActivityShikigami/script_task.py
  24. 6 6
      tasks/Component/BaseActivity/config_activity.py
  25. 13 0
      tasks/Component/Costume/assets.py
  26. 1 0
      tasks/Component/Costume/config.py
  27. 1 1
      tasks/Component/Costume/costume_base.py
  28. 47 0
      tasks/Component/Costume/main13/image.json
  29. binární
      tasks/Component/Costume/main13/main13_check_main_13.png
  30. binární
      tasks/Component/Costume/main13/main13_main_goto_exploration_13.png
  31. binární
      tasks/Component/Costume/main13/main13_main_goto_summon_13.png
  32. binární
      tasks/Component/Costume/main13/main13_main_goto_town_13.png
  33. binární
      tasks/Component/Costume/main13/main13_pet_house_13.png
  34. 2 0
      tasks/Component/GeneralBattle/assets.py
  35. binární
      tasks/Component/GeneralBattle/gb/gb_confirm.png
  36. 9 0
      tasks/Component/GeneralBattle/gb/img_supplement.json
  37. 11 2
      tasks/GameUi/assets.py
  38. 120 124
      tasks/GameUi/game_ui.py
  39. 55 17
      tasks/GameUi/page.py
  40. binární
      tasks/GameUi/page/climb_act.png
  41. binární
      tasks/GameUi/page/page_act_list_climb_act.png
  42. binární
      tasks/GameUi/page/page_back_battle.png
  43. 9 0
      tasks/GameUi/page/page_img_3.json
  44. 3 3
      tasks/GameUi/page/page_list_act_ocr.json
  45. 20 0
      tasks/GameUi/page/page_ocr.json
  46. 19 8
      tasks/base_task.py

+ 13 - 3
module/config/config.py

@@ -103,6 +103,7 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         super(ConfigWatcher, self).__init__()
         super(ConfigMenu, self).__init__()
         self.model = ConfigModel(config_name=config_name)
+        self.scheduler_update_dt = None  # 调度器更新时间
 
     def __getattr__(self, name):
         """
@@ -181,14 +182,14 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         pending_task = []
         waiting_task = []
         error = []
-        now = datetime.now()
+        self.scheduler_update_dt = datetime.now()
         for key, value in self.model.dict().items():
             func = Function(key, value)
             if not func.enable:
                 continue
             if not isinstance(func.next_run, datetime):
                 error.append(func)
-            elif func.next_run < now:
+            elif func.next_run < self.scheduler_update_dt:
                 pending_task.append(func)
             else:
                 waiting_task.append(func)
@@ -198,6 +199,13 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         if pending_task:
             pending_task = TaskScheduler.schedule(rule=self.model.script.optimization.schedule_rule,
                                                   pending=pending_task)
+            # 防止正在运行的任务被新上来的pending队列中的任务给顶替掉
+            if self.model.running_task and pending_task:
+                for i, obj in enumerate(pending_task):
+                    if obj.command == self.model.running_task:
+                        pending_task.insert(0, pending_task.pop(i))
+                        logger.info(f'{self.model.running_task} is running')
+                        break
         if waiting_task:
             # waiting_task = f.apply(waiting_task)
             waiting_task = sorted(waiting_task, key=operator.attrgetter("next_run"))
@@ -238,8 +246,10 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         获取调度器的数据, 但是你必须使用update_scheduler来更新信息
         :return:
         """
+        # 根据调度器更新时间来判断是否有可运行的任务,保证逻辑一致性
+        scheduler_update_dt = getattr(self, 'scheduler_update_dt', datetime.now())
         running = {}
-        if self.task is not None and self.task.next_run < datetime.now():
+        if self.task is not None and self.task.next_run < scheduler_update_dt:
             running = {"name": self.task.command, "next_run": str(self.task.next_run)}
 
         pending = []

+ 1 - 0
module/config/config_model.py

@@ -80,6 +80,7 @@ from tasks.Duel.config import Duel
 
 class ConfigModel(ConfigBase):
     config_name: str = "oas"
+    running_task: str = ''
     script: Script = Field(default_factory=Script)
     restart: Restart = Field(default_factory=Restart)
     global_game: GlobalGame = Field(default_factory=GlobalGame)

+ 6 - 0
module/ocr/base_ocr.py

@@ -87,6 +87,12 @@ class BaseCor:
         self.area: list = list(area)
         self.keyword = keyword
 
+    def __str__(self):
+        return f"{self.name}"
+
+    def __repr__(self):
+        return f"{self.name}"
+
     @cached_property
     def model(self) -> TextSystem:
         return OCR_MODEL.__getattribute__(self.lang)

+ 15 - 8
module/server/script_router.py

@@ -134,6 +134,20 @@ async def script_task(script_name: str, task: str, group: str, argument: str, ty
         raise HTTPException(status_code=400, detail=f'Argument type error: {e}')
     return mm.config_cache(script_name).model.script_set_arg(task, group, argument, value)
 
+
+@script_app.put('/{script_name}/{task}/sync_next_run')
+async def sync_next_run(script_name: str, task: str, target_dt: str):
+    if script_name not in mm.script_process:
+        return False
+    config = mm.config_cache(script_name)
+    target = datetime.strptime(target_dt, '%Y-%m-%d %H:%M:%S') if target_dt else None
+    config.task_delay(task=task, success=True, target=target)
+    script_process = mm.script_process[script_name]
+    config.get_next()
+    await script_process.broadcast_state({"schedule": config.get_schedule_data()})
+    return True
+
+
 # --------------------------------------  SSE  --------------------------------------
 @script_app.get('/{script_name}/state')
 async def script_task_state(script_name: str):
@@ -195,11 +209,4 @@ async def websocket_endpoint(websocket: WebSocket, script_name: str):
 
     except WebSocketDisconnect:
         logger.warning(f'[{script_name}] websocket disconnect')
-        script_process.disconnect(websocket)
-
-
-
-
-
-
-
+        await script_process.disconnect(websocket)

+ 6 - 1
module/server/script_websocket.py

@@ -13,9 +13,14 @@ class ScriptWSManager:
         await ws.accept()
         self.active_connections.append(ws)
 
-    def disconnect(self, ws: WebSocket):
+    async def disconnect(self, ws: WebSocket):
         # 关闭时 移除ws对象
         self.active_connections.remove(ws)
+        try:
+            # 给前端发送最后一次关闭信号
+            await ws.close()
+        except RuntimeError:
+            pass
 
     async def broadcast(self, message: str):
         # 广播消息

+ 48 - 37
script.py

@@ -269,9 +269,6 @@ class Script:
             result[key] = item
         return json.dumps(result)
 
-
-
-
     def wait_until(self, future):
         """
         Wait until a specific time.
@@ -303,43 +300,56 @@ class Script:
         获取下一个任务的名字, 大驼峰。
         :return:
         """
-        while 1:
+        while True:
             task = self.config.get_next()
             self.config.task = task
             if self.state_queue:
                 self.state_queue.put({"schedule": self.config.get_schedule_data()})
+            now = datetime.now()
+            # 任务时间到了返回任务名称
+            if task.next_run <= now:
+                return task.command
+            # 根据策略执行等待逻辑
+            if not self._handle_wait_during_idle(task.next_run):
+                # 若等待被打断, 则刷新配置
+                del_cached_property(self, "config")
+
+    def _handle_wait_during_idle(self, next_run: datetime) -> bool:
+        """
+        处理任务空闲期间的行为策略
+        :param next_run: 下一个任务的时间
+        :return: True 表示等待成功完成, False 表示等待被中断
+        """
+        method = self.config.script.optimization.when_task_queue_empty
+        strategy_map = {
+            "close_game": self._wait_close_game,
+            "goto_main": self._wait_goto_main,
+        }
+        func = strategy_map.get(method)
+        if not func:
+            logger.warning(f"Invalid Optimization_WhenTaskQueueEmpty: {method}, fallback to stay_there")
+            func = self._wait_stay_there
+        return func(next_run)
+
+    def _wait_close_game(self, next_run: datetime) -> bool:
+        logger.info("Close game during wait")
+        self.device.app_stop()
+        self.device.release_during_wait()
+        if not self.wait_until(next_run):
+            return False
+        self.run("Restart")
+        return True
+
+    def _wait_goto_main(self, next_run: datetime) -> bool:
+        logger.info("Goto main page during wait")
+        self.run("GotoMain")
+        self.device.release_during_wait()
+        return self.wait_until(next_run)
 
-            # from module.base.resource import release_resources
-            # if self.config.task.command != 'Alas':
-            #     release_resources(next_task=task.command)
-
-            if task.next_run > datetime.now():
-                logger.info(f'Wait until {task.next_run} for task `{task.command}`')
-                method = self.config.script.optimization.when_task_queue_empty
-                if method == 'close_game':
-                    logger.info('Close game during wait')
-                    self.device.app_stop()
-                    self.device.release_during_wait()
-                    if not self.wait_until(task.next_run):
-                        del_cached_property(self, 'config')
-                        continue
-                    self.run('Restart')
-                elif method == 'goto_main':
-                    logger.info('Goto main page during wait')
-                    self.run('GotoMain')
-                    self.device.release_during_wait()
-                    if not self.wait_until(task.next_run):
-                        del_cached_property(self, 'config')
-                        continue
-                else:
-                    logger.warning(f'Invalid Optimization_WhenTaskQueueEmpty: {method}, fallback to stay_there')
-                    self.device.release_during_wait()
-                    if not self.wait_until(task.next_run):
-                        del_cached_property(self, 'config')
-                        continue
-            break
-
-        return task.command
+    def _wait_stay_there(self, next_run: datetime) -> bool:
+        logger.info("Stay_there (no action) during wait")
+        self.device.release_during_wait()
+        return self.wait_until(next_run)
 
     def run(self, command: str) -> bool:
         """
@@ -414,6 +424,7 @@ class Script:
             logger.set_file_logger(self.config_name, do_cleanup=True)
         start_day = date.today()
         logger.info(f'Start scheduler loop: {self.config_name}')
+        self.config.model.running_task = ''
 
         # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
         if not self.config.script.device.run_background_only:
@@ -460,13 +471,13 @@ class Script:
                 continue
 
             # Run
-            if self.state_queue:
-                self.state_queue.put({"schedule": self.config.get_schedule_data()})
             logger.info(f'Scheduler: Start task `{task}`')
             self.device.stuck_record_clear()
             self.device.click_record_clear()
             logger.hr(task, level=0)
+            self.config.model.running_task = task
             success = self.run(inflection.camelize(task))
+            self.config.model.running_task = ''
             logger.info(f'Scheduler: End task `{task}`')
             self.is_first_task = False
 

binární
tasks/ActivityShikigami/as/as_act_map_switch.png


binární
tasks/ActivityShikigami/as/as_ap_activity.png


binární
tasks/ActivityShikigami/as/as_battle.png


binární
tasks/ActivityShikigami/as/as_boss.png


binární
tasks/ActivityShikigami/as/as_check_act_list_climb_act.png


binární
tasks/ActivityShikigami/as/as_check_battle_2.png


binární
tasks/ActivityShikigami/as/as_check_boss.png


binární
tasks/ActivityShikigami/as/as_entry_activity.png


binární
tasks/ActivityShikigami/as/as_fire.png


binární
tasks/ActivityShikigami/as/as_fire_org.png


binární
tasks/ActivityShikigami/as/as_lock.png


binární
tasks/ActivityShikigami/as/as_pass_act_locat.png


binární
tasks/ActivityShikigami/as/as_unlock.png


+ 51 - 24
tasks/ActivityShikigami/as/image.json

@@ -20,11 +20,11 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "475,194,35,135",
-    "roiBack": "454,107,154,315",
+    "roiFront": "813,254,35,135",
+    "roiBack": "754,140,154,315",
     "method": "Template matching",
     "threshold": 0.7,
-    "description": "霜火寂境"
+    "description": "征伐斗场"
   },
   {
     "itemName": "battle_1",
@@ -50,7 +50,7 @@
     "roiFront": "884,648,28,25",
     "roiBack": "761,613,255,76",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.5,
     "description": "上锁图标"
   },
   {
@@ -59,32 +59,23 @@
     "roiFront": "884,648,28,25",
     "roiBack": "758,607,242,85",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.5,
     "description": "还未上锁图片"
   },
-  {
-    "itemName": "fire",
-    "imageName": "as_fire.png",
-    "roiFront": "1131,598,103,54",
-    "roiBack": "1113,564,136,111",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "点击战斗"
-  },
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1091,550,23,24",
-    "roiBack": "1081,532,103,71",
+    "roiFront": "1181,657,23,24",
+    "roiBack": "1149,631,103,71",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.65,
     "description": "寿司体力"
   },
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1140,550,21,25",
-    "roiBack": "1108,542,84,54",
+    "roiFront": "1153,636,21,25",
+    "roiBack": "1124,621,84,54",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -146,8 +137,8 @@
   {
     "itemName": "boss",
     "imageName": "as_boss.png",
-    "roiFront": "1054,265,33,132",
-    "roiBack": "966,131,211,355",
+    "roiFront": "165,339,33,132",
+    "roiBack": "103,218,160,355",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "爬塔进入首领战"
@@ -164,8 +155,8 @@
   {
     "itemName": "check_battle_2",
     "imageName": "as_check_battle_2.png",
-    "roiFront": "93,12,128,46",
-    "roiBack": "82,0,148,86",
+    "roiFront": "22,632,61,69",
+    "roiBack": "1,601,109,117",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "爬塔活动副页检查标志"
@@ -174,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": "爬塔活动页面的红色退出"
@@ -241,5 +232,41 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "爬塔活动buff页"
+  },
+  {
+    "itemName": "entry_activity",
+    "imageName": "as_entry_activity.png",
+    "roiFront": "567,258,46,42",
+    "roiBack": "254,56,774,524",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "进入门票活动"
+  },
+  {
+    "itemName": "check_act_list_climb_act",
+    "imageName": "as_check_act_list_climb_act.png",
+    "roiFront": "538,194,497,193",
+    "roiBack": "415,67,773,390",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "活动列表页爬塔活动"
+  },
+  {
+    "itemName": "act_map_switch",
+    "imageName": "as_act_map_switch.png",
+    "roiFront": "1196,303,59,48",
+    "roiBack": "1174,263,104,118",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "活动地图切换"
+  },
+  {
+    "itemName": "pass_act_locat",
+    "imageName": "as_pass_act_locat.png",
+    "roiFront": "1214,395,29,31",
+    "roiBack": "1179,373,100,86",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "门票活动定位"
   }
 ]

+ 17 - 8
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "910,18,62,28",
-    "roiBack": "910,18,62,28",
+    "roiFront": "727,18,105,28",
+    "roiBack": "716,11,122,41",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -28,8 +28,8 @@
   },
   {
     "itemName": "remain_ap_activity2",
-    "roiFront": "558,18,47,29",
-    "roiBack": "558,18,47,29",
+    "roiFront": "1115,25,88,29",
+    "roiBack": "1107,14,103,50",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
@@ -37,20 +37,29 @@
   },
   {
     "itemName": "entry_activity",
-    "roiFront": "70,103,98,32",
-    "roiBack": "70,103,98,32",
+    "roiFront": "72,279,98,32",
+    "roiBack": "73,279,98,32",
     "mode": "Single",
     "method": "Default",
-    "keyword": "驻守平安",
+    "keyword": "临战演武",
     "description": "从左侧进入战斗"
   },
   {
     "itemName": "remain_boss",
     "roiFront": "1113,669,131,31",
-    "roiBack": "0,0,100,100",
+    "roiBack": "1099,659,162,52",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
     "description": "boss剩余攻击次数"
+  },
+  {
+    "itemName": "fire",
+    "roiFront": "1137,599,83,44",
+    "roiBack": "1129,570,100,100",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "挑战",
+    "description": "挑战"
   }
 ]

+ 23 - 15
tasks/ActivityShikigami/assets.py

@@ -62,22 +62,20 @@ class ActivityShikigamiAssets:
 	I_SHI = RuleImage(roi_front=(1183,319,47,38), roi_back=(1164,134,83,318), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
-	# 霜火寂境 
-	I_BATTLE = RuleImage(roi_front=(475,194,35,135), roi_back=(454,107,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	# 征伐斗场 
+	I_BATTLE = RuleImage(roi_front=(813,254,35,135), roi_back=(754,140,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 进入爬塔1 
 	I_BATTLE_1 = RuleImage(roi_front=(541,197,149,26), roi_back=(506,622,273,96), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_1.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(327,627,145,28), roi_back=(256,462,301,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(761,613,255,76), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(761,613,255,76), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(758,607,242,85), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
-	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1131,598,103,54), roi_back=(1113,564,136,111), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(758,607,242,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 寿司体力 
-	I_AP = RuleImage(roi_front=(1091,550,23,24), roi_back=(1081,532,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1181,657,23,24), roi_back=(1149,631,103,71), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1140,550,21,25), roi_back=(1108,542,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1153,636,21,25), roi_back=(1124,621,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
 	I_SWITCH = RuleImage(roi_front=(1215,551,23,23), roi_back=(1204,538,74,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
 	# 购买活动的体力 
@@ -91,13 +89,13 @@ class ActivityShikigamiAssets:
 	# description 
 	I_TOGGLE_BUTTON = RuleImage(roi_front=(1193,463,27,25), roi_back=(1169,146,73,403), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_toggle_button.png")
 	# 爬塔进入首领战 
-	I_BOSS = RuleImage(roi_front=(1054,265,33,132), roi_back=(966,131,211,355), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_boss.png")
+	I_BOSS = RuleImage(roi_front=(165,339,33,132), roi_back=(103,218,160,355), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_boss.png")
 	# 爬塔boss战页面检查图像 
 	I_CHECK_BOSS = RuleImage(roi_front=(87,18,126,37), roi_back=(63,0,172,81), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_boss.png")
 	# 爬塔活动副页检查标志 
-	I_CHECK_BATTLE_2 = RuleImage(roi_front=(93,12,128,46), roi_back=(82,0,148,86), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_2.png")
+	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按钮 
@@ -112,20 +110,30 @@ class ActivityShikigamiAssets:
 	I_BUFF_SWITCH = RuleImage(roi_front=(640,624,100,39), roi_back=(180,601,1026,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_switch.png")
 	# 爬塔活动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_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")
+	# 活动地图切换 
+	I_ACT_MAP_SWITCH = RuleImage(roi_front=(1196,303,59,48), roi_back=(1174,263,104,118), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_act_map_switch.png")
+	# 门票活动定位 
+	I_PASS_ACT_LOCAT = RuleImage(roi_front=(1214,395,29,31), roi_back=(1179,373,100,86), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_pass_act_locat.png")
 
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(910,18,62,28), area=(910,18,62,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(727,18,105,28), area=(716,11,122,41), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(534,18,70,28), area=(534,18,70,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 
-	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(558,18,47,29), area=(558,18,47,29), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
+	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=(70,103,98,32), area=(70,103,98,32), mode="Single", method="Default", keyword="驻守平安", name="entry_activity")
+	O_ENTRY_ACTIVITY = RuleOcr(roi=(72,279,98,32), area=(73,279,98,32), mode="Single", method="Default", keyword="临战演武", name="entry_activity")
 	# boss剩余攻击次数 
-	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(0,0,100,100), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
+	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(1099,659,162,52), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
+	# 挑战 
+	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
 
 

+ 211 - 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
@@ -8,6 +9,7 @@ import numpy as np
 import random
 import tasks.Component.GeneralBattle.config_general_battle
 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.exception import TaskEnd
@@ -18,62 +20,49 @@ 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
+import tasks.GameUi.page as game
+from typing import Any
 
 
 def get_run_order_list(climb_conf: GeneralClimb) -> list[str]:
     if not climb_conf.run_sequence or len(climb_conf.run_sequence.split(',')) == 1:
         raise ValueError('Run sequence now is empty, must set it')
     run_order_list = [climb_type.strip() for climb_type in climb_conf.run_sequence.split(',')]
-    return [climb_type for climb_type in run_order_list if getattr(climb_conf, f'enable_{climb_type}')]
+    return [climb_type for climb_type in run_order_list if getattr(climb_conf, f'enable_{climb_type}', False)]
 
 
 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,62 @@ 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()  # 已经切换buff
+    GOTO_ACT_FAILED = auto()  # 前往活动失败
+    ENTER_BATTLE_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.warning(f"Climb type {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.info(f"Climb type {self.climb_type} count limit reached")
+            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 +134,47 @@ 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:
+        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()
+                # buff界面, 进入最终爬塔界面
+                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 +182,94 @@ 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:
+                if self.check(Status.ENTER_BATTLE_FAILED):
+                    logger.warning(f'Climb {self.climb_type} cannot enter, maybe already end, try next')
+                    self.put_check(Status.DOWN, True)
+                    return
+                logger.warning(f'Climb type {self.climb_type} enter fail, try reidentify')
+                self.put_check(Status.ENTER_BATTLE_FAILED, 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:
+            sleep(0.5)
+            self.screenshot()
+            # 已经回到对应挑战界面
+            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(click_now=False), 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_click=[self.C_RANDOM_BOTTOM])
+                ok_cnt += 1
+                continue
+            # 已经不在战斗中了, 且奖励也识别过了还不在活动界面, 则随机点击
+            if ok_cnt > 0 and not self.ui_page_appear(game.page_battle_auto):
+                self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
+                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 +279,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,8 +287,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         :param battle_conf: 战斗配置
         :return:
         """
-        self.ui_get_current_page()
-        self.ui_goto(self.page_map[self.climb_type])
+        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')
@@ -196,6 +308,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')
@@ -204,8 +319,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 = {
@@ -254,10 +367,11 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         boss: 剩余挑战次数>0
         :return: True 可以运行 or False
         """
-        self.ui_get_current_page()
-        self.ui_goto(self.page_map[self.climb_type])
-        logger.info(f'Check the {self.climb_type} can work')
-        self.wait_until_appear(self.I_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':
@@ -268,6 +382,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:
@@ -279,7 +394,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
@@ -287,36 +402,17 @@ 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):
-        # 点击战斗前随机休息
-        if self.config.activity_shikigami.general_climb.random_sleep:
-            random_sleep(probability=0.2)
-        logger.info("Click battle")
-        while 1:
-            self.screenshot()
-            # 点击挑战
-            if self.appear_then_click(self.I_FIRE, interval=2):
-                continue
-            if not self.appear(self.I_FIRE):
-                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)
+        self.put_check(Status.ENTER_BATTLE_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
@@ -332,16 +428,16 @@ 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:
         """
-        从庭院到活动的爬塔界面,(只到爬塔活动主界面)
+        从庭院到活动的爬塔界面
         :return:
         """
         logger.hr("Enter Shikigami", 2)
-        self.ui_get_current_page()
-        self.main_goto_act_by_list(page_climb_act)
+        self.ui_goto(game.page_climb_act)
 
     def main_home(self) -> bool:
         """
@@ -349,79 +445,34 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         :return:
         """
         logger.hr("Exit Shikigami", 2)
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
+        self.ui_get_current_page(False)
+        self.ui_goto(game.page_main)
 
-    def random_reward_click(self, exclude_bottom=False):
-        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)
-        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")
+    def goto_act(self):
+        self.ui_goto(self.page_map[self.climb_type], timeout=20)
 
-        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
+    def random_reward_click(self, exclude_click: list = None, click_now: bool = True) -> RuleClick:
+        """
+        随机点击
+        :param exclude_click: 排除的点击位置
+        :param click_now: 是否立即点击
+        :return: 随机的点击位置
+        """
+        options = [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM]
+        if exclude_click:
+            options = [option for option in options if option not in exclude_click]
+        target = random.choice(options)
+        if click_now:
+            self.click(target, interval=1.8)
+        return target
 
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas3')
+    c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
 
-    t.switch_buff(c.activity_shikigami.general_climb)
+    t.run()

+ 6 - 6
tasks/Component/BaseActivity/config_activity.py

@@ -33,12 +33,12 @@ class GeneralClimb(ConfigBase):
     # 爬塔运行顺序
     run_sequence: str = Field(default='pass,boss,ap',
                               description='爬塔运行顺序,英文逗号分隔,从左到右运行,若没启用自动跳过对应类型(pass:门票,boss:boss战,ap:体力)')
-    # 门票爬塔buff
-    pass_buff: str = Field(default='buff_4,buff_5', description='门票爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
-    # 体力爬塔buff
-    ap_buff: str = Field(default='buff_4,buff_5', description='体力爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
-    # boss爬塔buff
-    boss_buff: str = Field(default='buff_1,buff_3', description='boss战爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
+    # # 门票爬塔buff
+    # pass_buff: str = Field(default='buff_4,buff_5', description='门票爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
+    # # 体力爬塔buff
+    # ap_buff: str = Field(default='buff_4,buff_5', description='体力爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
+    # # boss爬塔buff
+    # boss_buff: str = Field(default='buff_1,buff_3', description='boss战爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
     # 结束后激活 御魂清理
     active_souls_clean: bool = Field(default=False, description='是否运行结束后清理御魂')
     # 点击战斗随机休息

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

@@ -62,6 +62,19 @@ class CostumeAssets:
 	I_PET_HOUSE_12 = RuleImage(roi_front=(832,275,31,25), roi_back=(742,240,176,109), threshold=0.6, method="Template matching", file="./tasks/Component/Costume/main12/main12_pet_house_12.png")
 
 
+	# Image Rule Assets
+	# description 
+	I_PET_HOUSE_13 = RuleImage(roi_front=(811,271,58,34), roi_back=(810,269,60,37), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main13/main13_pet_house_13.png")
+	# description 
+	I_MAIN_GOTO_TOWN_13 = RuleImage(roi_front=(727,194,24,48), roi_back=(720,191,40,54), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main13/main13_main_goto_town_13.png")
+	# description 
+	I_MAIN_GOTO_SUMMON_13 = RuleImage(roi_front=(968,145,29,44), roi_back=(959,143,47,49), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main13/main13_main_goto_summon_13.png")
+	# description 
+	I_CHECK_MAIN_13 = RuleImage(roi_front=(806,273,64,31), roi_back=(805,273,67,31), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main13/main13_check_main_13.png")
+	# description 
+	I_MAIN_GOTO_EXPLORATION_13 = RuleImage(roi_front=(561,133,24,45), roi_back=(543,125,57,64), threshold=0.6, method="Template matching", file="./tasks/Component/Costume/main13/main13_main_goto_exploration_13.png")
+
+
 	# Image Rule Assets
 	# description 
 	I_CHECK_MAIN_2 = RuleImage(roi_front=(1090,146,48,55), roi_back=(880,108,271,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main2/main2_check_main_2.png")

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

@@ -19,6 +19,7 @@ class MainType(str, Enum):
     COSTUME_MAIN_10 = 'costume_main_10'  # 望月幽庭
     COSTUME_MAIN_11 = 'costume_main_11'  # 鏖刀禁府
     COSTUME_MAIN_12 = 'costume_main_12'  # 龙吟溯玉
+    COSTUME_MAIN_13 = 'costume_main_13'  # 云景阆苑
 
 # 结界皮肤
 class RealmType(str, Enum):

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

@@ -21,7 +21,7 @@ main_costume_model = {
         'I_MAIN_GOTO_SUMMON': f'I_MAIN_GOTO_SUMMON_{i}',
         'I_MAIN_GOTO_TOWN': f'I_MAIN_GOTO_TOWN_{i}',
         'I_PET_HOUSE': f'I_PET_HOUSE_{i}'
-    } for i in range(1, 13)
+    } for i in range(1, 14)
 }
 
 

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

@@ -0,0 +1,47 @@
+[
+  {
+    "itemName": "pet_house_13",
+    "imageName": "main13_pet_house_13.png",
+    "roiFront": "811,271,58,34",
+    "roiBack": "810,269,60,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "main_goto_town_13",
+    "imageName": "main13_main_goto_town_13.png",
+    "roiFront": "727,194,24,48",
+    "roiBack": "720,191,40,54",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "main_goto_summon_13",
+    "imageName": "main13_main_goto_summon_13.png",
+    "roiFront": "968,145,29,44",
+    "roiBack": "959,143,47,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "check_main_13",
+    "imageName": "main13_check_main_13.png",
+    "roiFront": "806,273,64,31",
+    "roiBack": "805,273,67,31",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "main_goto_exploration_13",
+    "imageName": "main13_main_goto_exploration_13.png",
+    "roiFront": "561,133,24,45",
+    "roiBack": "543,125,57,64",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "description"
+  }
+]

binární
tasks/Component/Costume/main13/main13_check_main_13.png


binární
tasks/Component/Costume/main13/main13_main_goto_exploration_13.png


binární
tasks/Component/Costume/main13/main13_main_goto_summon_13.png


binární
tasks/Component/Costume/main13/main13_main_goto_town_13.png


binární
tasks/Component/Costume/main13/main13_pet_house_13.png


+ 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ární
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": "确认按钮"
   }
 ]

+ 11 - 2
tasks/GameUi/assets.py

@@ -181,6 +181,8 @@ class GameUiAssets:
 	I_BACK_ACT_LIST = RuleImage(roi_front=(1165,65,51,47), roi_back=(1124,23,131,133), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_act_list.png")
 	# 下载拓展包弹窗 
 	I_DLC_CLOSE = RuleImage(roi_front=(916,147,24,25), roi_back=(916,147,24,25), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/store_dlc_close.png")
+	# 退出战斗按钮 
+	I_BACK_BATTLE = RuleImage(roi_front=(24,19,40,38), roi_back=(0,0,90,85), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_battle.png")
 
 
 	# Image Rule Assets
@@ -220,8 +222,15 @@ class GameUiAssets:
 
 	# List Rule Assets
 	# 活动列表页文字列表 
-	L_ACT_LIST_OCR = RuleList(folder="./tasks/GameUi/page", direction="vertical", mode="ocr", roi_back=(192,90,190,513), size=(186, 78), 
-					 array=["冰火永烬"])
+	L_ACT_LIST_OCR = RuleList(folder="./tasks/GameUi/page", direction="vertical", mode="ocr", roi_back=(219,91,47,513), size=(42, 78), 
+					 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

+ 120 - 124
tasks/GameUi/game_ui.py

@@ -3,9 +3,9 @@
 # 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
 from module.base.decorator import run_once
 from module.base.timer import Timer
@@ -36,9 +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_climb_act, page_climb_act_2, 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,
@@ -77,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):
         """
         判断庭院界面卷轴是否打开
@@ -126,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)
@@ -147,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)
@@ -177,85 +187,115 @@ 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()
-
-            # 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
+        try_close_unknown_timer = Timer(3).start()
+        # 构建路径映射并排序
+        paths = self.build_reverse_paths(destination)
 
-            # 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 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
-            sleep(0.5)
+            # 尝试关闭未知页面
+            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:")
+                show_paths: str = ''.join([f"{p.name} -> " for p in path])
+                logger.info(f" {show_paths}")
+                if self._execute_path(path, confirm_timer, timeout_timer):
+                    return True
+            sleep(0.3)
+        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: list, 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')
+                sleep(0.3)
+            # 执行页面跳转
+            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])
 
     # ------------------------------------------------------------------------------------------------------------------
     # 下面的这些是一些特殊的页面,需要额外处理
@@ -280,47 +320,6 @@ class GameUi(BaseTask, GameUiAssets):
         time.sleep(1)
         return
 
-    def main_goto_act_by_list(self, dest_act: Page):
-        """
-        庭院通过活动列表页跳转到对应活动页面
-        :param dest_act: 活动页面
-        :return:
-        """
-        # key: page名称, value: (活动列表中文字, 活动列表中png图像名称)
-        # png图像必须存放在page文件夹下
-        # 添加其他活动列表页的活动时需同时添加下方map内容
-        act_map = {
-            'page_climb_act': ('冰火永烬', 'page_act_list_climb_act')
-        }
-        self.ui_get_current_page()
-        self.ui_goto(page_act_list)
-        # 获取活动页面在活动列表中的文字和图标
-        text, png = act_map[dest_act.name]
-        ok_cnt, max_retry = 0, 3
-        while True:
-            # 多次成功才算成功
-            if ok_cnt >= max_retry:
-                break
-            self.screenshot()
-            # 先尝试文字识别,失败则尝试图像识别,都失败则向下滑动
-            result = self.L_ACT_LIST_OCR.ocr_appear(self.device.image, name=text)
-            if not isinstance(result, tuple):
-                result = self.L_ACT_LIST_IMG.image_appear(self.device.image, name=png)
-            if isinstance(result, tuple):
-                pos = result
-                ok_cnt += 1
-            else:
-                ok_cnt = 0
-            # 一次都未成功则向下滑动
-            if ok_cnt == 0:
-                x1, y1, x2, y2 = self.L_ACT_LIST_OCR.swipe_pos(number=1)
-                self.device.swipe(p1=(x1, y1), p2=(x2, y2))
-            sleep(0.5)
-        if isinstance(pos, tuple):
-            x, y = pos
-            self.device.click(x, y)
-        self.ui_goto(dest_act, confirm_wait=2)
-
 
 if __name__ == '__main__':
     from module.config.config import Config
@@ -331,6 +330,3 @@ if __name__ == '__main__':
     game = GameUi(config=c, device=d)
     game.ui_get_current_page()
     game.ui_goto(page_main)
-    game.main_goto_act_by_list(page_climb_act)
-    game.ui_get_current_page()
-    game.ui_goto(page_climb_act_pass)

+ 55 - 17
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,29 +188,35 @@ 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_TOGGLE_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.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
+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, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
-page_climb_act_2.link(button=G.I_BACK_Y, destination=page_climb_act)
+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, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
+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.O_ENTRY_ACTIVITY, destination=page_climb_act_pass)
+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)
 # 体力, 门票互相跳转
-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)
+# 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)
 # 爬塔活动boss战界面
 page_climb_act_boss = Page(asa.I_CHECK_BOSS)
 page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
@@ -218,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)

binární
tasks/GameUi/page/climb_act.png


binární
tasks/GameUi/page/page_act_list_climb_act.png


binární
tasks/GameUi/page/page_back_battle.png


+ 9 - 0
tasks/GameUi/page/page_img_3.json

@@ -196,5 +196,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "下载拓展包弹窗"
+  },
+  {
+    "itemName": "back_battle",
+    "imageName": "page_back_battle.png",
+    "roiFront": "24,19,40,38",
+    "roiBack": "0,0,90,85",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "退出战斗按钮"
   }
 ]

+ 3 - 3
tasks/GameUi/page/page_list_act_ocr.json

@@ -2,12 +2,12 @@
   "name": "act_list_ocr",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "192,90,190,513",
+  "roiBack": "219,91,47,513",
   "description": "活动列表页文字列表",
   "list": [
     {
-      "itemName": "冰火永烬",
-      "roiFront": "194,361,186,78"
+      "itemName": "日之",
+      "roiFront": "221,212,42,78"
     }
   ]
 }

+ 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": "战斗页面手动标志"
+  }
+]

+ 19 - 8
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()
@@ -201,7 +200,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         return appear
 
     def wait_until_appear(self,
-                          target: RuleImage,
+                          target: RuleImage | RuleOcr,
                           skip_first_screenshot=False,
                           wait_time: int = None) -> bool:
         """
@@ -223,7 +222,9 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             if wait_timer and wait_timer.reached():
                 logger.warning(f"Wait until appear {target.name} timeout")
                 return False
-            if self.appear(target):
+            if isinstance(target, RuleImage) and self.appear(target):
+                return True
+            if isinstance(target, RuleOcr) and self.ocr_appear(target):
                 return True
 
     def wait_until_appear_then_click(self,
@@ -493,6 +494,16 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 self.device.swipe(p1=(x1, y1), p2=(x2, y2))
                 sleep(1)  # 等待滑动完成, 还没想好如何优化
 
+    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):
+            x, y = appear
+            self.device.click(x, y)
+            return True
+        return False
+
     def set_next_run(self, task: str, finish: bool = False,
                      success: bool = None, server: bool = True, target: datetime = None) -> None:
         """