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

fix(task): update DemonEncounter

runhey 3 лет назад
Родитель
Сommit
8055299a47

+ 4 - 0
tasks/DemonEncounter/assets.py

@@ -98,6 +98,10 @@ class DemonEncounterAssets:
 	I_DE_SMALL_FIRE = RuleImage(roi_front=(1064,549,100,100), roi_back=(1064,549,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_small_fire.png")
 	# 神秘任务 
 	I_DE_MYSTERY = RuleImage(roi_front=(1216,296,27,29), roi_back=(1192,278,85,261), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_mystery.png")
+	# 打结界的 
+	I_DE_REALM = RuleImage(roi_front=(1209,431,30,22), roi_back=(1190,274,88,273), threshold=0.75, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_realm.png")
+	# 结界-进攻 
+	I_DE_REALM_FIRE = RuleImage(roi_front=(696,421,129,63), roi_back=(162,99,1106,610), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_realm_fire.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/DemonEncounter/demon/demon_de_realm.png


BIN
tasks/DemonEncounter/demon/demon_de_realm_fire.png


+ 18 - 0
tasks/DemonEncounter/demon/image_side.json

@@ -97,5 +97,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "神秘任务"
+  },
+  {
+    "itemName": "de_realm",
+    "imageName": "demon_de_realm.png",
+    "roiFront": "1209,431,30,22",
+    "roiBack": "1190,274,88,273",
+    "method": "Template matching",
+    "threshold": 0.75,
+    "description": "打结界的"
+  },
+  {
+    "itemName": "de_realm_fire",
+    "imageName": "demon_de_realm_fire.png",
+    "roiFront": "696,421,129,63",
+    "roiBack": "162,99,1106,610",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "结界-进攻"
   }
 ]

+ 46 - 1
tasks/DemonEncounter/script_task.py

@@ -5,6 +5,7 @@ import time
 
 from enum import Enum
 from cached_property import cached_property
+from datetime import datetime
 
 from module.logger import logger
 from module.exception import TaskEnd
@@ -29,6 +30,9 @@ class LanternClass(Enum):
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
 
     def run(self):
+        if not self.check_time():
+            logger.warning('Time is not right')
+            raise TaskEnd('DemonEncounter')
         self.ui_get_current_page()
         self.ui_goto(page_demon_encounter)
         self.execute_lantern()
@@ -193,9 +197,11 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
         self.I_DE_BOX.roi_back = match_roi[index]
         self.I_DE_LETTER.roi_back = match_roi[index]
         self.I_DE_MYSTERY.roi_back = match_roi[index]
+        self.I_DE_REALM.roi_back = match_roi[index]
         target_box = self.I_DE_BOX
         target_letter = self.I_DE_LETTER
         target_mystery = self.I_DE_MYSTERY
+        target_realm = self.I_DE_REALM
         target_empty = match_empty[index]
 
         # 开始判断
@@ -209,6 +215,9 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
         elif self.appear(target_mystery):
             logger.info(f'Lantern {index} is mystery task')
             return LanternClass.MYSTERY
+        elif self.appear(target_realm):
+            logger.info(f'Lantern {index} is realm')
+            return LanternClass.REALM
         elif self.appear(target_empty):
             logger.info(f'Lantern {index} is empty')
             return LanternClass.EMPTY
@@ -312,12 +321,48 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
 
     def _realm(self, target_click):
         # 结界
-        self._battle(target_click)
+        config = self.con
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_DE_LOCATION):
+                logger.info('Battle Start')
+                break
+            if self.appear_then_click(self.I_DE_REALM_FIRE, interval=0.7):
+                continue
+
+            if self.click(target_click, interval=1):
+                continue
+        if self.run_general_battle(config):
+            logger.info('Battle End')
 
     def _mystery(self, target_click):
         # 神秘任务, 不做
         pass
 
+    def check_time(self):
+        """
+        检查时间是否正确,
+        如果正确就继续
+        如果不在17:00到22:00之间,就推迟到下一个 17:30
+        :return:
+        """
+        now = datetime.datetime.now()
+        if now.hour < 17:
+            # 17点之前,推迟到当天的17点半
+            logger.info('Before 17:00, wait to 17:30')
+            target_time = datetime.datetime(now.year, now.month, now.day, 17, 30, 0)
+            self.set_next_run(task='DemonEncounter', success=False, finish=False, target=target_time)
+            return False
+        elif now.hour >= 22:
+            # 22点之后,推迟到第二天的17:30
+            logger.info('After 22:00, wait to 17:30')
+            target_time = datetime.datetime(now.year, now.month, now.day, 17, 30, 0) + datetime.timedelta(days=1)
+            self.set_next_run(task='DemonEncounter', success=False, finish=False, target=target_time)
+            return False
+        else:
+            return True
+
+
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device

+ 5 - 0
tasks/Duel/script_task.py

@@ -145,6 +145,11 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
                 break
             if self.ocr_appear_click(self.O_D_HAND, interval=1):
                 continue
+            # 如果对方直接秒退,那自己就是赢的
+            if self.appear(self.I_D_VICTORY):
+                logger.info('Duel battle win')
+                self.ui_click_until_disappear(self.I_D_VICTORY)
+                return True
         # 绿标
         self.green_mark(enable, mark_mode)
         # 等待结果

+ 0 - 2
tasks/GameUi/game_ui.py

@@ -188,8 +188,6 @@ class GameUi(BaseTask, GameUiAssets):
             visited = new
 
         logger.hr(f"UI goto {destination}")
-        for vis in visited:
-            logger.attr("visited", vis)
         confirm_timer = Timer(confirm_wait, count=int(confirm_wait // 0.5)).start()
         while 1:
             if skip_first_screenshot: