Browse Source

fix(task): update Wanted Quests

runhey 3 years ago
parent
commit
572c6aa8ad

+ 1 - 0
module/atom/image.py

@@ -118,6 +118,7 @@ class RuleImage:
         mat = self.image
         res = cv2.matchTemplate(source, mat, cv2.TM_CCOEFF_NORMED)
         min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)  # 最小匹配度,最大匹配度,最小匹配度的坐标,最大匹配度的坐标
+        # logger.attr(self.name, max_val)
         if max_val > threshold:
             self.roi_front[0] = max_loc[0] + self.roi_back[0]
             self.roi_front[1] = max_loc[1] + self.roi_back[1]

+ 22 - 3
tasks/WantedQuests/assets.py

@@ -16,9 +16,9 @@ class WantedQuestsAssets:
 	# 悬赏封印 
 	O_WQ_WANTED = RuleOcr(roi=(9,145,123,381), area=(9,145,123,381), mode="Full", method="Default", keyword="", name="wq_wanted")
 	# Ocr-description 
-	O_WQ_TEXT_1 = RuleOcr(roi=(19,233,100,32), area=(19,233,100,32), mode="Single", method="Default", keyword="悬赏封印", name="wq_text_1")
+	O_WQ_TEXT_1 = RuleOcr(roi=(67,233,52,32), area=(67,233,52,32), mode="Single", method="Default", keyword="封印", name="wq_text_1")
 	# Ocr-description 
-	O_WQ_TEXT_2 = RuleOcr(roi=(20,377,98,32), area=(20,377,98,32), mode="Single", method="Default", keyword="悬赏封印", name="wq_text_2")
+	O_WQ_TEXT_2 = RuleOcr(roi=(66,377,52,32), area=(66,377,52,32), mode="Single", method="Default", keyword="封印", name="wq_text_2")
 	# Ocr-description 
 	O_WQ_NUM_1 = RuleOcr(roi=(32,260,72,27), area=(32,260,72,27), mode="DigitCounter", method="Default", keyword="", name="wq_num_1")
 	# Ocr-description 
@@ -50,6 +50,25 @@ class WantedQuestsAssets:
 	I_WQC_FIRE = RuleImage(roi_front=(893,503,123,64), roi_back=(871,485,164,91), threshold=0.7, method="Template matching", file="./tasks/WantedQuests/chanllenge/chanllenge_wqc_fire.png")
 
 
