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

fix(SoulsTidy):修复开启“御魂堆叠”后不奉纳的问题

minjie 10 месяцев назад
Родитель
Сommit
9437674b72

+ 3 - 1
tasks/SoulsTidy/assets.py

@@ -49,7 +49,9 @@ class SoulsTidyAssets:
 	# 御魂奉纳后获得的金币 
 	I_ST_GOLD = RuleImage(roi_front=(170,100,950,500), roi_back=(170,100,950,500), threshold=0.9, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_gold.png")
 	# 御魂溢出 
-	I_ST_SOUL_OVERFLOW = RuleImage(roi_front=(447,260,384,42), roi_back=(430,232,417,100), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_soul_overflow.png")
+	I_ST_SOUL_OVERFLOW = RuleImage(roi_front=(447,260,384,42), roi_back=(447,260,384,42), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_soul_overflow.png")
+	# 狗粮御魂的堆叠标识 
+	I_ST_SOUL_STACK = RuleImage(roi_front=(142,234,20,16), roi_back=(142,234,20,16), threshold=0.8, method="Template matching", file="./tasks/SoulsTidy/simple/simple_st_soul_stack.png")
 
 
 	# Long Click Rule Assets

+ 19 - 14
tasks/SoulsTidy/script_task.py

@@ -124,20 +124,25 @@ class ScriptTask(GameUi, SoulsTidyAssets):
             logger.info('Sort by level')
             # 开始奉纳
             while 1:
-                self.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
-                self.screenshot()
-                # 非+0的不弃置 双保险
-                if not self.appear(self.I_ST_LEVEL_0):
-                    logger.info("First Orichi isn't Level 0,quit")
-                    break
-                firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
-                if firvel is None or firvel == '':
-                    logger.info('ocr result is Null')
-                    continue
-                if firvel != '古':
-                    # 问就是 把 +0 识别成了 古
-                    logger.info('No zero level, bongna done')
-                    break
+                if self.wait_until_appear(self.I_ST_SOUL_STACK, wait_time=2):
+                    # 方式1. 御魂堆叠奉纳
+                    logger.info('Soul stack')
+                else:
+                    # 方式2. 强化+0奉纳
+                    self.wait_until_appear(self.I_ST_LEVEL_0, wait_time=2)
+                    self.screenshot()
+                    # 非+0的不弃置 双保险
+                    if not self.appear(self.I_ST_LEVEL_0):
+                        logger.info("First Orichi isn't Level 0,quit")
+                        break
+                    firvel = self.O_ST_FIRSET_LEVEL.ocr(self.device.image)
+                    if firvel is None or firvel == '':
+                        logger.info('ocr result is Null')
+                        continue
+                    if firvel != '古':
+                        # 问就是 把 +0 识别成了 古
+                        logger.info('No zero level, bongna done')
+                        break
 
                 # !!!!!!  这里没有检查金币是否足够
                 # 长按

+ 10 - 1
tasks/SoulsTidy/simple/image.json

@@ -138,9 +138,18 @@
     "itemName": "st_soul_overflow",
     "imageName": "simple_st_soul_overflow.png",
     "roiFront": "447,260,384,42",
-    "roiBack": "430,232,417,100",
+    "roiBack": "447,260,384,42",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "御魂溢出"
+  },
+  {
+    "itemName": "st_soul_stack",
+    "imageName": "simple_st_soul_stack.png",
+    "roiFront": "142,234,20,16",
+    "roiBack": "142,234,20,16",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "狗粮御魂的堆叠标识"
   }
 ]

BIN
tasks/SoulsTidy/simple/simple_st_soul_stack.png