Explorar el Código

Merge pull request #568 from Gan1Ser/patch-3

fix[EternitySea]:修复魂海组队卡壁纸不检测的bug,误点到录像的bug以及当没有金币50加成时点击御魂加成的bug
huangrunheng hace 1 año
padre
commit
e364747c70

+ 1 - 1
tasks/Component/GeneralBuff/general_buff.py

@@ -61,7 +61,7 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         self.reject_invite()
         self.reject_invite()
         self.screenshot()
         self.screenshot()
         area = buff.ocr(self.device.image)
         area = buff.ocr(self.device.image)
-        if area == tuple([0, 0, 0, 0]):
+        if area == tuple([432.0, 143.0, 325.0, 21.0]):
             logger.info('No gold 50 buff')
             logger.info('No gold 50 buff')
             return None
             return None
 
 

+ 2 - 0
tasks/EternitySea/assets.py

@@ -23,6 +23,8 @@ class EternitySeaAssets:
 	I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(556,560,31,37), roi_back=(556,560,31,37), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
 	I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(556,560,31,37), roi_back=(556,560,31,37), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
 	# 小小宠物,发现宝藏 
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_pet_present.png")
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_pet_present.png")
+	# description 
+	I_BACK_BOTTOM = RuleImage(roi_front=(1126,49,46,45), roi_back=(1126,49,46,45), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_back_bottom.png")
 
 
 
 
 	# List Rule Assets
 	# List Rule Assets

+ 9 - 0
tasks/EternitySea/res/image.json

@@ -52,5 +52,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "小小宠物,发现宝藏"
     "description": "小小宠物,发现宝藏"
+  },
+  {
+    "itemName": "back_bottom",
+    "imageName": "res_back_bottom.png",
+    "roiFront": "1126,49,46,45",
+    "roiBack": "1126,49,46,45",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
   }
 ]
 ]

BIN
tasks/EternitySea/res/res_back_bottom.png


+ 12 - 0
tasks/EternitySea/script_task.py

@@ -17,6 +17,7 @@ from tasks.Orochi.config import UserStatus
 from tasks.EternitySea.config import EternitySea
 from tasks.EternitySea.config import EternitySea
 from module.exception import RequestHumanTakeover
 from module.exception import RequestHumanTakeover
 from tasks.GameUi.page import page_main, page_soul_zones, page_shikigami_records
 from tasks.GameUi.page import page_main, page_soul_zones, page_shikigami_records
+from time import sleep
 
 
 class ScriptTask(
 class ScriptTask(
     GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul, EternitySeaAssets
     GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul, EternitySeaAssets
@@ -219,6 +220,15 @@ class ScriptTask(
                     )
                     )
                     break
                     break
 
 
+    def is_room_dead(self) -> bool:
+        # 如果在探索界面或者是出现在组队界面,那就是可能房间死了
+        sleep(0.5)
+        if self.appear(self.I_MATCHING) or self.appear(self.I_CHECK_EXPLORATION):
+            sleep(0.5)
+            if self.appear(self.I_MATCHING) or self.appear(self.I_CHECK_EXPLORATION):
+                return True
+        return False
+
     def eternitysea_enter(self) -> bool:
     def eternitysea_enter(self) -> bool:
         logger.info('Enter EternitySea')
         logger.info('Enter EternitySea')
         while True:
         while True:
@@ -247,6 +257,8 @@ class ScriptTask(
             if self.appear(self.I_FORM_TEAM, interval=1):
             if self.appear(self.I_FORM_TEAM, interval=1):
                 return True
                 return True
             if self.appear_then_click(self.I_ETERNITY_SEA):
             if self.appear_then_click(self.I_ETERNITY_SEA):
+                #有可能点击到录像
+                self.appear_then_click(self.I_BACK_BOTTOM, interval=1)
                 continue
                 continue
 
 
     def _navigate_to_soul_zones(self) -> None:
     def _navigate_to_soul_zones(self) -> None: