Explorar el Código

feat(task): Secret has finished

runhey hace 3 años
padre
commit
9a392800b2

+ 5 - 3
tasks/Secret/assets.py

@@ -21,20 +21,22 @@ class SecretAssets:
 	# 秘闻挑战 
 	I_SE_FIRE = RuleImage(roi_front=(1108,551,100,100), roi_back=(1108,551,100,100), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_fire.png")
 	# 排行 
-	I_SE_PLACEMENT = RuleImage(roi_front=(1011,568,50,48), roi_back=(1011,568,50,48), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_placement.png")
+	I_SE_PLACEMENT = RuleImage(roi_front=(1013,570,50,48), roi_back=(996,555,79,81), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_placement.png")
 	# 勾玉 
 	I_SE_JADE = RuleImage(roi_front=(305,208,28,33), roi_back=(305,208,28,33), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_jade.png")
 	# 最后一个的勾玉 
 	I_SE_JADE_LAST = RuleImage(roi_front=(302,565,37,40), roi_back=(302,565,37,40), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_jade_last.png")
 	# 战斗赢 
 	I_SE_BATTLE_WIN = RuleImage(roi_front=(436,62,100,100), roi_back=(436,62,100,100), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_battle_win.png")
+	# 已经完成可以退出 
+	I_SE_FINISHED_1 = RuleImage(roi_front=(441,546,40,43), roi_back=(441,546,40,43), threshold=0.8, method="Template matching", file="./tasks/Secret/se/se_se_finished_1.png")
 
 
 	# Ocr Rule Assets
 	# 未通关 
 	O_SE_NO_PASS = RuleOcr(roi=(428,151,262,248), area=(428,151,262,248), mode="Full", method="Default", keyword="未通关", name="se_no_pass")
 	# 第一个位置的层数 
-	O_SE_LAYER_1 = RuleOcr(roi=(211,149,37,35), area=(211,149,37,35), mode="Single", method="Default", keyword="", name="se_layer_1")
+	O_SE_LAYER_1 = RuleOcr(roi=(208,146,47,46), area=(208,146,47,46), mode="Single", method="Default", keyword="", name="se_layer_1")
 	# Ocr-description 
 	O_SE_LAYER_10 = RuleOcr(roi=(210,507,34,34), area=(210,507,34,34), mode="Single", method="Default", keyword="拾", name="se_layer_10")
 	# Ocr-description 
@@ -42,7 +44,7 @@ class SecretAssets:
 	# Ocr-description 
 	O_SE_LAYER_8 = RuleOcr(roi=(212,237,34,34), area=(212,237,34,34), mode="Single", method="Default", keyword="捌", name="se_layer_8")
 	# 后面的时候识别为通关的 
-	O_SE_NO_PASS_LAST = RuleOcr(roi=(429,381,180,234), area=(429,381,180,234), mode="Full", method="Default", keyword="", name="se_no_pass_last")
+	O_SE_NO_PASS_LAST = RuleOcr(roi=(429,381,180,234), area=(429,381,180,234), mode="Full", method="Default", keyword="未通关", name="se_no_pass_last")
 
 
 	# Swipe Rule Assets

+ 40 - 16
tasks/Secret/script_task.py

@@ -48,10 +48,11 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
         # 进入
         success = True
         self.ui_click(self.I_SE_ENTER, self.I_SE_FIRE)
+        time.sleep(1)  # 有一个很傻逼的动画
+        self.screenshot()
         if not self.appear(self.I_SE_PLACEMENT):
             logger.warning('Unsuccessful entry. You must have entered the secret zone before.')
             success = False
-        time.sleep(1)   # 有一个很傻逼的动画
 
         # 开始
         logger.info('Start secret zone')
@@ -63,9 +64,14 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
                 break
             if not self.appear(self.I_SE_FIRE):
                 continue
+            if self.appear(self.I_SE_FINISHED_1):
+                logger.info('Secret zone finished')
+                break
             layer = self.find_battle()
             if not layer:
                 continue
+            if layer >= 6:
+                first_battle = False
             if first_battle and layer <= 5:
                 first_battle = False
                 buff = []
@@ -97,7 +103,16 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
                 success = self.run_general_battle(self.battle_config)
                 continue
 
-
+        self.ui_click(self.I_UI_BACK_BLUE, self.I_CHECK_MAIN)
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+        if con.secret_gold_50 or con.secret_gold_100:
+            self.open_buff()
+            if con.secret_gold_50:
+                self.gold_50(False)
+            if con.secret_gold_100:
+                self.gold_100(False)
+            self.close_buff()
         self.set_next_run(task='Secret', success=True, finish=True)
         raise TaskEnd('Secret')
 
@@ -115,12 +130,15 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
             level = ocr_target.ocr(self.device.image)
             if not isinstance(level, str):
                 logger.warning(f'OCR failed, try again {level}')
+            level = level.replace('·', '').replace(' ', '').replace('。', '')
             if level not in self.lay_list and roi:
                 print(roi)
                 print(ocr_target.roi)
                 set_layer_roi(ocr_target, roi)
                 self.screenshot()
                 level = ocr_target.ocr(self.device.image)
+            if level not in self.lay_list:
+                return None
             try:
                 return self.match_layer[level]
             except KeyError:
@@ -133,8 +151,14 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
         text_pos = self.O_SE_NO_PASS.ocr(self.device.image)
         if text_pos != (0, 0, 0, 0):
             # 如果能找得到 未通关 ,那可以挑战
-            layer = check_layer(self.O_SE_LAYER_1, text_pos)
+            layer = check_layer(self.O_SE_LAYER_1, None)
             # 如果第一个文字就找得到的,就点击这个
+            if not layer:
+                layer = check_layer(self.O_SE_LAYER_8, None)
+            if not layer:
+                layer = check_layer(self.O_SE_LAYER_1, text_pos)
+
+            print('识别到的层数:', layer)
             if layer:
                 self.C_SE_CLICK_LAYER.roi_front = text_pos
                 self.click(self.C_SE_CLICK_LAYER, interval=1)
@@ -143,16 +167,20 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
                 return None
 
         else:
-            # TODO
             # 如果不是就向下滑动,继续找或者是判断
             last_text_pos = self.O_SE_NO_PASS_LAST.ocr(self.device.image)
             if last_text_pos != (0, 0, 0, 0):
                 # 如果是后面找得到
                 layer = check_layer(self.O_SE_LAYER_10, last_text_pos)
+                if not layer:
+                    layer = check_layer(self.O_SE_LAYER_9, None)
+                if not layer:
+                    layer = check_layer(self.O_SE_LAYER_10, None)
                 # 如果第一个文字就找得到的,就点击这个
                 if layer:
                     self.C_SE_CLICK_LAYER.roi_front = last_text_pos
                     self.click(self.C_SE_CLICK_LAYER, interval=1)
+                    return layer
                 else:
                     return None
 
@@ -180,22 +208,18 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
             self.screenshot()
             if self.appear(self.I_SE_BATTLE_WIN):
                 logger.info('Win battle')
-                while 1:
-                    self.screenshot()
-                    if not self.appear(self.I_SE_BATTLE_WIN):
-                        break
-                    if self.appear_then_click(self.I_SE_BATTLE_WIN, interval=1):
-                        continue
+                self.ui_click_until_disappear(self.I_SE_BATTLE_WIN)
+                return True
+            if self.appear_then_click(self.I_WIN, interval=1):
+                continue
+            if self.appear(self.I_REWARD):
+                logger.info('Win battle')
+                self.ui_click_until_disappear(self.I_REWARD)
                 return True
 
             if self.appear(self.I_FALSE):
                 logger.warning('False battle')
-                while 1:
-                    self.screenshot()
-                    if not self.appear(self.I_FALSE):
-                        break
-                    if self.appear_then_click(self.I_FALSE, interval=1):
-                        continue
+                self.ui_click_until_disappear(self.I_FALSE)
                 return False
 
 

+ 11 - 2
tasks/Secret/se/image.json

@@ -20,8 +20,8 @@
   {
     "itemName": "se_placement",
     "imageName": "se_se_placement.png",
-    "roiFront": "1011,568,50,48",
-    "roiBack": "1011,568,50,48",
+    "roiFront": "1013,570,50,48",
+    "roiBack": "996,555,79,81",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "排行"
@@ -52,5 +52,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "战斗赢"
+  },
+  {
+    "itemName": "se_finished_1",
+    "imageName": "se_se_finished_1.png",
+    "roiFront": "441,546,40,43",
+    "roiBack": "441,546,40,43",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已经完成可以退出"
   }
 ]

+ 3 - 3
tasks/Secret/se/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "se_layer_1",
-    "roiFront": "211,149,37,35",
-    "roiBack": "211,149,37,35",
+    "roiFront": "208,146,47,46",
+    "roiBack": "208,146,47,46",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -50,7 +50,7 @@
     "roiBack": "429,381,180,234",
     "mode": "Full",
     "method": "Default",
-    "keyword": "",
+    "keyword": "未通关",
     "description": "后面的时候识别为通关的"
   }
 ]

BIN
tasks/Secret/se/se_se_finished_1.png