Forráskód Böngészése

fix(AreaBoss): update share image

ryland 2 éve
szülő
commit
be1127d052

BIN
tasks/WeeklyTrifles/area_boss/area_boss_wt_share_ab.png


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

@@ -20,8 +20,8 @@
   {
     "itemName": "wt_share_ab",
     "imageName": "area_boss_wt_share_ab.png",
-    "roiFront": "1131,429,45,39",
-    "roiBack": "1131,429,45,39",
+    "roiFront": "1183,308,45,39",
+    "roiBack": "1136,292,105,79",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "地鬼分享"

+ 1 - 1
tasks/WeeklyTrifles/assets.py

@@ -21,7 +21,7 @@ class WeeklyTriflesAssets:
 	# 今天一个都没有打 
 	I_WT_NO_DAY = RuleImage(roi_front=(167,360,72,69), roi_back=(167,360,72,69), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_no_day.png")
 	# 地鬼分享 
-	I_WT_SHARE_AB = RuleImage(roi_front=(1131,429,45,39), roi_back=(1131,429,45,39), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_share_ab.png")
+	I_WT_SHARE_AB = RuleImage(roi_front=(1183,308,45,39), roi_back=(1136,292,105,79), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_share_ab.png")
 	# 分享勾玉 
 	I_WT_AB_JADE = RuleImage(roi_front=(922,554,44,47), roi_back=(922,554,44,47), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/area_boss/area_boss_wt_ab_jade.png")
 	# 微信分享 

+ 8 - 2
tasks/WeeklyTrifles/script_task.py

@@ -36,7 +36,13 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         :return:
         """
         # 点击分享
-        self.ui_click(wechat, self.I_WT_QR_CODE)
+        # self.ui_click(wechat, self.I_WT_QR_CODE)
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_WT_QR_CODE):
+                break
+            if self.appear_then_click(wechat, interval=2.5):
+                continue
         logger.info('Click share')
         get_timer = Timer(7)
         get_timer.start()
@@ -267,7 +273,7 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t._share_collect()
+    t._share_area_boss()
     # t.click_share(t.I_WT_SE_WECHAT)