فهرست منبع

fix(FloatParade): Adjust ROI coordinates and fix stop condition in mileage reward flow

neptine 4 ماه پیش
والد
کامیت
4e611515b8
4فایلهای تغییر یافته به همراه6 افزوده شده و 6 حذف شده
  1. 2 2
      tasks/FloatParade/assets.py
  2. 1 1
      tasks/FloatParade/fp/image.json
  3. 2 2
      tasks/FloatParade/mileage/mileage.json
  4. 1 1
      tasks/FloatParade/script_task.py

+ 2 - 2
tasks/FloatParade/assets.py

@@ -48,13 +48,13 @@ class FloatParadeAssets:
 	#  
 	#  
 	I_FP_SELECT_3 = RuleImage(roi_front=(938,435,104,54), roi_back=(917,415,154,98), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_select_3.png")
 	I_FP_SELECT_3 = RuleImage(roi_front=(938,435,104,54), roi_back=(917,415,154,98), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_select_3.png")
 	#  
 	#  
-	I_RED_POINT_0 = RuleImage(roi_front=(1244,216,19,17), roi_back=(1212,157,64,303), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_red_point_0.png")
+	I_RED_POINT_0 = RuleImage(roi_front=(1244,216,19,17), roi_back=(1217,157,59,415), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_red_point_0.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	#  
 	#  
 	I_CLAIM_MILEAGE = RuleImage(roi_front=(794,515,142,44), roi_back=(731,493,264,89), threshold=0.8, method="Template matching", file="./tasks/FloatParade/mileage/mileage_claim_mileage.png")
 	I_CLAIM_MILEAGE = RuleImage(roi_front=(794,515,142,44), roi_back=(731,493,264,89), threshold=0.8, method="Template matching", file="./tasks/FloatParade/mileage/mileage_claim_mileage.png")
 	# 进入里程(右上角红点) 
 	# 进入里程(右上角红点) 
-	I_ENTRY_MILEAGE = RuleImage(roi_front=(93,75,23,22), roi_back=(77,66,63,54), threshold=0.8, method="Template matching", file="./tasks/FloatParade/mileage/mileage_entry_mileage.png")
+	I_ENTRY_MILEAGE = RuleImage(roi_front=(97,76,19,21), roi_back=(84,69,56,51), threshold=0.8, method="Template matching", file="./tasks/FloatParade/mileage/mileage_entry_mileage.png")
 
 
 
 

+ 1 - 1
tasks/FloatParade/fp/image.json

@@ -165,7 +165,7 @@
     "itemName": "red_point_0",
     "itemName": "red_point_0",
     "imageName": "fp_red_point_0.png",
     "imageName": "fp_red_point_0.png",
     "roiFront": "1244,216,19,17",
     "roiFront": "1244,216,19,17",
-    "roiBack": "1212,157,64,303",
+    "roiBack": "1217,157,59,415",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": ""
     "description": ""

+ 2 - 2
tasks/FloatParade/mileage/mileage.json

@@ -11,8 +11,8 @@
   {
   {
     "itemName": "entry_mileage",
     "itemName": "entry_mileage",
     "imageName": "mileage_entry_mileage.png",
     "imageName": "mileage_entry_mileage.png",
-    "roiFront": "93,75,23,22",
-    "roiBack": "77,66,63,54",
+    "roiFront": "97,76,19,21",
+    "roiBack": "84,69,56,51",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入里程(右上角红点)"
     "description": "进入里程(右上角红点)"

+ 1 - 1
tasks/FloatParade/script_task.py

@@ -52,7 +52,7 @@ class ScriptTask(RightActivity, FloatParadeAssets, TalismanPassAssets):
         if not self.appear(self.I_ENTRY_MILEAGE):
         if not self.appear(self.I_ENTRY_MILEAGE):
             return
             return
         logger.hr("Get mileage reward")
         logger.hr("Get mileage reward")
-        self.ui_click( click=self.I_ENTRY_MILEAGE, stop=self.I_ENTRY_MILEAGE, interval=1.9)
+        self.ui_click( click=self.I_ENTRY_MILEAGE, stop=self.I_CLAIM_MILEAGE, interval=1.9)
         self.ui_get_reward(self.I_CLAIM_MILEAGE)
         self.ui_get_reward(self.I_CLAIM_MILEAGE)
         self.ui_click_until_disappear(self.I_UI_BACK_RED, interval=1.8)
         self.ui_click_until_disappear(self.I_UI_BACK_RED, interval=1.8)
         logger.info('Got mileage reward')
         logger.info('Got mileage reward')