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

feat(task): WeeklyTrifles has finished

runhey 3 лет назад
Родитель
Сommit
3f538d8442

+ 11 - 0
tasks/WeeklyTrifles/assets.py

@@ -66,3 +66,14 @@ class WeeklyTriflesAssets:
 	I_WT_QR_CODE = RuleImage(roi_front=(473,160,336,96), roi_back=(473,160,336,96), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_qr_code.png")
 
 
+	# Image Rule Assets
+	# 秘闻进入 
+	I_WT_ENTER_SE = RuleImage(roi_front=(1145,598,100,100), roi_back=(1145,598,100,100), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_enter_se.png")
+	# 秘闻分享 
+	I_WT_SE_SHARE = RuleImage(roi_front=(913,570,46,43), roi_back=(913,570,46,43), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_share.png")
+	# 微信 
+	I_WT_SE_WECHAT = RuleImage(roi_front=(1023,630,56,57), roi_back=(1023,630,56,57), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_wechat.png")
+	# 勾玉 
+	I_WT_SE_JADE = RuleImage(roi_front=(1129,529,35,39), roi_back=(1129,529,35,39), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_jade.png")
+
+

+ 35 - 5
tasks/WeeklyTrifles/script_task.py

@@ -16,6 +16,14 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
 
     def run(self):
         con = self.config.weekly_trifles.trifles
+        if con.share_collect:
+            self._share_collect()
+        if con.share_area_boss:
+            self._share_area_boss()
+        if con.share_secret:
+            self._share_secret()
+        if con.broken_amulet:
+            self._broken_amulet(con.broken_amulet)
 
         self.set_next_run(task='WeeklyTrifles', success=True, finish=True)
         raise TaskEnd('WeeklyTrifles')
@@ -30,7 +38,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         # 点击分享
         self.ui_click(wechat, self.I_WT_QR_CODE)
         logger.info('Click share')
-        get_timer = Timer(3)
+        get_timer = Timer(2)
         get_timer.start()
         while 1:
             self.screenshot()
@@ -141,20 +149,42 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         if not self.appear(self.I_WT_AB_JADE):
             logger.warning('This week has been obtained')
             obtained = True
+        if not obtained:
+            # 点击分享
+            self.click_share(self.I_WT_AB_WECHAT)
+            obtained = True
         if obtained:
             back_boss()
-        # 点击分享
-        self.click_share(self.I_WT_AB_WECHAT)
-        back_boss()
 
     def _share_secret(self):
         """
-        TODO 秘闻分享
+        秘闻分享
         :return:
         """
         logger.hr('Share secret')
         self.ui_get_current_page()
         self.ui_goto(page_secret_zones)
+        # 一路进去
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_WT_SE_WECHAT):
+                break
+            if self.appear_then_click(self.I_WT_ENTER_SE, interval=1):
+                continue
+            if self.appear_then_click(self.I_WT_SE_SHARE, interval=1):
+                continue
+        logger.info('Enter secret')
+        # 判断是否已经领取
+        self.screenshot()
+        obtained = False
+        if not self.appear(self.I_WT_SE_JADE):
+            obtained = True
+            logger.warning('This week has been obtained')
+        # 点击分享
+        if not obtained:
+            self.click_share(self.I_WT_SE_WECHAT)
+        # 返回
+        self.ui_click(self.I_UI_BACK_BLUE, self.I_CHECK_MAIN)
 
     def _broken_amulet(self, num: int):
         """

+ 38 - 0
tasks/WeeklyTrifles/secret/image.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "wt_enter_se",
+    "imageName": "secret_wt_enter_se.png",
+    "roiFront": "1145,598,100,100",
+    "roiBack": "1145,598,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "秘闻进入"
+  },
+  {
+    "itemName": "wt_se_share",
+    "imageName": "secret_wt_se_share.png",
+    "roiFront": "913,570,46,43",
+    "roiBack": "913,570,46,43",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "秘闻分享"
+  },
+  {
+    "itemName": "wt_se_wechat",
+    "imageName": "secret_wt_se_wechat.png",
+    "roiFront": "1023,630,56,57",
+    "roiBack": "1023,630,56,57",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "微信"
+  },
+  {
+    "itemName": "wt_se_jade",
+    "imageName": "secret_wt_se_jade.png",
+    "roiFront": "1129,529,35,39",
+    "roiBack": "1129,529,35,39",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "勾玉"
+  }
+]

BIN
tasks/WeeklyTrifles/secret/secret_wt_enter_se.png


BIN
tasks/WeeklyTrifles/secret/secret_wt_se_jade.png


BIN
tasks/WeeklyTrifles/secret/secret_wt_se_share.png


BIN
tasks/WeeklyTrifles/secret/secret_wt_se_wechat.png