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

feat(DemonEncounter): 加入极封魔

修复极封魔集结挑战

胧车夜荒魂没有极逢魔
GanSer 1 год назад
Родитель
Сommit
7118eff447

+ 2 - 0
tasks/DemonEncounter/assets.py

@@ -44,6 +44,8 @@ class DemonEncounterAssets:
 	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")
+	# 极逢魔集结挑战 
+	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")
 
 
 	# Ocr Rule Assets

BIN
tasks/DemonEncounter/boss/boss_best_boss_fire.png


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

@@ -124,5 +124,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "已击败"
+  },
+  {
+    "itemName": "best_boss_fire",
+    "imageName": "boss_best_boss_fire.png",
+    "roiFront": "1087,562,100,36",
+    "roiBack": "1087,562,100,36",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "极逢魔集结挑战"
   }
 ]

+ 32 - 1
tasks/DemonEncounter/config.py

@@ -10,12 +10,22 @@ from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Utils.config_enum import ShikigamiClass
 
+class BestDemonBossSelect(BaseModel):
+    enable: bool = Field(
+        default=False,
+        description="是否开启极封魔",
+    )
+    best_demon_kiryou_select: bool = Field(title='Best Kiryou Select', default=False, description='极鬼灵歌姬是否开启')
+    best_demon_shinkirou_select: bool = Field(title='Best Shinkirou Select', default=False, description='极蜃气楼是否开启')
+    best_demon_tsuchigumo_select: bool = Field(title='Best Tsuchigumo Select', default=False, description='极土蜘蛛是否开启')
+    best_demon_gashadokuro_select: bool = Field(title='Best Gashadokuro Select', default=False, description='极荒骷髅是否开启')
+    best_demon_namazu_select: bool = Field(title='Best Namazu Select', default=False, description='极地震鲇是否开启')
 
 # 不同封魔boss的御魂配置
 class DemonConfig(BaseModel):
     enable: bool = Field(
         default=False,
-        description="通过预设名称来匹配御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
+        description="通过预设名称来匹配普通封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
     )
     # 周一
     demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂1")
@@ -35,10 +45,31 @@ class DemonConfig(BaseModel):
     # 周日 夜荒魂
     demon_nightly_aramitama: str = Field(default="group,team", description="夜荒魂御魂")
 
+# 不同极封魔boss的御魂配置
+class BestDemonConfig(BaseModel):
+    enable: bool = Field(
+        default=False,
+        description="通过预设名称来匹配极封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
+    )
+    # 周一 鬼灵歌姬
+    best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂1")
+    best_demon_kiryou_utahime_supplementary: str = Field(
+        default="group,team", description="极鬼灵歌姬御魂补充"
+    )
+    # 周二 极蜃气楼
+    best_demon_shinkirou: str = Field(default="group,team", description="极蜃气楼御魂")
+    # 周三 极土蜘蛛
+    best_demon_tsuchigumo: str = Field(default="group,team", description="极土蜘蛛御魂")
+    # 周四 极荒骷髅
+    best_demon_gashadokuro: str = Field(default="group,team", description="极荒骷髅御魂")
+    # 周五 极地震鲇
+    best_demon_namazu: str = Field(default="group,team", description="极地震鲇御魂")
 
 class UtilizeScheduler(Scheduler):
     priority: int = Field(default=2, description='priority_help')
 
 class DemonEncounter(ConfigBase):
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
+    best_demon_boss_config: BestDemonBossSelect = Field(default_factory=BestDemonBossSelect)
     demon_soul_config: DemonConfig = Field(default_factory=DemonConfig)
+    best_demon_soul_config: BestDemonConfig = Field(default_factory=BestDemonConfig)

+ 49 - 13
tasks/DemonEncounter/script_task.py

@@ -7,6 +7,7 @@ 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
@@ -38,7 +39,8 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         self.ui_get_current_page()
         # 切换御魂
         soul_config = self.config.demon_encounter.demon_soul_config
