Przeglądaj źródła

fix(WeeklyTrifles): update image

ryland 2 lat temu
rodzic
commit
ba14a92bc7

+ 2 - 2
module/device/method/droidcast.py

@@ -292,5 +292,5 @@ class DroidCast(Uiautomator2):
 
 if __name__ == '__main__':
     dc = DroidCast(config='oas1')
-    cv2.imshow("iiii", dc.screenshot_uiautomator2())
-    cv2.waitKey(0)
+    cv2.imshow("iiii", dc.screenshot_droidcast())
+    cv2.waitKey(0)

+ 1 - 0
tasks/Nian/script_task.py

@@ -155,3 +155,4 @@ if __name__ == '__main__':
 
     t.run()
 
+

+ 1 - 1
tasks/WeeklyTrifles/assets.py

@@ -63,7 +63,7 @@ class WeeklyTriflesAssets:
 	# 微信分享 
 	I_WT_COLLECT_WECHAT = RuleImage(roi_front=(640,617,70,63), roi_back=(640,617,70,63), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_collect_wechat.png")
 	# 二维码 
-	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")
+	I_WT_QR_CODE = RuleImage(roi_front=(473,161,336,96), roi_back=(404,112,483,168), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_qr_code.png")
 
 
 	# Image Rule Assets

BIN
tasks/WeeklyTrifles/collect/collect_wt_qr_code.png


+ 2 - 2
tasks/WeeklyTrifles/collect/image.json

@@ -56,8 +56,8 @@
   {
     "itemName": "wt_qr_code",
     "imageName": "collect_wt_qr_code.png",
-    "roiFront": "473,160,336,96",
-    "roiBack": "473,160,336,96",
+    "roiFront": "473,161,336,96",
+    "roiBack": "404,112,483,168",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "二维码"

+ 5 - 4
tasks/WeeklyTrifles/script_task.py

@@ -38,14 +38,14 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         # 点击分享
         self.ui_click(wechat, self.I_WT_QR_CODE)
         logger.info('Click share')
-        get_timer = Timer(2)
+        get_timer = Timer(7)
         get_timer.start()
         while 1:
             self.screenshot()
             if self.ui_reward_appear_click():
                 logger.info('Get reward')
                 return True
-            if self.appear_then_click(self.I_WT_QR_CODE, self.C_WT_WECHAT, interval=0.8):
+            if self.appear_then_click(self.I_WT_QR_CODE, self.C_WT_WECHAT, interval=4.8):
                 continue
             if get_timer.reached():
                 logger.warning('Share timeout. The reward may have been obtained')
@@ -78,7 +78,7 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
                 break
             if self.appear_then_click(self.I_WT_COLLECT_WECHAT, interval=1):
                 continue
-            if self.appear_then_click(self.I_WT_COLLECT, interval=1):
+            if self.appear_then_click(self.I_WT_COLLECT, interval=5):
                 continue
         logger.info('Click share')
         get_timer = Timer(3)
@@ -267,6 +267,7 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t._share_secret()
+    t._share_collect()
+    # t.click_share(t.I_WT_SE_WECHAT)