+	# Image Rule Assets
+	# description 
+	I_WQ_INVITE_1 = RuleImage(roi_front=(137,361,39,47), roi_back=(108,338,100,100), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_invite_1.png")
+	# description 
+	I_WQ_INVITE_2 = RuleImage(roi_front=(462,361,37,47), roi_back=(435,336,100,100), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_invite_2.png")
+	# description 
+	I_WQ_INVITE_3 = RuleImage(roi_front=(754,366,39,42), roi_back=(728,339,100,100), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_invite_3.png")
+	# description 
+	I_WQ_FIREND_1 = RuleImage(roi_front=(449,191,172,70), roi_back=(449,191,172,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_1.png")
+	# description 
+	I_WQ_FIREND_2 = RuleImage(roi_front=(743,192,172,69), roi_back=(743,192,172,69), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_2.png")
+	# description 
+	I_WQ_FIREND_3 = RuleImage(roi_front=(453,281,175,71), roi_back=(453,281,175,71), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_3.png")
+	# description 
+	I_WQ_FIREND_4 = RuleImage(roi_front=(743,280,171,76), roi_back=(743,280,171,76), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_4.png")
+	# description 
+	I_WQ_FIREND_5 = RuleImage(roi_front=(479,376,148,56), roi_back=(479,376,148,56), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_5.png")
+
+
 	# Image Rule Assets
 	# 封印 
 	I_WQ_SEAL = RuleImage(roi_front=(244,181,40,40), roi_back=(56,152,664,396), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_wq_seal.png")
@@ -74,7 +93,7 @@ class WantedQuestsAssets:
 	# description 
 	I_GOTO_4 = RuleImage(roi_front=(979,447,87,42), roi_back=(979,447,87,42), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_goto_4.png")
 	# 判断是否还有任务 
-	I_WQ_CHECK_TASK = RuleImage(roi_front=(106,296,24,113), roi_back=(73,122,69,427), threshold=0.85, method="Template matching", file="./tasks/WantedQuests/wq/wq_wq_check_task.png")
+	I_WQ_CHECK_TASK = RuleImage(roi_front=(110,154,21,125), roi_back=(73,122,69,459), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/wq/wq_wq_check_task.png")
 
 
 	# Image Rule Assets

+ 74 - 0
tasks/WantedQuests/invite/image.json

@@ -0,0 +1,74 @@
+[
+  {
+    "itemName": "wq_invite_1",
+    "imageName": "invite_wq_invite_1.png",
+    "roiFront": "137,361,39,47",
+    "roiBack": "108,338,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "wq_invite_2",
+    "imageName": "invite_wq_invite_2.png",
+    "roiFront": "462,361,37,47",
+    "roiBack": "435,336,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "wq_invite_3",
+    "imageName": "invite_wq_invite_3.png",
+    "roiFront": "754,366,39,42",
+    "roiBack": "728,339,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "wq_firend_1",
+    "imageName": "invite_wq_firend_1.png",
+    "roiFront": "449,191,172,70",
+    "roiBack": "449,191,172,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "wq_firend_2",
+    "imageName": "invite_wq_firend_2.png",
+    "roiFront": "743,192,172,69",
+    "roiBack": "743,192,172,69",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "wq_firend_3",
+    "imageName": "invite_wq_firend_3.png",
+    "roiFront": "453,281,175,71",
+    "roiBack": "453,281,175,71",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "wq_firend_4",
+    "imageName": "invite_wq_firend_4.png",
+    "roiFront": "743,280,171,76",
+    "roiBack": "743,280,171,76",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "wq_firend_5",
+    "imageName": "invite_wq_firend_5.png",
+    "roiFront": "479,376,148,56",
+    "roiBack": "479,376,148,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/WantedQuests/invite/invite_wq_invite_1.png


BIN
tasks/WantedQuests/invite/invite_wq_invite_2.png


BIN
tasks/WantedQuests/invite/invite_wq_invite_3.png


+ 6 - 6
tasks/WantedQuests/ocr.json

@@ -19,20 +19,20 @@
   },
   {
     "itemName": "wq_text_1",
-    "roiFront": "19,233,100,32",
-    "roiBack": "19,233,100,32",
+    "roiFront": "67,233,52,32",
+    "roiBack": "67,233,52,32",
     "mode": "Single",
     "method": "Default",
-    "keyword": "悬赏封印",
+    "keyword": "封印",
     "description": "Ocr-description"
   },
   {
     "itemName": "wq_text_2",
-    "roiFront": "20,377,98,32",
-    "roiBack": "20,377,98,32",
+    "roiFront": "66,377,52,32",
+    "roiBack": "66,377,52,32",
     "mode": "Single",
     "method": "Default",
-    "keyword": "悬赏封印",
+    "keyword": "封印",
     "description": "Ocr-description"
   },
   {

+ 55 - 4
tasks/WantedQuests/script_task.py

@@ -15,11 +15,12 @@ from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_exploration
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Secret.script_task import ScriptTask as SecretScriptTask
 from tasks.WantedQuests.config import WantedQuestsConfig
 from tasks.WantedQuests.assets import WantedQuestsAssets
 
-class ScriptTask(SecretScriptTask, WantedQuestsAssets):
+class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
 
     def run(self):
         con = self.config
@@ -28,15 +29,22 @@ class ScriptTask(SecretScriptTask, WantedQuestsAssets):
         number_challenge = self.O_WQ_NUMBER.ocr(self.device.image)
         O_TEXT_COPY_1 = copy.deepcopy(self.O_WQ_TEXT_1)
         O_TEXT_COPY_2 = copy.deepcopy(self.O_WQ_TEXT_2)
-        O_TEXT_COPY_1.keyword = '悬贵封印'
-        O_TEXT_COPY_2.keyword = '悬贵封印'
+        O_TEXT_COPY_1.keyword = '封印'
+        O_TEXT_COPY_2.keyword = '封印'
+        ocr_error_count = 0
         while 1:
             self.screenshot()
             if self.appear(self.I_WQ_BOX):
                 self.ui_get_reward(self.I_WQ_BOX)
                 continue
+            if ocr_error_count > 10:
+                logger.warning('OCR failed too many times, exit')
+                break
             if self.ocr_appear(self.O_WQ_TEXT_1, interval=0.7) or self.ocr_appear(O_TEXT_COPY_1, interval=0.7):
                 cu, re, total = self.O_WQ_NUM_1.ocr(self.device.image)
+                if cu == re == total == 0:
+                    logger.warning('OCR failed and skip this round')
+                    ocr_error_count += 1
                 if cu > total:
                     logger.warning('Current number of wanted quests is greater than total number')
                     cu = cu % 10
@@ -45,13 +53,21 @@ class ScriptTask(SecretScriptTask, WantedQuestsAssets):
                 continue
             if self.ocr_appear(self.O_WQ_TEXT_2, interval=0.7) or self.ocr_appear(O_TEXT_COPY_1, interval=0.7):
                 cu, re, total = self.O_WQ_NUM_2.ocr(self.device.image)
+                if cu == re == total == 0:
+                    logger.warning('OCR failed and skip this round')
+                    ocr_error_count += 1
                 if cu > total:
                     logger.warning('Current number of wanted quests is greater than total number')
                     cu = cu % 10
                 if cu < total and re != 0:
                     self.execute_mission(self.O_WQ_TEXT_2, total, number_challenge)
                 continue
-            if not self.appear(self.I_WQ_CHECK_TASK, interval=2.5):
+
+            if self.appear(self.I_WQ_CHECK_TASK):
+                continue
+            sleep(1.5)
+            self.screenshot()
+            if not self.appear(self.I_WQ_CHECK_TASK):
                 logger.info('No wanted quests')
                 break
 
@@ -100,6 +116,7 @@ class ScriptTask(SecretScriptTask, WantedQuestsAssets):
                 continue
         # 已追踪所有任务
         logger.info('All wanted quests are traced')
+        self.invite_five()
         self.ui_click_until_disappear(self.I_UI_BACK_RED)
         self.ui_goto(page_exploration)
 
@@ -197,6 +214,38 @@ class ScriptTask(SecretScriptTask, WantedQuestsAssets):
                 continue
         logger.info('Secret mission finished')
 
+    def invite_five(self):
+        """
+        邀请好友,默认点五个
+        :return:
+        """
+        def invite(add_button):
+            self.screenshot()
+            if not self.appear(add_button):
+                return False
+            self.ui_click(add_button, self.I_INVITE_ENSURE)
+            sleep(1)
+            self.click(self.I_WQ_FIREND_1)
+            sleep(0.4)
+            self.click(self.I_WQ_FIREND_2)
+            sleep(0.4)
+            self.click(self.I_WQ_FIREND_3)
+            sleep(0.4)
+            self.click(self.I_WQ_FIREND_4)
+            sleep(0.4)
+            self.click(self.I_WQ_FIREND_5)
+            sleep(0.2)
+            self.screenshot()
+            if not self.appear(self.I_SELECTED):
+                logger.warning('No friend selected')
+                return False
+            self.ui_click_until_disappear(self.I_INVITE_ENSURE)
+            sleep(0.5)
+
+        logger.hr('Invite friends')
+        invite(self.I_WQ_INVITE_1)
+        invite(self.I_WQ_INVITE_2)
+        invite(self.I_WQ_INVITE_3)
 
 if __name__ == '__main__':
     from module.config.config import Config
@@ -207,5 +256,7 @@ if __name__ == '__main__':
     t.screenshot()
 
     t.run()
+    # print(t.appear(t.I_WQ_CHECK_TASK))
+
 
 

+ 3 - 3
tasks/WantedQuests/wq/image.json

@@ -101,10 +101,10 @@
   {
     "itemName": "wq_check_task",
     "imageName": "wq_wq_check_task.png",
-    "roiFront": "106,296,24,113",
-    "roiBack": "73,122,69,427",
+    "roiFront": "110,154,21,125",
+    "roiBack": "73,122,69,459",
     "method": "Template matching",
-    "threshold": 0.85,
+    "threshold": 0.8,
     "description": "判断是否还有任务"
   }
 ]

BIN
tasks/WantedQuests/wq/wq_wq_check_task.png