Эх сурвалжийг харах

Handle active Abyss Shadows map on Shenshe entry

leovefy 5 сар өмнө
parent
commit
1bb9350806

+ 1 - 2
tasks/AbyssShadows/assets.py

@@ -61,7 +61,7 @@ class AbyssShadowsAssets:
 	# 式神录 
 	I_ABYSS_SHIKI = RuleImage(roi_front=(1199,462,47,53), roi_back=(1199,462,47,53), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_shiki.png")
 	# 狭间暗域 
-	I_ABYSS_SHADOWS = RuleImage(roi_front=(711,489,107,38), roi_back=(711,479,107,48), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_shadows.png")
+	I_ABYSS_SHADOWS = RuleImage(roi_front=(711,489,107,38), roi_back=(700,470,140,70), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_shadows.png")
 	# 开启狭间暗域 
 	I_OPEN_ABYSS_SHADOWS = RuleImage(roi_front=(1133,602,74,58), roi_back=(1133,602,74,58), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_open_abyss_shadows.png")
 	# 战报页面 
@@ -102,4 +102,3 @@ class AbyssShadowsAssets:
 	# 滑到狭间 
 	S_TO_ABBSY_SHADOWS = RuleSwipe(roi_front=(752,395,62,66), roi_back=(758,193,62,48), mode="default", name="to_abbsy_shadows")
 
-

+ 2 - 2
tasks/AbyssShadows/res/image.json

@@ -75,7 +75,7 @@
     "itemName": "abyss_shadows",
     "imageName": "res_abyss_shadows.png",
     "roiFront": "711,489,107,38",
-    "roiBack": "711,479,107,48",
+    "roiBack": "700,470,140,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "狭间暗域"
@@ -206,4 +206,4 @@
     "threshold": 0.8,
     "description": "description"
   }
-]
+]

+ 5 - 1
tasks/AbyssShadows/script_task.py

@@ -317,6 +317,10 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AbyssShadowsAssets):
         
         while 1:
             self.screenshot()
+            # Entering Shenshe can resume an active Abyss Shadows map directly.
+            if self.appear(self.I_ABYSS_NAVIGATION):
+                logger.info("Already in abyss_shadows")
+                break
             # 进入神社
             if self.appear_then_click(self.I_RYOU_SHENSHE,interval=1):
                 logger.info("Enter Shenshe")
@@ -566,4 +570,4 @@ if __name__ == "__main__":
     config = Config('zhu')
     device = Device(config)
     t = ScriptTask(config, device)
-    t.run()
+    t.run()