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

Merge pull request #1234 from BluettDream/dev_dailytrifles

DailyTrifles
huangrunheng 1 год назад
Родитель
Сommit
1b95e65015
2 измененных файлов с 10 добавлено и 6 удалено
  1. 8 0
      tasks/DailyTrifles/page.py
  2. 2 6
      tasks/DailyTrifles/script_task.py

+ 8 - 0
tasks/DailyTrifles/page.py

@@ -0,0 +1,8 @@
+from tasks.DailyTrifles.assets import DailyTriflesAssets
+from tasks.GameUi.assets import GameUiAssets
+from tasks.GameUi.page import Page, page_mall
+
+# 商店礼包屋页面
+page_store_gift_room = Page(DailyTriflesAssets.I_GIFT_RECOMMEND)
+page_store_gift_room.link(button=GameUiAssets.I_BACK_Y, destination=page_mall)
+page_mall.link(button=DailyTriflesAssets.I_ROOM_GIFT, destination=page_store_gift_room)

+ 2 - 6
tasks/DailyTrifles/script_task.py

@@ -6,6 +6,7 @@ from time import sleep
 from datetime import time, datetime, timedelta
 from datetime import time, datetime, timedelta
 
 
 from exceptiongroup import catch
 from exceptiongroup import catch
+from tasks.DailyTrifles.page import page_store_gift_room
 from winerror import NOERROR
 from winerror import NOERROR
 
 
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
@@ -225,12 +226,7 @@ class ScriptTask(GameUi, Summon, DailyTriflesAssets):
 
 
     def run_store_sign(self):
     def run_store_sign(self):
 
 
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_GIFT_RECOMMEND):
-                break
-            if self.appear_then_click(self.I_ROOM_GIFT, interval=1):
-                continue
+        self.ui_goto_page(page_store_gift_room)
         self.screenshot()
         self.screenshot()
         self.appear_then_click(self.I_GIFT_RECOMMEND, interval=1)
         self.appear_then_click(self.I_GIFT_RECOMMEND, interval=1)
         logger.info('Enter store sign')
         logger.info('Enter store sign')