Kaynağa Gözat

Merge pull request #1508 from lhye/dev

feat(DemonEncounter): 支持新的逢魔之时page切换
huangrunheng 6 ay önce
ebeveyn
işleme
193be78bf2

+ 2 - 2
tasks/DemonEncounter/assets.py

@@ -71,9 +71,9 @@ class DemonEncounterAssets:
 
 
 	# Image Rule Assets
-	# 红色达摩 
+	# 红色达摩
 	I_DE_RED_DHARMA = RuleImage(roi_front=(1216,215,32,33), roi_back=(1209,208,51,50), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_red_dharma.png")
-	# 点击右下角的寻找封魔 
+	# 点击右下角的寻找封魔
 	I_DE_FIND = RuleImage(roi_front=(1136,593,100,100), roi_back=(1136,593,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_find.png")
 	# 点击首领 
 	I_DE_BOSS = RuleImage(roi_front=(1001,645,45,45), roi_back=(1001,645,45,45), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_boss.png")

+ 21 - 2
tasks/DemonEncounter/script_task.py

@@ -15,7 +15,7 @@ from module.base.timer import Timer
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.DemonEncounter.config import BossType, DemonEncounter, convert_to_general_battle_config
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_demon_encounter, page_shikigami_records
+from tasks.GameUi.page import page_demon_encounter, page_demon_encounter_realworld, page_shikigami_records
 from tasks.DemonEncounter.assets import DemonEncounterAssets
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
@@ -47,7 +47,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         if soul_config.enable or best_soul_config.enable:
             self.ui_goto(page_shikigami_records)
             self.checkout_soul()
-        self.ui_goto(page_demon_encounter)
+        self.ui_goto(page_demon_encounter_realworld)
         self.execute_lantern()
         self.execute_boss()
 
@@ -544,6 +544,25 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         boss_name = BossType(datetime.now().weekday()).name
         return getattr(self.conf.best_demon_boss_config, f'best_demon_{boss_name}_select', False)
 
+    def wait_and_click(self, target) -> bool:
+        """
+        等待目标出现并点击,然后返回True
+        :param target: 图片规则
+        :return: 点击成功返回True
+        """
+        from module.base.timer import Timer
+        from module.exception import TaskEnd
+        timeout = 60
+        timer = Timer(timeout)
+        timer.start()
+        while not timer.reached():
+            self.screenshot()
+            if self.appear(target):
+                if self.appear_then_click(target, interval=1):
+                    return True
+        logger.warning(f'wait_and_click {target.name} timeout')
+        return False
+
 
 if __name__ == '__main__':
     from module.config.config import Config

+ 6 - 2
tasks/GameUi/assets.py

@@ -114,8 +114,12 @@ class GameUiAssets:
 	I_TOWN_GOTO_HYAKKISEN = RuleImage(roi_front=(192,145,48,67), roi_back=(86,130,447,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_town_goto_hyakkisen.png")
 	# 斗技主界面左上角文字图像 
 	I_CHECK_DUEL = RuleImage(roi_front=(149,16,64,38), roi_back=(133,0,110,74), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_duel.png")
-	# description 
-	I_CHECK_DEMON_ENCOUNTER = RuleImage(roi_front=(26,658,42,43), roi_back=(2,619,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_demon_encounter.png")
+	# description
+	I_CHECK_DEMON_ENCOUNTER = RuleImage(roi_front=(153,16,129,38), roi_back=(153,16,129,38), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_demon_encounter.png")
+	# 检查逢魔之时现世逢魔界面
+	I_CHECK_DEMON_ENCOUNTER_REALWORLD = RuleImage(roi_front=(26,658,42,43), roi_back=(2,619,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_demon_encounter_realworld.png")
+	# 逢魔之时进入现世逢魔
+	I_DEMON_ENCOUNTER_REALWORLD_GOTO = RuleImage(roi_front=(994,485,106,30), roi_back=(994,485,106,30), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_demon_encounter_realworld.png")
 	# 检查狩猎战界面 
 	I_CHECK_HUNT = RuleImage(roi_front=(575,30,46,25), roi_back=(553,1,81,68), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_check_hunt.png")
 	# 检查狩猎战麒麟界面 

+ 4 - 0
tasks/GameUi/page.py

@@ -127,6 +127,10 @@ page_town.link(button=G.I_TOWN_GOTO_DUEL, destination=page_duel)
 page_demon_encounter = Page(G.I_CHECK_DEMON_ENCOUNTER)
 page_demon_encounter.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_DEMON_ENCOUNTER, destination=page_demon_encounter)
+# 逢魔之时现世逢魔 demon_encounter_realworld
+page_demon_encounter_realworld = Page(G.I_CHECK_DEMON_ENCOUNTER_REALWORLD)
+page_demon_encounter_realworld.link(button=G.I_BACK_YOLLOW, destination=page_demon_encounter)
+page_demon_encounter.link(button=G.I_DEMON_ENCOUNTER_REALWORLD_GOTO, destination=page_demon_encounter_realworld)
 # 狩猎战 hunt
 page_hunt = Page(G.I_CHECK_HUNT)
 page_hunt.link(button=G.I_BACK_YOLLOW, destination=page_town)

BIN
tasks/GameUi/page/page_check_demon_encounter.png


BIN
tasks/GameUi/page/page_check_demon_encounter_realworld.png


BIN
tasks/GameUi/page/page_demon_encounter_realworld.png


+ 9 - 0
tasks/GameUi/page/page_img_3.json

@@ -205,5 +205,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "退出战斗按钮"
+  },
+  {
+    "itemName": "demon_encounter_realworld",
+    "imageName": "page_demon_encounter_realworld.png",
+    "roiFront": "994,485,106,30",
+    "roiBack": "994,485,106,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入现世逢魔"
   }
 ]