فهرست منبع

fix(WeeklyTrifles): Update image roi

ryland 1 سال پیش
والد
کامیت
e1d012f40e
3فایلهای تغییر یافته به همراه10 افزوده شده و 9 حذف شده
  1. 1 1
      tasks/WeeklyTrifles/assets.py
  2. 7 6
      tasks/WeeklyTrifles/script_task.py
  3. 2 2
      tasks/WeeklyTrifles/secret/image.json

+ 1 - 1
tasks/WeeklyTrifles/assets.py

@@ -74,7 +74,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_JADE = RuleImage(roi_front=(1123,532,35,39), roi_back=(1105,520,79,73), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_jade.png")
 	# 排行 
 	I_WT_SE_RANK = RuleImage(roi_front=(1017,572,45,44), roi_back=(989,556,103,81), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_rank.png")
 

+ 7 - 6
tasks/WeeklyTrifles/script_task.py

@@ -171,22 +171,23 @@ class ScriptTask(GameUi, WeeklyTriflesAssets):
         self.ui_get_current_page()
         self.ui_goto(page_secret_zones)
         # 一路进去
+        valid = False
         while 1:
             self.screenshot()
             if self.appear(self.I_WT_SE_WECHAT):
+                self.wait_until_stable(self.I_WT_SE_WECHAT, skip_first_screenshot=True)
                 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):
+            if self.appear_then_click(self.I_WT_SE_SHARE, interval=5):
+                valid = True
                 continue
-            if self.appear(self.I_WT_SE_RANK):
+            if self.appear(self.I_WT_SE_RANK) and (not valid):
                 # 如果出现排名但是没有出现分享,那就是还没打,退出
-                time.sleep(0.5)
-                self.screenshot()
+                self.wait_until_stable(self.I_WT_SE_SHARE, skip_first_screenshot=True)
                 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')
@@ -273,7 +274,7 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t.run()
+    t._share_secret()
     # t._share_collect()
     # t.click_share(t.I_WT_SE_WECHAT)
 

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

@@ -29,8 +29,8 @@
   {
     "itemName": "wt_se_jade",
     "imageName": "secret_wt_se_jade.png",
-    "roiFront": "1129,529,35,39",
-    "roiBack": "1129,529,35,39",
+    "roiFront": "1123,532,35,39",
+    "roiBack": "1105,520,79,73",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "勾玉"