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

Merge pull request #1232 from BluettDream/dev_talismanpass

TalismanPass
huangrunheng 1 год назад
Родитель
Сommit
080e330eb3

+ 2 - 2
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -52,10 +52,10 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
             if self.appear(check_selected):
             if self.appear(check_selected):
                 break
                 break
             if self.appear(check_click, interval=1):
             if self.appear(check_click, interval=1):
-                if self.wait_until_pos_stable(check_click, stable_time=0.8, timeout=3):
+                if self.wait_until_pos_stable(check_click, stable_time=0.8, timeout=2.5):
                     self.click(check_click)
                     self.click(check_click)
                 continue
                 continue
-            if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3):
+            if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3.5):
                 continue
                 continue
         logger.info('Select shikigami class: %s' % shikigami_class)
         logger.info('Select shikigami class: %s' % shikigami_class)
 
 

+ 0 - 68
tasks/GameUi/game_ui.py

@@ -64,34 +64,6 @@ class GameUi(BaseTask, GameUiAssets):
     def ui_pages(self) -> list[Page]:
     def ui_pages(self) -> list[Page]:
         return PageRegistry.all()
         return PageRegistry.all()
 
 
-    def home_explore(self) -> bool:
-        """
-        使用ocr识别到探索按钮并点击
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.ocr_appear_click(self.O_HOME_EXPLORE, interval=2):
-                continue
-            if self.appear(self.I_BACK_BLUE, threshold=0.6):
-                break
-        logger.info(f'Click {self.O_HOME_EXPLORE.name}')
-        return True
-
-    def explore_home(self) -> bool:
-        """
-
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_BACK_BLUE, threshold=0.6, interval=2):
-                continue
-            if self.appear(self.I_HOME_SHIKIKAMI, threshold=0.6):
-                break
-        logger.info(f'Click {self.I_HOME_SHIKIKAMI.name}')
-        return True
-
     def ui_page_appear(self, page: Page, skip_first_screenshot: bool = True, interval: float = None):
     def ui_page_appear(self, page: Page, skip_first_screenshot: bool = True, interval: float = None):
         """
         """
         判断当前页面是否为page
         判断当前页面是否为page
@@ -122,23 +94,6 @@ class GameUi(BaseTask, GameUiAssets):
             skip_first_screenshot = False
             skip_first_screenshot = False
         return False
         return False
 
 
-    def ensure_scroll_open(self):
-        """
-        判断庭院界面卷轴是否打开
-        """
-        return self.appear(RestartAssets.I_LOGIN_SCROOLL_CLOSE)
-
-    def ensure_button_execute(self, button):
-        """
-        确保button执行
-        """
-        if isinstance(button, RuleImage) and self.appear(button):
-            return True
-        elif callable(button) and button():
-            return True
-        else:
-            return False
-
     def ui_get_current_page(self, skip_first_screenshot=True) -> Page:
     def ui_get_current_page(self, skip_first_screenshot=True) -> Page:
         """
         """
         获取当前页面
         获取当前页面
@@ -382,29 +337,6 @@ class GameUi(BaseTask, GameUiAssets):
             operated = self.click(target, interval=interval)
             operated = self.click(target, interval=interval)
         return operated
         return operated
 
 
-    # ------------------------------------------------------------------------------------------------------------------
-    # 下面的这些是一些特殊的页面,需要额外处理
-    # ------------------------------------------------------------------------------------------------------------------
-
-    def main_goto_daily(self):
-        """
-        无法直接一步到花合战,需要先到主页,然后再到花合战
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_CHECK_DAILY):
-                break
-            if self.appear_then_click(self.I_MAIN_GOTO_DAILY, interval=1):
-                continue
-            if self.ocr_appear_click(self.O_CLICK_CLOSE_1, interval=1):
-                continue
-            if self.ocr_appear_click(self.O_CLICK_CLOSE_2, interval=1):
-                continue
-        logger.info('Page arrive: Daily')
-        time.sleep(1)
-        return
-
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config

+ 5 - 2
tasks/GameUi/page.py

@@ -1,3 +1,5 @@
+from itertools import compress
+
 import random
 import random
 
 
 import traceback
 import traceback
@@ -212,12 +214,13 @@ page_act_list_climb_act.link(button=G.I_BACK_ACT_LIST, destination=page_main)
 page_battle = Page(GeneralBattleAssets.I_BATTLE_INFO)
 page_battle = Page(GeneralBattleAssets.I_BATTLE_INFO)
 
 
 
 
-def random_click(low: int = None, high: int = None) -> RuleClick | list[RuleClick]:
+def random_click(low: int = None, high: int = None, ltrb: tuple = (True, False, True, False)) -> RuleClick | list[RuleClick]:
     """
     """
     随机生成RuleClick, 不传入参数则返回1个RuleClick, 传入参数则生成范围内的click数组
     随机生成RuleClick, 不传入参数则返回1个RuleClick, 传入参数则生成范围内的click数组
     :return: RuleClick或者RuleClick的数组
     :return: RuleClick或者RuleClick的数组
     """
     """
-    click = random.choice([asa.C_RANDOM_LEFT, asa.C_RANDOM_RIGHT, asa.C_RANDOM_TOP])
+    click_area_list = [asa.C_RANDOM_LEFT, asa.C_RANDOM_TOP, asa.C_RANDOM_RIGHT, asa.C_RANDOM_BOTTOM]
+    click = random.choice(list(compress(click_area_list, ltrb)))
     click.name = "SAFE_RANDOM_CLICK"
     click.name = "SAFE_RANDOM_CLICK"
     if low is None or high is None:
     if low is None or high is None:
         return click
         return click

+ 3 - 5
tasks/TalismanPass/script_task.py

@@ -12,12 +12,11 @@ from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 from module.base.timer import Timer
 from module.base.timer import Timer
 
 
+
 class ScriptTask(GameUi, TalismanPassAssets):
 class ScriptTask(GameUi, TalismanPassAssets):
 
 
     def run(self):
     def run(self):
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
-        self.main_goto_daily()
+        self.ui_goto_page(page_daily)
         con: TalismanConfig = self.config.talisman_pass.talisman
         con: TalismanConfig = self.config.talisman_pass.talisman
 
 
         # 收取全部奖励
         # 收取全部奖励
@@ -27,12 +26,11 @@ class ScriptTask(GameUi, TalismanPassAssets):
         self.get_flower(con.level_reward)
         self.get_flower(con.level_reward)
         # 收取1500签御魂
         # 收取1500签御魂
         if con.harvest_soul:
         if con.harvest_soul:
-            self.ui_goto(page_main)
+            self.ui_goto_page(page_main)
             self.harvest_soul()
             self.harvest_soul()
         self.set_next_run(task='TalismanPass', success=True, finish=True)
         self.set_next_run(task='TalismanPass', success=True, finish=True)
         raise TaskEnd('TalismanPass')
         raise TaskEnd('TalismanPass')
 
 
-
     def get_all(self):
     def get_all(self):
         """
         """
         一键收取所有的
         一键收取所有的