Przeglądaj źródła

feat(GameUI): add parameter for random_click and delete unusable method

Azure 1 rok temu
rodzic
commit
e4a048f7da
2 zmienionych plików z 5 dodań i 47 usunięć
  1. 0 45
      tasks/GameUi/game_ui.py
  2. 5 2
      tasks/GameUi/page.py

+ 0 - 45
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:
         """
         """
         获取当前页面
         获取当前页面

+ 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