ryland 2 лет назад
Родитель
Сommit
84fdbac52d

+ 17 - 0
tasks/Component/ReplaceShikigami/assets.py

@@ -31,6 +31,23 @@ class ReplaceShikigamiAssets:
 	C_SHIKIGAMI_LEFT_8 = RuleClick(roi_front=(1033,490,100,180), roi_back=(1033,490,100,180), name="shikigami_left_8")
 	C_SHIKIGAMI_LEFT_8 = RuleClick(roi_front=(1033,490,100,180), roi_back=(1033,490,100,180), name="shikigami_left_8")
 
 
 
 
+	# Image Rule Assets
+	# description 
+	I_DETECT_EMPTY_1 = RuleImage(roi_front=(64,262,100,100), roi_back=(38,227,158,177), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_detect_empty_1.png")
+	# description 
+	I_DETECT_EMPTY_2 = RuleImage(roi_front=(281,263,100,100), roi_back=(238,234,178,168), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_detect_empty_2.png")
+	# description 
+	I_DETECT_EMPTY_3 = RuleImage(roi_front=(495,263,100,100), roi_back=(470,234,150,150), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_detect_empty_3.png")
+	# description 
+	I_DETECT_EMPTY_4 = RuleImage(roi_front=(703,256,100,100), roi_back=(681,229,157,174), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_detect_empty_4.png")
+	# description 
+	I_DETECT_EMPTY_5 = RuleImage(roi_front=(914,257,100,100), roi_back=(872,221,198,190), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_detect_empty_5.png")
+	# description 
+	I_DETECT_EMPTY_6 = RuleImage(roi_front=(1135,253,100,100), roi_back=(1091,229,156,159), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_detect_empty_6.png")
+	# description 
+	I_NEW = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/image_name.png")
+
+
 	# Image Rule Assets
 	# Image Rule Assets
 	# description 
 	# description 
 	I_RS_NO_ADD = RuleImage(roi_front=(276,222,100,212), roi_back=(28,181,1232,293), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_no_add.png")
 	I_RS_NO_ADD = RuleImage(roi_front=(276,222,100,212), roi_back=(28,181,1232,293), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_rs_no_add.png")

+ 11 - 0
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -97,3 +97,14 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
             if self.click(click_match, interval=1.5):
             if self.click(click_match, interval=1.5):
                 continue
                 continue
         logger.info('Set shikigami: %d' % shikigami_order)
         logger.info('Set shikigami: %d' % shikigami_order)
+
+    def detect_no_shikigami(self) -> bool:
+        self.screenshot()
+        if self.appear(self.I_DETECT_EMPTY_1)\
+            and self.appear(self.I_DETECT_EMPTY_2) \
+                and self.appear(self.I_DETECT_EMPTY_3) \
+                and self.appear(self.I_DETECT_EMPTY_4) \
+                and self.appear(self.I_DETECT_EMPTY_5) \
+                and self.appear(self.I_DETECT_EMPTY_6):
+            return True
+        return False

+ 65 - 0
tasks/Component/ReplaceShikigami/rs/detect_image.json

@@ -0,0 +1,65 @@
+[
+  {
+    "itemName": "detect_empty_1",
+    "imageName": "rs_detect_empty_1.png",
+    "roiFront": "64,262,100,100",
+    "roiBack": "38,227,158,177",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "detect_empty_2",
+    "imageName": "rs_detect_empty_2.png",
+    "roiFront": "281,263,100,100",
+    "roiBack": "238,234,178,168",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "detect_empty_3",
+    "imageName": "rs_detect_empty_3.png",
+    "roiFront": "495,263,100,100",
+    "roiBack": "470,234,150,150",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "detect_empty_4",
+    "imageName": "rs_detect_empty_4.png",
+    "roiFront": "703,256,100,100",
+    "roiBack": "681,229,157,174",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "detect_empty_5",
+    "imageName": "rs_detect_empty_5.png",
+    "roiFront": "914,257,100,100",
+    "roiBack": "872,221,198,190",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "detect_empty_6",
+    "imageName": "rs_detect_empty_6.png",
+    "roiFront": "1135,253,100,100",
+    "roiBack": "1091,229,156,159",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "new",
+    "imageName": "image_name.png",
+    "roiFront": "0,0,100,100",
+    "roiBack": "0,0,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/Component/ReplaceShikigami/rs/rs_detect_empty_1.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_detect_empty_2.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_detect_empty_3.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_detect_empty_4.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_detect_empty_5.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_detect_empty_6.png


+ 12 - 0
tasks/DevRyouToppa/assets.py

@@ -0,0 +1,12 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class DevRyouToppaAssets: 
+	pass
+

+ 8 - 1
tasks/KekkaiActivation/script_task.py

@@ -10,7 +10,7 @@ from module.base.timer import Timer
 from module.atom.image_grid import ImageGrid
 from module.atom.image_grid import ImageGrid
 from module.atom.image import RuleImage
 from module.atom.image import RuleImage
 from module.logger import logger
 from module.logger import logger
-from module.exception import TaskEnd
+from module.exception import TaskEnd, GameStuckError
 
 
 from tasks.KekkaiUtilize.script_task import ScriptTask as KU
 from tasks.KekkaiUtilize.script_task import ScriptTask as KU
 from tasks.KekkaiUtilize.utils import CardClass
 from tasks.KekkaiUtilize.utils import CardClass
@@ -193,6 +193,10 @@ class ScriptTask(KU, KekkaiActivationAssets):
         if not isinstance(delta, timedelta):
         if not isinstance(delta, timedelta):
             logger.warning('OCR error')
             logger.warning('OCR error')
             return None
             return None
+        if delta == timedelta(0):
+            logger.error('The remaining time detected for this card is 0')
+            logger.error('This may be due to the fact that the card has not yet been collected')
+            raise GameStuckError
         return delta
         return delta
 
 
     def screening_card(self, rule: str):
     def screening_card(self, rule: str):
@@ -337,6 +341,9 @@ class ScriptTask(KU, KekkaiActivationAssets):
             self.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
             self.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
         else:
         else:
             logger.info('No max level shikigami')
             logger.info('No max level shikigami')
+        if self.detect_no_shikigami():
+            logger.warning('There are no any shikigami grow room')
+            self.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
 
 
         # 回到结界界面
         # 回到结界界面
         while 1:
         while 1: