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

fix(task): update weekly trifles

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

+ 2 - 0
tasks/WeeklyTrifles/assets.py

@@ -75,5 +75,7 @@ class WeeklyTriflesAssets:
 	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")
+	# 排行 
+	I_WT_SE_RANK = RuleImage(roi_front=(1013,571,45,44), roi_back=(1013,571,45,44), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_rank.png")
 
 

+ 10 - 0
tasks/WeeklyTrifles/script_task.py

@@ -173,6 +173,16 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
                 continue
             if self.appear_then_click(self.I_WT_SE_SHARE, interval=1):
                 continue
+            if self.appear(self.I_WT_SE_RANK):
+                # 如果出现排名但是没有出现分享,那就是还没打,退出
+                time.sleep(0.5)
+                self.screenshot()
+                if self.appear(self.I_WT_SE_SHARE):
+                    continue
+                logger.warning('This week has not been obtained')
+                # 返回
+                self.ui_click(self.I_UI_BACK_BLUE, self.I_CHECK_MAIN)
+                return
         logger.info('Enter secret')
         # 判断是否已经领取
         self.screenshot()

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

@@ -34,5 +34,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "勾玉"
+  },
+  {
+    "itemName": "wt_se_rank",
+    "imageName": "secret_wt_se_rank.png",
+    "roiFront": "1013,571,45,44",
+    "roiBack": "1013,571,45,44",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "排行"
   }
 ]

BIN
tasks/WeeklyTrifles/secret/secret_wt_se_rank.png


+ 0 - 12
tasks/ui/assets.py

@@ -1,12 +0,0 @@
-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 uiAssets: 
-	pass
-