Explorar el Código

Merge pull request #870 from ChengRanORZ/fix_DemonEncounter

优化极逢魔
huangrunheng hace 1 año
padre
commit
1042e91e8a

+ 6 - 0
tasks/DemonEncounter/assets.py

@@ -46,11 +46,17 @@ class DemonEncounterAssets:
 	I_BOSS_KILLED = RuleImage(roi_front=(654,596,35,68), roi_back=(614,537,123,176), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_killed.png")
 	# 极逢魔集结挑战 
 	I_BEST_BOSS_FIRE = RuleImage(roi_front=(1087,562,100,36), roi_back=(1087,562,100,36), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_best_boss_fire.png")
+	# 战斗失败-等待界面 
+	I_BOSS_WAIT = RuleImage(roi_front=(490,50,350,150), roi_back=(490,50,350,150), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_wait.png")
+	# 战斗结束标识,左下角有战绩按钮 
+	I_BOSS_DONE_CHECK = RuleImage(roi_front=(0,450,100,130), roi_back=(0,450,100,130), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_done_check.png")
 
 
 	# Ocr Rule Assets
 	# 人数 
 	O_DE_BOSS_PEOPLE = RuleOcr(roi=(880,591,100,35), area=(880,591,100,35), mode="DigitCounter", method="Default", keyword="", name="de_boss_people")
+	# Ocr-description 
+	O_DE_BEST_BOSS_PEOPLE = RuleOcr(roi=(902,564,100,31), area=(902,564,100,31), mode="DigitCounter", method="Default", keyword="", name="de_best_boss_people")
 
 
 	# Click Rule Assets

BIN
tasks/DemonEncounter/boss/boss_boss_done_check.png


BIN
tasks/DemonEncounter/boss/boss_boss_gather.png


BIN
tasks/DemonEncounter/boss/boss_boss_wait.png


+ 18 - 0
tasks/DemonEncounter/boss/image.json

@@ -133,5 +133,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "极逢魔集结挑战"
+  },
+  {
+    "itemName": "boss_wait",
+    "imageName": "boss_boss_wait.png",
+    "roiFront": "490,50,350,150",
+    "roiBack": "490,50,350,150",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗失败-等待界面"
+  },
+  {
+    "itemName": "boss_done_check",
+    "imageName": "boss_boss_done_check.png",
+    "roiFront": "0,450,100,130",
+    "roiBack": "0,450,100,130",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗结束标识,左下角有战绩按钮"
   }
 ]

+ 9 - 0
tasks/DemonEncounter/boss/ocr.json

@@ -7,5 +7,14 @@
     "method": "Default",
     "keyword": "",
     "description": "人数"
+  },
+  {
+    "itemName": "de_best_boss_people",
+    "roiFront": "902,564,100,31",
+    "roiBack": "902,564,100,31",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
   }
 ]

+ 136 - 62
tasks/DemonEncounter/script_task.py

@@ -2,12 +2,12 @@
 # @author runhey
 # github https://github.com/runhey
 import time
+from time import sleep
 
 from enum import Enum
 from cached_property import cached_property
 from datetime import datetime, timedelta
 
-
 from module.logger import logger
 from module.exception import TaskEnd
 from module.base.timer import Timer
@@ -20,6 +20,7 @@ from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.DemonEncounter.data.answer import Answer
 
+
 class LanternClass(Enum):
     BATTLE = 0  # 打怪  --> 无法判断因为怪的图片不一样,用排除法
     BOX = 1  # 开宝箱
@@ -31,6 +32,7 @@ class LanternClass(Enum):
 
 
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
+    best_boss_enable = False
 
     def run(self):
         if not self.check_time():
@@ -50,6 +52,24 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         raise TaskEnd('DemonEncounter')
 
+    def init_best_boss_enable(self):
+        today = datetime.now().weekday()
+        if today == 0:
+            # 鬼灵歌姬
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_kiryou_select
+        elif today == 1:
+            # 蜃气楼
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_shinkirou_select
+        elif today == 2:
+            # 土蜘蛛
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_tsuchigumo_select
+        elif today == 3:
+            # 荒骷髅
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_gashadokuro_select
+        elif today == 4:
+            # 地震鲶
+            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_namazu_select
+
     def checkout_soul(self):
         """
         切换御魂
@@ -112,76 +132,133 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         :return:
         """
         logger.hr('Start boss battle', 1)
