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

refactor(GameUI): change screenshot method

Azure 1 год назад
Родитель
Сommit
f49fd06e33
3 измененных файлов с 17 добавлено и 9 удалено
  1. 1 1
      tasks/ActivityShikigami/script_task.py
  2. 4 4
      tasks/GameUi/game_ui.py
  3. 12 4
      tasks/base_task.py

+ 1 - 1
tasks/ActivityShikigami/script_task.py

@@ -246,7 +246,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         timeout_timer = Timer(6).start()
         exit_clicked = False
         while not timeout_timer.reached():
-            self.screenshot(skip_first)
+            self.maybe_screenshot(skip_first)
             skip_first = False
             # 不在战斗界面, 认为退出成功
             if not self.is_in_battle(False):

+ 4 - 4
tasks/GameUi/game_ui.py

@@ -85,7 +85,7 @@ class GameUi(BaseTask, GameUiAssets):
         """
         判断当前页面是否为page
         """
-        self.screenshot(skip_first_screenshot)
+        self.maybe_screenshot(skip_first_screenshot)
         if isinstance(page.check_button, list):
             for button in page.check_button:
                 if self.appear(button, interval):
@@ -152,7 +152,7 @@ class GameUi(BaseTask, GameUiAssets):
 
         timeout = Timer(10, count=20).start()
         while 1:
-            self.screenshot(skip_first_screenshot)
+            self.maybe_screenshot(skip_first_screenshot)
             skip_first_screenshot = False
             # 如果20S还没有到底,那么就抛出异常
             if timeout.reached():
@@ -269,7 +269,7 @@ class GameUi(BaseTask, GameUiAssets):
         尝试关闭未知界面
         :return: 执行了关闭返回True, 否则False
         """
-        self.screenshot(skip_screenshot)
+        self.maybe_screenshot(skip_screenshot)
         timer = Timer(None).start()
         for close in self.ui_close:
             if self.appear_then_click(close, interval=1.5):
@@ -349,7 +349,7 @@ class GameUi(BaseTask, GameUiAssets):
         :param skip_first_screenshot: 是否跳过首次截图
         :return: 是否成功操作
         """
-        self.screenshot(skip_first_screenshot)
+        self.maybe_screenshot(skip_first_screenshot)
         operated = False
         if isinstance(target, RuleList):
             operated = self.list_appear_click(target, interval=interval)

+ 12 - 4
tasks/base_task.py

@@ -115,14 +115,12 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             self.set_next_run(task='WantedQuests', target=datetime.now().replace(microsecond=0))
         return True
 
-    def screenshot(self, soft_skip: bool = False):
+    def screenshot(self):
         """
         截图 引入中间函数的目的是 为了解决如协作的这类突发的事件
-        :param soft_skip: True跳过截图(但保证设备一定有图才跳过,否则依然截图)
         :return:
         """
-        if not soft_skip or not self.exist_image():
-            self.device.screenshot()
+        self.device.screenshot()
         # 判断勾协
         self._burst()
 
@@ -138,6 +136,16 @@ class BaseTask(GlobalGameAssets, CostumeBase):
 
         return self.device.image
 
+    def maybe_screenshot(self, soft_skip: bool = False):
+        """
+        可能截图
+        :param soft_skip: True跳过截图(但保证设备一定有图才跳过,否则依然截图)
+        :return:
+        """
+        if not soft_skip or not self.exist_image():
+            return self.screenshot()
+        return self.device.image
+
     def exist_image(self) -> bool:
         """
         判断当前设备是否有图片