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

fix(FloatParade): Update FloatParade task

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

+ 8 - 8
tasks/FloatParade/assets.py

@@ -12,18 +12,12 @@ class FloatParadeAssets:
 
 	# Image Rule Assets
 	# 从庭院进入花车活动 
-	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")
+	I_FP_ACCESS = RuleImage(roi_front=(1178,168,43,34), roi_back=(1051,101,210,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=(1198,555,53,54), roi_back=(1163,506,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 
-	I_FP_RED_POINT2 = RuleImage(roi_front=(1246,288,22,21), roi_back=(1232,278,43,41), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_red_point2.png")
-	# description 
 	I_FP_BATCH = RuleImage(roi_front=(985,520,94,31), roi_back=(978,507,112,64), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_batch.png")
 	# description 
 	I_FP_BATCH_TRUE = RuleImage(roi_front=(938,518,35,37), roi_back=(924,506,64,62), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_batch_true.png")
@@ -36,10 +30,16 @@ class FloatParadeAssets:
 	# 红色关闭 
 	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_TOGGLE_BUTTON = RuleImage(roi_front=(1193,462,21,23), roi_back=(1116,127,150,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")
+	# 礼包关闭 
+	I_FP_GIFT_CLOSE = RuleImage(roi_front=(1056,96,36,38), roi_back=(1046,89,60,60), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_gift_close.png")
+	# 礼包类型1 
+	I_FP_GIFT_FLAG1 = RuleImage(roi_front=(559,295,55,44), roi_back=(559,295,55,44), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_gift_flag1.png")
+	# 礼包类型2 
+	I_FP_GIFT_FLAG2 = RuleImage(roi_front=(557,293,58,47), roi_back=(557,293,58,47), threshold=0.8, method="Template matching", file="./tasks/FloatParade/fp/fp_fp_gift_flag2.png")
 
 

+ 2 - 1
tasks/FloatParade/config.py

@@ -18,7 +18,8 @@ class LevelReward(str, Enum):
     THREE = '体力/樱饼'
 
 class FloatParadeConfig(BaseModel):
-    level_reward: LevelReward = Field(default=LevelReward.TWO)
+    level_reward1: LevelReward = Field(default=LevelReward.THREE)
+    level_reward2: LevelReward = Field(default=LevelReward.ONE)
 
 class FloatParade(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)

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_batch.png


BIN
tasks/FloatParade/fp/fp_fp_batch_false.png


BIN
tasks/FloatParade/fp/fp_fp_batch_true.png


BIN
tasks/FloatParade/fp/fp_fp_getall0.png


BIN
tasks/FloatParade/fp/fp_fp_getall1.png


BIN
tasks/FloatParade/fp/fp_fp_gift_close.png


BIN
tasks/FloatParade/fp/fp_fp_gift_flag1.png


BIN
tasks/FloatParade/fp/fp_fp_gift_flag2.png


BIN
tasks/FloatParade/fp/fp_fp_red_close.png


BIN
tasks/FloatParade/fp/fp_fp_red_point0.png


BIN
tasks/FloatParade/fp/fp_fp_red_point1.png


BIN
tasks/FloatParade/fp/fp_fp_red_point2.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


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

@@ -2,8 +2,8 @@
   {
     "itemName": "fp_access",
     "imageName": "fp_fp_access.png",
-    "roiFront": "1192,317,36,34",
-    "roiBack": "1000,101,261,472",
+    "roiFront": "1178,168,43,34",
+    "roiBack": "1051,101,210,472",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "从庭院进入花车活动"
@@ -17,15 +17,6 @@
     "threshold": 0.8,
     "description": "description"
   },
-  {
-    "itemName": "fp_red_point0",
-    "imageName": "fp_fp_red_point0.png",
-    "roiFront": "1242,604,22,21",
-    "roiBack": "1225,585,53,54",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
     "itemName": "fp_getall1",
     "imageName": "fp_fp_getall1.png",
@@ -35,24 +26,6 @@
     "threshold": 0.8,
     "description": "description"
   },
-  {
-    "itemName": "fp_red_point1",
-    "imageName": "fp_fp_red_point1.png",
-    "roiFront": "1249,155,21,21",
-    "roiBack": "1223,138,56,62",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "fp_red_point2",
-    "imageName": "fp_fp_red_point2.png",
-    "roiFront": "1246,288,22,21",
-    "roiBack": "1232,278,43,41",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
     "itemName": "fp_batch",
     "imageName": "fp_fp_batch.png",
@@ -110,8 +83,8 @@
   {
     "itemName": "toggle_button",
     "imageName": "fp_toggle_button.png",
-    "roiFront": "1202,466,22,21",
-    "roiBack": "1090,127,176,377",
+    "roiFront": "1193,462,21,23",
+    "roiBack": "1116,127,150,377",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "寻找花车的切换按钮"
@@ -133,5 +106,32 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "批量选择确认"
+  },
+  {
+    "itemName": "fp_gift_close",
+    "imageName": "fp_fp_gift_close.png",
+    "roiFront": "1056,96,36,38",
+    "roiBack": "1046,89,60,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "礼包关闭"
+  },
+  {
+    "itemName": "fp_gift_flag1",
+    "imageName": "fp_fp_gift_flag1.png",
+    "roiFront": "559,295,55,44",
+    "roiBack": "559,295,55,44",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "礼包类型1"
+  },
+  {
+    "itemName": "fp_gift_flag2",
+    "imageName": "fp_fp_gift_flag2.png",
+    "roiFront": "557,293,58,47",
+    "roiBack": "557,293,58,47",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "礼包类型2"
   }
 ]

+ 13 - 4
tasks/FloatParade/script_task.py

@@ -31,7 +31,7 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
                 continue
         logger.info('Goback to float parade main page')
         # 收取花车等级奖励
-        self.get_flower(con.level_reward)
+        self.get_flower(con.level_reward1, con.level_reward2) # 第一种
         # main page
         self.ui_get_current_page()
         self.ui_goto(page_main)
@@ -53,6 +53,8 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
                 continue
             if self.appear_then_click(self.I_FP_RED_CLOSE, interval=1.5):
                 continue
+            if self.appear_then_click(self.I_FP_GIFT_CLOSE, interval=3):
+                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):
@@ -65,7 +67,7 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
         self.ui_get_reward(self.I_FP_GETALL1)
         logger.info('Got all reward')
 
-    def get_flower(self, level: LevelReward = LevelReward.TWO):
+    def get_flower(self, level1: LevelReward = LevelReward.TWO, level2: LevelReward = LevelReward.TWO):
         """
         收取花合战等级奖励
         :return:
@@ -92,8 +94,15 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
             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(self.I_FP_GIFT_FLAG1) and self.appear_then_click(match_level[level1], interval=0.8):
+                logger.info(f'Select {level1} reward')
+                if self.appear_then_click(self.I_OVERFLOW_CONFIRME, interval=0.8):
+                    pass
+                check_timer.reset()
+                continue
+
+            if self.appear(self.I_FP_GIFT_FLAG2) and self.appear_then_click(match_level[level2], interval=0.8):
+                logger.info(f'Select {level2} reward')
                 if self.appear_then_click(self.I_OVERFLOW_CONFIRME, interval=0.8):
                     pass
                 check_timer.reset()