-        # 判断今天是周几
-        today = datetime.now().weekday()
+        self.init_best_boss_enable()
 
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
-                current, remain, total = self.O_DE_BOSS_PEOPLE.ocr(self.device.image)
-                if total == 300 and current >= 290:
-                    logger.info('Boss battle people is full')
-                    if not self.appear(self.I_UI_BACK_RED):
-                        logger.warning('Boss battle people is full but no red back')
-                        continue
-                    self.ui_click_until_disappear(self.I_UI_BACK_RED)
-                    # 退出重新选一个没人慢的boss
-                    logger.info('Exit and reselect')
+        def find_boss():
+            find_btn_clicked = False
+            timer_find_boss = Timer(10 * 60)
+            timer_find_boss.start()
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
+                    break
+                if timer_find_boss.reached():
+                    logger.warning('find boss timeout')
+                    self.set_next_run(task='DemonEncounter', success=False, finish=True, server=False)
+                    raise TaskEnd('DemonEncounter')
+                if self.appear(self.I_JADE_50):
+                    # 没找到boss但地图中央出现宝箱,导致点击宝箱出现50勾玉购买界面
+                    self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
+                    continue
+                # if self.appear_then_click(self.I_BOSS_NAMAZU, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_SHINKIRO, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_ODOKURO, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_OBOROGURUMA, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_TSUCHIGUMO, interval=1):
+                #     continue
+                # if self.appear_then_click(self.I_BOSS_SONGSTRESS, interval=1):
+                #     continue
+                if find_btn_clicked and self.click(self.C_DM_BOSS_CLICK, interval=5):
+                    find_btn_clicked = False
                     continue
+                if self.best_boss_enable:
+                    self.device.click_record_clear()
+                    if self.appear(self.I_DE_BOSS_BEST) and (not find_btn_clicked):
+                        self.device.click_record_remove(self.I_DE_BOSS_BEST)
+                        if self.click(self.I_DE_BOSS_BEST, interval=4):
+                            logger.info("Finding best boss...")
+                            find_btn_clicked = True
+                        continue
                 else:
-                    logger.info('Boss battle people is not full')
+                    if self.appear(self.I_DE_BOSS) and (not find_btn_clicked):
+                        self.device.click_record_remove(self.I_DE_BOSS)
+                        if self.click(self.I_DE_BOSS, interval=4):
+                            logger.info("Finding normal boss...")
+                            find_btn_clicked = True
+                        continue
+            return True
+
+        def enter_boss():
+            logger.info('trying to enter boss...')
+            # 点击集结挑战
+            boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
+            ocr_people_item = self.O_DE_BEST_BOSS_PEOPLE if self.best_boss_enable else self.O_DE_BOSS_PEOPLE
+            while 1:
+                self.screenshot()
+
+                if self.appear(self.I_BOSS_FIRE) or self.appear(self.I_BEST_BOSS_FIRE):
+                    current, remain, total = ocr_people_item.ocr(self.device.image)
+                    if total == 300 and current >= 290:
+                        logger.info('Boss battle people is full')
+                        if not self.appear(self.I_UI_BACK_RED):
+                            logger.warning('Boss battle people is full but no red back')
+                            continue
+                        self.ui_click_until_disappear(self.I_UI_BACK_RED)
+                        # 退出重新选一个没人慢的boss
+                        logger.info('Exit and reselect')
+                        return False
+
+                logger.info('Boss battle people is not full')
+
+                if self.appear(self.I_BOSS_CONFIRM):
+                    self.ui_click(self.I_BOSS_NO_SELECT, self.I_BOSS_SELECTED)
+                    self.ui_click(self.I_BOSS_CONFIRM, self.I_BOSS_GATHER)
+                    break
+                if self.appear(self.I_BOSS_GATHER):
                     break
+                if boss_fire_count >= 5:
+                    logger.warning('Boss battle already done')
+                    self.set_next_run(task='DemonEncounter', success=False, finish=True, server=True)
+                    self.ui_click_until_disappear(self.I_UI_BACK_RED)
+                    raise TaskEnd('DemonEncounter')
 
