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

fix :在查找人数最多的悬赏鬼王时,没有正确的关闭鬼王详情界面,导致挑战错误的悬赏鬼王

ChengRanORZ 2 лет назад
Родитель
Сommit
a924794e84
2 измененных файлов с 22 добавлено и 6 удалено
  1. 10 6
      tasks/AreaBoss/script_task.py
  2. 12 0
      tasks/FindJade/assets.py

+ 10 - 6
tasks/AreaBoss/script_task.py

@@ -278,6 +278,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.open_filter()
         for i in range(random.randint(1, 3)):
             self.swipe(self.S_AB_FILTER_UP)
+        self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, wait_time=1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
@@ -285,6 +286,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.open_filter()
         for i in range(random.randint(1, 3)):
             self.swipe(self.S_AB_FILTER_UP)
+        self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, wait_time=1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
@@ -308,12 +310,14 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         # 如果鬼王不可挑战(未解锁),限制3次尝试打开鬼王详情界面
         numTry = 0
         while numTry < 3:
-            self.screenshot()
-            if self.appear(self.I_AB_CLOSE_RED):
-                break
             if self.click(click_area, interval=2):
                 numTry += 1
-        if numTry >= 3:
+                if self.wait_until_appear(self.I_AB_CLOSE_RED, True, 2):
+                    break
+
+        self.screenshot()
+        if numTry >= 3 and not self.appear(self.I_AB_CLOSE_RED):
+            logger.info("%s unavailable", str(click_area))
             return 0
         return self.O_AB_NUM_OF_CHALLENGE.ocr_digit(self.device.image)
 
@@ -360,10 +364,10 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas2')
+    c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
-    time.sleep(3)
+    # time.sleep(3)
     # t.switchFloor2One()
     # t.switch2Level60()
     t.run()

+ 12 - 0
tasks/FindJade/assets.py

@@ -0,0 +1,12 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class FindJadeAssets: 
+	pass
+