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

fix(FloatParade):Winter float Parade update

GanSer 1 год назад
Родитель
Сommit
95cb41a384

+ 9 - 3
tasks/FloatParade/assets.py

@@ -12,13 +12,13 @@ class FloatParadeAssets:
 
 	# Image Rule Assets
 	# 从庭院进入花车活动 
-	I_FP_ACCESS = RuleImage(roi_front=(183,413,36,34), roi_back=(95,344,1042,229), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_access.png")
+	I_FP_ACCESS = RuleImage(roi_front=(1192,317,36,34), roi_back=(1000,101,261,472), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_access.png")
 	# description 
 	I_FP_GETALL0 = RuleImage(roi_front=(1153,287,65,56), roi_back=(1134,261,100,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_getall0.png")
 	# description 
 	I_FP_RED_POINT0 = RuleImage(roi_front=(1242,604,22,21), roi_back=(1225,585,53,54), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_red_point0.png")
 	# description 
-	I_FP_GETALL1 = RuleImage(roi_front=(1196,544,53,54), roi_back=(1159,489,113,164), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_getall1.png")
+	I_FP_GETALL1 = RuleImage(roi_front=(1155,560,53,54), roi_back=(1128,507,113,164), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_getall1.png")
 	# description 
 	I_FP_RED_POINT1 = RuleImage(roi_front=(1249,155,21,21), roi_back=(1223,138,56,62), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_red_point1.png")
 	# description 
@@ -32,8 +32,14 @@ class FloatParadeAssets:
 	# 右下角的任务 
 	I_FP_TASKS = RuleImage(roi_front=(1175,617,79,76), roi_back=(1162,605,100,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_tasks.png")
 	# 升级 
-	I_FP_UPGRADE = RuleImage(roi_front=(1075,75,116,49), roi_back=(1040,52,169,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_upgrade.png")
+	I_FP_UPGRADE = RuleImage(roi_front=(1086,74,116,49), roi_back=(1040,52,169,100), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_upgrade.png")
 	# 红色关闭 
 	I_FP_RED_CLOSE = RuleImage(roi_front=(1170,109,43,44), roi_back=(1157,101,72,62), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_red_close.png")
+	# 寻找花车的切换按钮 
+	I_TOGGLE_BUTTON = RuleImage(roi_front=(1202,466,22,21), roi_back=(1090,127,176,377), threshold=0.7, method="Template matching", file="./tasks/FloatParade/fp/fp_toggle_button.png")
+	# 批量选择 
+	I_BATCH_SELECTION = RuleImage(roi_front=(933,517,44,40), roi_back=(933,517,44,40), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_batch_selection.png")
+	# 批量选择确认 
+	I_BATCH_SELECTION_CONFIRM = RuleImage(roi_front=(676,392,130,63), roi_back=(676,392,130,63), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_batch_selection_confirm.png")
 
 

BIN
tasks/FloatParade/fp/fp_.png


BIN
tasks/FloatParade/fp/fp_batch_selection.png


BIN
tasks/FloatParade/fp/fp_batch_selection_confirm.png


BIN
tasks/FloatParade/fp/fp_fp_access.png


BIN
tasks/FloatParade/fp/fp_fp_getall0.png


BIN
tasks/FloatParade/fp/fp_fp_getall1.png


BIN
tasks/FloatParade/fp/fp_fp_tasks.png


BIN
tasks/FloatParade/fp/fp_fp_upgrade.png


BIN
tasks/FloatParade/fp/fp_toggle_button.png


+ 32 - 5
tasks/FloatParade/fp/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "fp_access",
     "imageName": "fp_fp_access.png",
-    "roiFront": "183,413,36,34",
-    "roiBack": "95,344,1042,229",
+    "roiFront": "1192,317,36,34",
+    "roiBack": "1000,101,261,472",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "从庭院进入花车活动"
@@ -29,8 +29,8 @@
   {
     "itemName": "fp_getall1",
     "imageName": "fp_fp_getall1.png",
-    "roiFront": "1196,544,53,54",
-    "roiBack": "1159,489,113,164",
+    "roiFront": "1155,560,53,54",
+    "roiBack": "1128,507,113,164",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -92,7 +92,7 @@
   {
     "itemName": "fp_upgrade",
     "imageName": "fp_fp_upgrade.png",
-    "roiFront": "1075,75,116,49",
+    "roiFront": "1086,74,116,49",
     "roiBack": "1040,52,169,100",
     "method": "Template matching",
     "threshold": 0.8,
@@ -106,5 +106,32 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "红色关闭"
+  },
+  {
+    "itemName": "toggle_button",
+    "imageName": "fp_toggle_button.png",
+    "roiFront": "1202,466,22,21",
+    "roiBack": "1090,127,176,377",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "寻找花车的切换按钮"
+  },
+  {
+    "itemName": "batch_selection",
+    "imageName": "fp_batch_selection.png",
+    "roiFront": "933,517,44,40",
+    "roiBack": "933,517,44,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "批量选择"
+  },
+  {
+    "itemName": "batch_selection_confirm",
+    "imageName": "fp_batch_selection_confirm.png",
+    "roiFront": "676,392,130,63",
+    "roiBack": "676,392,130,63",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "批量选择确认"
   }
 ]

+ 10 - 0
tasks/FloatParade/script_task.py

@@ -55,6 +55,8 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
                 continue
             if self.appear_then_click(self.I_FP_TASKS, interval=1.8):
                 continue
+            if self.appear_then_click(self.I_TOGGLE_BUTTON, interval=3):
+                continue
         logger.info('Enter float parade')
         logger.info('Click get all reward')
         if not self.appear(self.I_FP_GETALL1):
@@ -84,8 +86,16 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
         check_timer.start()
         while 1:
             self.screenshot()
+            # 批量选择
+            if self.appear_then_click(self.I_BATCH_SELECTION, interval=1.5):
+                continue
+            if self.appear_then_click(self.I_BATCH_SELECTION_CONFIRM, interval=0.8):
+                continue
+
             if self.appear_then_click(match_level[level], interval=0.8):
                 logger.info(f'Select {level} reward')
+                if self.appear_then_click(self.I_OVERFLOW_CONFIRME, interval=0.8):
+                    pass
                 check_timer.reset()
                 continue