瀏覽代碼

fix: invite friend failed while in pos-1
get challenge number of 5th reward-boss failed

ChengRanORZ 2 年之前
父節點
當前提交
37445729df
共有 3 個文件被更改,包括 13 次插入 和 6 次删除
  1. 10 3
      tasks/AreaBoss/script_task.py
  2. 1 1
      tasks/WantedQuests/assets.py
  3. 2 2
      tasks/WantedQuests/invite/image.json

+ 10 - 3
tasks/AreaBoss/script_task.py

@@ -5,6 +5,7 @@ import time
 
 
 import cv2
 import cv2
 import numpy as np
 import numpy as np
+import random
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
@@ -226,6 +227,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
 
     def fight_reward_boss(self):
     def fight_reward_boss(self):
         index = self.get_hot_in_reward()
         index = self.get_hot_in_reward()
+        self.open_filter()
         # 滑动到最顶层
         # 滑动到最顶层
         if index < 3:
         if index < 3:
             logger.info("swipe to top")
             logger.info("swipe to top")
@@ -257,26 +259,31 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
         lst.append(num)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        #
         self.open_filter()
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
         lst.append(num)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        #
         self.open_filter()
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
         lst.append(num)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        #
         self.open_filter()
         self.open_filter()
-        for i in range(3):
+        for i in range(random.randint(1, 3)):
             self.swipe(self.S_AB_FILTER_UP)
             self.swipe(self.S_AB_FILTER_UP)
-
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
         lst.append(num)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        #
         self.open_filter()
         self.open_filter()
+        for i in range(random.randint(1, 3)):
+            self.swipe(self.S_AB_FILTER_UP)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
         lst.append(num)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
-        self.open_filter()
+
         index = 0
         index = 0
         num = 0
         num = 0
         for idx, val in enumerate(lst):
         for idx, val in enumerate(lst):

+ 1 - 1
tasks/WantedQuests/assets.py

@@ -79,7 +79,7 @@ class WantedQuestsAssets:
 	# 悬赏封印邀请取消按钮 
 	# 悬赏封印邀请取消按钮 
 	I_WQ_INVITE_CANCEL = RuleImage(roi_front=(230,540,132,60), roi_back=(230,540,140,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_cancel.png")
 	I_WQ_INVITE_CANCEL = RuleImage(roi_front=(230,540,132,60), roi_back=(230,540,140,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_cancel.png")
 	# 邀请好友被选中标记 
 	# 邀请好友被选中标记 
-	I_WQ_INVITE_SELECTED = RuleImage(roi_front=(380,185,32,32), roi_back=(380,185,345,350), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_selected.png")
+	I_WQ_INVITE_SELECTED = RuleImage(roi_front=(380,170,32,32), roi_back=(380,170,360,375), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_selected.png")
 	# 邀请同服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	# 邀请同服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	I_WQ_INVITE_SAME_SVR = RuleImage(roi_front=(170,90,60,35), roi_back=(170,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_same_svr.png")
 	I_WQ_INVITE_SAME_SVR = RuleImage(roi_front=(170,90,60,35), roi_back=(170,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_same_svr.png")
 	# 邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
 	# 邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 

+ 2 - 2
tasks/WantedQuests/invite/image.json

@@ -92,8 +92,8 @@
   {
   {
     "itemName": "wq_invite_selected",
     "itemName": "wq_invite_selected",
     "imageName": "wq_invite_selected.png",
     "imageName": "wq_invite_selected.png",
-    "roiFront": "380,185,32,32",
-    "roiBack": "380,185,345,350",
+    "roiFront": "380,170,32,32",
+    "roiBack": "380,170,360,375",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "邀请好友被选中标记"
     "description": "邀请好友被选中标记"