-        if soul_config.enable:
+        best_soul_config = self.config.demon_encounter.best_demon_soul_config
+        if soul_config.enable or best_soul_config.enable:
             self.ui_goto(page_shikigami_records)
             self.checkout_soul()
         self.ui_goto(page_demon_encounter)
@@ -54,28 +56,54 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         """
         # 判断今天是周几
         today = datetime.now().weekday()
+
+        # 普通逢魔御魂
         soul_config = self.config.demon_encounter.demon_soul_config
+        # 极逢魔御魂
+        best_soul_config = self.config.demon_encounter.best_demon_soul_config
+
+        # 极逢魔选择
+        best_demon_boss_config = self.config.demon_encounter.best_demon_boss_config
+
         group, team = None, None
         if today == 0:
             # 获取group,team
-            group, team = soul_config.demon_kiryou_utahime.split(",")
+            if best_soul_config.enable and best_demon_boss_config.best_demon_kiryou_select:
+                group, team = best_soul_config.best_demon_kiryou_utahime.split(",")
+            else:
+                group, team = soul_config.demon_kiryou_utahime.split(",")
         elif today == 1:
-            group, team = soul_config.demon_kiryou_utahime.split(",")
+            if best_soul_config.enable and best_demon_boss_config.best_demon_shinkirou_select:
+                group, team = best_soul_config.best_demon_shinkirou.split(",")
+            else:
+                group, team = soul_config.demon_shinkirou.split(",")
         elif today == 2:
-            group, team = soul_config.demon_tsuchigumo.split(",")
+            if best_soul_config.enable and best_demon_boss_config.best_demon_tsuchigumo_select:
+                group, team = best_soul_config.best_demon_tsuchigumo.split(",")
+            else:
+                group, team = soul_config.demon_tsuchigumo.split(",")
         elif today == 3:
-            group, team = soul_config.demon_gashadokuro.split(",")
+            if best_soul_config.enable and best_demon_boss_config.best_demon_gashadokuro_select:
+                group, team = best_soul_config.best_demon_gashadokuro.split(",")
+            else:
+                group, team = soul_config.demon_gashadokuro.split(",")
         elif today == 4:
-            group, team = soul_config.demon_namazu.split(",")
+            if best_soul_config.enable and best_demon_boss_config.best_demon_namazu_select:
+                group, team = best_soul_config.best_demon_namazu.split(",")
+            else:
+                group, team = soul_config.demon_namazu.split(",")
         elif today == 5:
-            group, team = soul_config.demon_oboroguruma.split(",")
+                group, team = soul_config.demon_oboroguruma.split(",")
         elif today == 6:
-            group, team = soul_config.demon_nightly_aramitama.split(",")
+                group, team = soul_config.demon_nightly_aramitama.split(",")
         if group and team:
             self.run_switch_soul_by_name(group, team)
         if today == 0:
             # 获取group,team
-            group, team = soul_config.demon_kiryou_utahime_supplementary.split(",")
+            if best_soul_config.enable and best_demon_boss_config.best_demon_kiryou_select:
+                group, team = best_soul_config.best_demon_kiryou_utahime_supplementary.split(",")
+            else:
+                group, team = soul_config.demon_kiryou_utahime_supplementary.split(",")
             self.run_switch_soul_by_name(group, team)
 
     def execute_boss(self):
@@ -84,9 +112,12 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         :return:
         """
         logger.hr('Start boss battle', 1)
+        # 判断今天是周几
+        today = datetime.now().weekday()
+
         while 1:
             self.screenshot()
-            if self.appear(self.I_BOSS_FIRE):
+            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')
@@ -113,10 +144,15 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 continue
             if self.appear_then_click(self.I_BOSS_SONGSTRESS, interval=1):
                 continue
-            if self.appear_then_click(self.I_DE_BOSS, interval=4):
-                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):
+                    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
+
         logger.info('Boss battle start')
         # 点击集结挑战
         boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
@@ -132,7 +168,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 logger.warning('Boss battle already done')
                 self.ui_click_until_disappear(self.I_UI_BACK_RED)
                 return
-            if self.appear_then_click(self.I_BOSS_FIRE, interval=3):
+            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
         logger.info('Boss battle confirm and enter')