-            if self.appear_then_click(self.I_BOSS_NAMAZU, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_SHINKIRO, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_ODOKURO, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_OBOROGURUMA, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_TSUCHIGUMO, interval=1):
-                continue
-            if self.appear_then_click(self.I_BOSS_SONGSTRESS, interval=1):
-                continue
-            if self.config.demon_encounter.best_demon_boss_config.enable and today < 5:
-                if self.appear_then_click(self.I_DE_BOSS_BEST, interval=4):
+                if (self.appear_then_click(self.I_BOSS_FIRE, interval=3)
+                        or self.appear_then_click(self.I_BEST_BOSS_FIRE, interval=3)):
+                    boss_fire_count += 1
                     continue
-            else:
-                if self.appear_then_click(self.I_DE_BOSS, interval=4):
-                    continue
-            if self.click(self.C_DM_BOSS_CLICK, interval=1.7):
-                continue
+            return True
 
-        logger.info('Boss battle start')
-        # 点击集结挑战
-        boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_BOSS_CONFIRM):
-                self.ui_click(self.I_BOSS_NO_SELECT, self.I_BOSS_SELECTED)
-                self.ui_click(self.I_BOSS_CONFIRM, self.I_BOSS_GATHER)
-                break
-            if self.appear(self.I_BOSS_GATHER):
-                break
-            if boss_fire_count >= 5:
-                logger.warning('Boss battle already done')
-                self.ui_click_until_disappear(self.I_UI_BACK_RED)
+        fail_count = 0
+        while True:
+            if fail_count >= 5:
                 return
-            if self.appear_then_click(self.I_BOSS_FIRE, interval=3) or self.appear_then_click(self.I_BEST_BOSS_FIRE, interval=3):
-                boss_fire_count += 1
+            if not find_boss():
                 continue
+            if enter_boss():
+                break
+            fail_count += 1
+
         logger.info('Boss battle confirm and enter')
         # 等待挑战, 5秒也是等
         time.sleep(5)
-        self.device.stuck_record_add('BATTLE_STATUS_S')
-        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)
+        while True:
+            self.screenshot()
+            if self.appear(self.I_BOSS_DONE_CHECK):
+                break
+            if self.appear(self.I_BOSS_GATHER):
+                self.device.stuck_record_clear()
+                self.device.stuck_record_add('BATTLE_STATUS_S')
+                logger.info('Boss Gathering...')
+                sleep(2)
+                continue
+            if self.appear(self.I_BOSS_WAIT):
+                logger.info('Boss battle failed, waiting for 2 seconds...')
+                sleep(2)
+                continue
+            if self.appear(self.I_PREPARE_HIGHLIGHT):
+                self.run_general_battle(config)
+                continue
+            logger.info('Unknown scene Or Boss fight failed.waiting for Prepare_Button appear...')
+            self.wait_until_appear(self.I_PREPARE_HIGHLIGHT, wait_time=2)
+
         self.device.stuck_timer_long = Timer(300, count=300).start()
 
         # 等待回到挑战boss主界面
@@ -256,7 +333,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
     def con(self) -> GeneralBattleConfig:
         return GeneralBattleConfig()
 
-    def check_lantern(self, index: int=1):
+    def check_lantern(self, index: int = 1):
         """
         检查灯笼的类型
         :param index: 四个灯笼,从1开始
@@ -363,7 +440,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             if self.click(target_click, interval=1):
                 continue
         logger.info('Question answering Start')
-        for i in range(1,4):
+        for i in range(1, 4):
             # 还未测试题库无法识别的情况
             logger.hr(f'Answer {i}', 3)
             answer_click = answer()
@@ -386,9 +463,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 if not self.appear(self.I_LETTER_CLOSE):
                     time.sleep(0.5)
                     self.screenshot()
-                    if self.appear(self.I_LETTER_CLOSE):
-                        continue
-                    else:
+                    if not self.appear(self.I_LETTER_CLOSE):
                         logger.warning('Answer finish')
                         return
 
@@ -454,7 +529,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             if self.click(target_click, interval=2.3):
                 continue
 
-
     def check_time(self):
         """
         检查时间是否正确,