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

Merge pull request #1203 from BluettDream/dev_fix_weekly

fix(WeeklyTrifles): broken amulet error
huangrunheng 1 год назад
Родитель
Сommit
9d601ba566

+ 1 - 1
tasks/GameUi/page.py

@@ -251,7 +251,7 @@ def random_click(low: int = None, high: int = None) -> RuleClick | list[RuleClic
     :return: RuleClick或者RuleClick的数组
     """
     click = random.choice([asa.C_RANDOM_LEFT, asa.C_RANDOM_RIGHT, asa.C_RANDOM_TOP])
-    click.name = "BATTLE_RANDOM"
+    click.name = "SAFE_RANDOM_CLICK"
     if low is None or high is None:
         return click
     return [click for _ in range(random.randint(low, high))]

+ 4 - 0
tasks/WeeklyTrifles/assets.py

@@ -35,6 +35,8 @@ class WeeklyTriflesAssets:
 	I_BM_CONFIRM = RuleImage(roi_front=(418,620,173,59), roi_back=(418,620,173,59), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_confirm.png")
 	# 再次召唤 
 	I_BM_AGAIN = RuleImage(roi_front=(686,617,178,60), roi_back=(686,617,178,60), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_again.png")
+	# 破碎符咒召唤次数选择标志 
+	I_BMT_CHECK = RuleImage(roi_front=(742,571,32,33), roi_back=(644,565,276,41), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bmt_check.png")
 
 
 	# Ocr Rule Assets
@@ -42,6 +44,8 @@ class WeeklyTriflesAssets:
 	O_BA_AMOUNT_1 = RuleOcr(roi=(535,11,124,36), area=(535,11,124,36), mode="Digit", method="Default", keyword="", name="ba_amount_1")
 	# 召唤的时候的数量 
 	O_BA_AMOUNT_2 = RuleOcr(roi=(762,570,125,35), area=(762,570,125,35), mode="DigitCounter", method="Default", keyword="", name="ba_amount_2")
+	# 破碎符咒召唤次数 
+	O_BA_TIMES = RuleOcr(roi=(741,564,174,44), area=(641,566,278,41), mode="Full", method="Default", keyword="", name="ba_times")
 
 
 	# Click Rule Assets

BIN
tasks/WeeklyTrifles/broken_amulet/broken_amulet_bmt_check.png


+ 9 - 0
tasks/WeeklyTrifles/broken_amulet/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "再次召唤"
+  },
+  {
+    "itemName": "bmt_check",
+    "imageName": "broken_amulet_bmt_check.png",
+    "roiFront": "742,571,32,33",
+    "roiBack": "644,565,276,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "破碎符咒召唤次数选择标志"
   }
 ]

+ 9 - 0
tasks/WeeklyTrifles/broken_amulet/ocr.json

@@ -16,5 +16,14 @@
     "method": "Default",
     "keyword": "",
     "description": "召唤的时候的数量"
+  },
+  {
+    "itemName": "ba_times",
+    "roiFront": "741,564,174,44",
+    "roiBack": "641,566,278,41",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "破碎符咒召唤次数"
   }
 ]

+ 51 - 39
tasks/WeeklyTrifles/script_task.py

@@ -2,13 +2,14 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+from time import sleep
 
 from module.exception import TaskEnd
 from module.logger import logger
 from module.base.timer import Timer
 
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_collection, page_area_boss, page_secret_zones, page_summon
+from tasks.GameUi.page import page_main, page_collection, page_area_boss, page_secret_zones, page_summon, random_click
 from tasks.WeeklyTrifles.config import Trifles
 from tasks.WeeklyTrifles.assets import WeeklyTriflesAssets
 
@@ -203,14 +204,14 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         # 返回
         self.ui_click(self.I_UI_BACK_BLUE, self.I_CHECK_MAIN)
 
-    def _broken_amulet(self, num: int):
+    def _broken_amulet(self, dest_num: int):
         """
 
-        :param num:
+        :param dest_num:
         :return:
         """
-        def click_confirm():
-            self.wait_until_appear(self.I_BM_CONFIRM)
+        def exit_amulet():
+            self.wait_until_appear(self.I_BM_CONFIRM, wait_time=3)
             while 1:
                 self.screenshot()
                 if not self.appear(self.I_BM_CONFIRM):
@@ -223,47 +224,58 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         self.ui_get_current_page()
         self.ui_goto(page_summon)
         self.screenshot()
-        number = self.O_BA_AMOUNT_1.ocr(self.device.image)
-        if number == 0:
+        real_num = self.O_BA_AMOUNT_1.ocr(self.device.image)
+        if real_num <= 0:
             logger.warning('No broken amulet')
             return
-        logger.info(f'Broken amulet: {number}')
+        logger.info(f'Broken amulet: {real_num}')
         count = 0
         self.wait_until_appear(self.I_BM_ENTER)
-        while 1:
-            self.screenshot()
-            if not self.appear(self.I_BM_ENTER):
-                break
-            if self.appear_then_click(self.I_BM_ENTER, interval=1):
-                continue
-        count += 10
         logger.info('Enter broken amulet')
-        while 1:
+        while count < dest_num:
             self.screenshot()
-            time.sleep(0.5)
-
-            if not self.appear(self.I_BM_CONFIRM):
-                continue
-            if count >= num:
-                logger.info(f'Broken amulet finished: {count}')
-                click_confirm()
-                break
-            cu, re, total = self.O_BA_AMOUNT_2.ocr(self.device.image)
-            if cu <= 10 and total == 10:
-                logger.info(f'Broken amulet count: {count}. Current: {cu}. Total: {total}')
-                click_confirm()
-                break
-            if self.appear_then_click(self.I_BM_AGAIN, interval=1):
-                logger.info(f'Broken amulet count: {count}. Current: {cu}')
+            real_num = self.O_BA_AMOUNT_1.ocr(self.device.image)
+            if real_num <= 0:
+                exit_amulet()
+                return
+            if self.appear_then_click(self.I_BM_ENTER, interval=1) or self.appear_then_click(self.I_BM_AGAIN, interval=1):
+                sleep(0.4)  # 等待动画开始
+                timeout_timer = Timer(5).start()
+                # 随机点击直到再次召唤出现或者超时
+                while not timeout_timer.reached():
+                    if not self.click(random_click(), interval=0.8):
+                        continue
+                    self.screenshot()
+                    if self.appear(self.I_BM_AGAIN, interval=0.8):
+                        break
+                else:
+                    logger.warning(f'Wait for again timeout:Count[{count}], Remain[{real_num}]')
+                    exit_amulet()
+                    return
+            else:
+                # 既没有出现召唤破碎符咒也没有出现再次召唤, 则退出(一般不会出现这种情况, 只是为了异常处理)
+                exit_amulet()
+                return
+            x_10, _, _, _ = self.O_BA_TIMES.ocr(self.device.image, '10次')
+            x_50, _, _, _ = self.O_BA_TIMES.ocr(self.device.image, '50次')
+            self.I_BMT_CHECK.match(self.device.image)
+            x_check, y_check, width_check, height_check = self.I_BMT_CHECK.roi_front
+            selected_10 = min(abs(x_10 - x_check), abs(x_50 - x_check)) == abs(x_10 - x_check)
+            logger.info(f'Current selected {"10" if selected_10 else "50"} amulet')
+            count += 10 if selected_10 else 50
+            logger.info(f'Broken amulet:Count[{count}], Remain[{real_num}]')
+            # 一次50票不超过限制且当前选择的是10票则切换50票
+            if count + 50 < dest_num and selected_10:
+                logger.hr('Switch to 50 amulet')
+                self.device.click(x=x_50 - width_check // 2, y=y_check + height_check // 2, control_name='Click_50')
                 self.device.click_record_clear()
-                count += 10
-                continue
-
-
-
-
-
-
+            # 一次50票会超过限制且当前选择的是50票则切换10票
+            if count + 50 >= dest_num and not selected_10:
+                logger.hr('Switch to 10 amulet')
+                self.device.click(x=x_10 - width_check // 2, y=y_check + height_check // 2, control_name='Click_10')
+                self.device.click_record_clear()
+        # 正常结束且还有票, 则执行一次退出
+        exit_amulet()
 
 
 if __name__ == '__main__':