ryland 1 год назад
Родитель
Сommit
7cb8101e37

+ 4 - 0
tasks/DemonEncounter/assets.py

@@ -42,6 +42,8 @@ class DemonEncounterAssets:
 	I_BOSS_WIN = RuleImage(roi_front=(380,43,100,100), roi_back=(380,43,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_win.png")
 	# 白色退出 
 	I_BOSS_BACK_WHITE = RuleImage(roi_front=(16,12,39,40), roi_back=(16,12,39,40), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_back_white.png")
+	# 已击败 
+	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")
 
 
 	# Ocr Rule Assets
@@ -106,6 +108,8 @@ class DemonEncounterAssets:
 	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")
+	# 发现大boss 
+	I_DE_FIND_BOSS = RuleImage(roi_front=(1210,425,29,36), roi_back=(1182,279,93,266), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_find_boss.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/DemonEncounter/boss/boss_boss_killed.png


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

@@ -115,5 +115,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "白色退出"
+  },
+  {
+    "itemName": "boss_killed",
+    "imageName": "boss_boss_killed.png",
+    "roiFront": "654,596,35,68",
+    "roiBack": "614,537,123,176",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已击败"
   }
 ]

BIN
tasks/DemonEncounter/demon/demon_de_find_boss.png


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

@@ -115,5 +115,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "结界-进攻"
+  },
+  {
+    "itemName": "de_find_boss",
+    "imageName": "demon_de_find_boss.png",
+    "roiFront": "1210,425,29,36",
+    "roiBack": "1182,279,93,266",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "发现大boss"
   }
 ]

+ 25 - 3
tasks/DemonEncounter/script_task.py

@@ -26,6 +26,7 @@ class LanternClass(Enum):
     REALM = 3  # 打结界
     EMPTY = 4  # 空
     MYSTERY = 5  # 神秘任务
+    BOSS = 6  # 大鬼王
 
 
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
@@ -211,6 +212,8 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                     self._battle(match_click[i])
                 case LanternClass.MYSTERY:
                     self._mystery(match_click[i])
+                case LanternClass.BOSS:
+                    self._boss(match_click[i])
             time.sleep(1)
 
     @cached_property
@@ -239,10 +242,12 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         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]
+        self.I_DE_FIND_BOSS.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_find_boss = self.I_DE_FIND_BOSS
         target_empty = match_empty[index]
 
         # 开始判断
@@ -262,6 +267,9 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         elif self.appear(target_empty):
             logger.info(f'Lantern {index} is empty')
             return LanternClass.EMPTY
+        elif self.appear(target_find_boss):
+            logger.info(f'Lantern {index} is boss')
+            return LanternClass.BOSS
         else:
             # 无法判断是否是战斗的还是结界的
             logger.info(f'Lantern {index} is battle')
@@ -284,9 +292,8 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 if self.appear_then_click(self.I_DE_FIND, interval=2.5):
                     break
 
-
     def _mail(self, target_click):
-        # 答题,还没有碰到过答题的
+        # 答题
         def answer():
             click_match = {
                 1: self.C_ANSWER_1,
@@ -396,6 +403,22 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         # 神秘任务, 不做
         pass
 
+    def _boss(self, target_click):
+        # 运气爆表,点灯笼出现大鬼王
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_BOSS_KILLED):
+                # 这个大鬼王已经击败
+                logger.warning('Boss already killed')
+                self.ui_click_until_disappear(self.I_UI_BACK_RED)
+                break
+            if self.appear(self.I_BOSS_FIRE):
+                self.execute_boss()
+                break
+            if self.click(target_click, interval=2.3):
+                continue
+
+
     def check_time(self):
         """
         检查时间是否正确,
@@ -458,7 +481,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    from memory_profiler import profile
 
     c = Config('du')
     d = Device(c)

+ 6 - 9
tasks/RichMan/assets.py

@@ -23,9 +23,9 @@ class RichManAssets:
 	I_GUILD_SCRAP = RuleImage(roi_front=(570,439,71,68), roi_back=(331,160,559,372), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_scrap.png")
 	# 皮肤券 
 	I_GUILD_SKIN = RuleImage(roi_front=(795,438,71,72), roi_back=(320,162,573,371), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_skin.png")
-	# 皮肤券判断是否到末端
+	# 皮肤券判断是否到末端 
 	I_GUILD_SKIN_CHECK = RuleImage(roi_front=(795,438,71,72), roi_back=(320,162,573,371), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_skin.png")
-	# 购买检查
+	# 购买检查 
 	I_GUILD_CHECK_SCRAP = RuleImage(roi_front=(561,429,90,88), roi_back=(561,429,90,88), threshold=0.8, method="Template matching", file="./tasks/RichMan/guild/guild_guild_check_scrap.png")
 
 
@@ -59,8 +59,7 @@ class RichManAssets:
 
 
 	# Ocr Rule Assets
-	O_BL_RES_SOULS_new = RuleOcr(roi=(88,417,1049,37), area=(88,417,1049,37), mode="Full", method="Default", keyword="随机御魂", name="bl_res_souls_new")
-	# 御魂剩余
+	# 御魂剩余 
 	O_BL_RES_SOULS = RuleOcr(roi=(90,281,31,34), area=(90,281,31,34), mode="Digit", method="Default", keyword="", name="bl_res_souls")
 	# 石头剩余 
 	O_BL_RES_STONE = RuleOcr(roi=(357,284,29,34), area=(357,284,29,34), mode="Digit", method="Default", keyword="", name="bl_res_stone")
@@ -164,11 +163,9 @@ class RichManAssets:
 	I_MALL_SCALES_SURE = RuleImage(roi_front=(1195,100,62,85), roi_back=(1195,100,62,85), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_scales_sure.png")
 	# 契灵商店 
 	I_MALL_BONDLINGS_SURE = RuleImage(roi_front=(1194,421,69,74), roi_back=(1194,421,69,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_sure.png")
-	# 已选中契灵商店
+	# 已选中契灵商店 
 	I_MALL_BONDLINGS_ON = RuleImage(roi_front=(99,417,1021,37), roi_back=(99,417,1021,37), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_on.png")
-	# 随机御魂
-	I_ME_SOULS_NEW = RuleImage(roi_front=(980,417,140,37), roi_back=(980,417,140,37), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_over.png")
-	# 契灵商店
+	# 契灵商店 
 	I_MALL_BONDLINGS_CHECK = RuleImage(roi_front=(355,186,34,104), roi_back=(355,186,34,104), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_check.png")
 	# 杂货铺 
 	I_MALL_SUNDRY = RuleImage(roi_front=(880,646,53,54), roi_back=(834,621,116,90), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
@@ -205,7 +202,7 @@ class RichManAssets:
 	# 左数第二个 
 	O_MALL_RESOURCE_2 = RuleOcr(roi=(326,8,124,39), area=(326,8,124,39), mode="Digit", method="Default", keyword="", name="mall_resource_2")
 	# 左数第二个 
-	O_MALL_RESOURCE_3 = RuleOcr(roi=(550,9,107,38), area=(550,9,107,38), mode="Single", method="Default", keyword="", name="mall_resource_3")
+	O_MALL_RESOURCE_3 = RuleOcr(roi=(533,9,107,38), area=(533,9,107,38), mode="Digit", method="Default", keyword="", name="mall_resource_3")
 	# 左数第二个 
 	O_MALL_RESOURCE_4 = RuleOcr(roi=(739,8,100,39), area=(739,8,100,39), mode="Digit", method="Default", keyword="", name="mall_resource_4")
 	# 左数第二个