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

feat(task): update DemonEncounter

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

+ 4 - 1
tasks/Component/GeneralBattle/general_battle.py

@@ -210,7 +210,10 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
                 if not self.appear(self.I_FALSE, threshold=0.6):
                     return False
         # 最后保证能点击 获得奖励
-        self.wait_until_appear(self.I_REWARD)
+        if not self.wait_until_appear(self.I_REWARD):
+            # 有些的战斗没有下面的奖励,所以直接返回
+            logger.info("There is no reward, Exit battle")
+            return win
         logger.info("Get reward")
         while 1:
             self.screenshot()

+ 2 - 0
tasks/DemonEncounter/assets.py

@@ -91,6 +91,8 @@ class DemonEncounterAssets:
 	I_LETTER_CLOSE = RuleImage(roi_front=(851,43,45,45), roi_back=(851,43,45,45), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_letter_close.png")
 	# 小鬼王的挑战 
 	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")
 
 
 	# Ocr Rule Assets

BIN
tasks/DemonEncounter/demon/demon_de_mystery.png


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

@@ -88,5 +88,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "小鬼王的挑战"
+  },
+  {
+    "itemName": "de_mystery",
+    "imageName": "demon_de_mystery.png",
+    "roiFront": "1216,296,27,29",
+    "roiBack": "1192,278,85,261",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神秘任务"
   }
 ]

+ 14 - 0
tasks/DemonEncounter/script_task.py

@@ -23,6 +23,7 @@ class LanternClass(Enum):
     MAIL = 2  # 邮件答题
     REALM = 3  # 打结界
     EMPTY = 4  # 空
+    MYSTERY = 5  # 神秘任务
 
 
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
@@ -83,8 +84,11 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
         self.wait_until_disappear(self.I_BOSS_GATHER)
         self.device.stuck_record_clear()
         self.device.stuck_record_add('BATTLE_STATUS_S')
+        # 延长时间并在战斗结束后改回来
+        self.device.stuck_timer_long = Timer(480, count=480).start()
         config = self.con
         self.run_general_battle(config)
+        self.device.stuck_timer_long = Timer(300, count=300).start()
 
         # 等待回到挑战boss主界面
         self.wait_until_appear(self.I_BOSS_GATHER)
@@ -148,6 +152,8 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
                     logger.warning(f'Lantern {i} is empty')
                 case LanternClass.BATTLE:
                     self._battle(match_click[i])
+                case LanternClass.MYSTERY:
+                    self._mystery(match_click[i])
             time.sleep(1)
 
     @cached_property
@@ -174,8 +180,10 @@ 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]
         target_box = self.I_DE_BOX
         target_letter = self.I_DE_LETTER
+        target_mystery = self.I_DE_MYSTERY
         target_empty = match_empty[index]
 
         # 开始判断
@@ -186,6 +194,9 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
         elif self.appear(target_letter):
             logger.info(f'Lantern {index} is letter')
             return LanternClass.MAIL
+        elif self.appear(target_mystery):
+            logger.info(f'Lantern {index} is mystery task')
+            return LanternClass.MYSTERY
         elif self.appear(target_empty):
             logger.info(f'Lantern {index} is empty')
             return LanternClass.EMPTY
@@ -291,6 +302,9 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
         # 结界
         self._battle(target_click)
 
+    def _mystery(self, target_click):
+        # 神秘任务, 不做
+        pass
 
 if __name__ == '__main__':
     from module.config.config import Config