소스 검색

feat(DemonEncounter): optimize code

Azure 1 년 전
부모
커밋
0cd91a912c
2개의 변경된 파일과 62개의 추가작업 그리고 113개의 파일을 삭제
  1. 31 18
      tasks/DemonEncounter/config.py
  2. 31 95
      tasks/DemonEncounter/script_task.py

+ 31 - 18
tasks/DemonEncounter/config.py

@@ -2,29 +2,43 @@
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
-from enum import Enum
+from enum import Enum, IntEnum
 from datetime import datetime, time
 from datetime import datetime, time
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.config_base import ConfigBase, TimeDelta, dynamic_hide
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Utils.config_enum import ShikigamiClass
 from tasks.Utils.config_enum import ShikigamiClass
 
 
+
+class BossType(IntEnum):
+    kiryou_utahime = 0  # 鬼灵歌姬
+    shinkirou = 1  # 蜃气楼
+    tsuchigumo = 2  # 土蜘蛛
+    gashadokuro = 3  # 荒骷髅
+    namazu = 4  # 地震鲶
+    oboroguruma = 5  # 胧车
+    nightly_aramitama = 6  # 夜荒魂
+
+
 # 宝箱购买项目
 # 宝箱购买项目
 class BoxBuyConfig(BaseModel):
 class BoxBuyConfig(BaseModel):
     # 默认购买蓝票,未添加选项,没人会不买吧!
     # 默认购买蓝票,未添加选项,没人会不买吧!
     box_buy_sushi: bool = Field(default=False, description='逢魔宝箱是否购买体力')
     box_buy_sushi: bool = Field(default=False, description='逢魔宝箱是否购买体力')
 
 
+
 class BestDemonBossSelect(BaseModel):
 class BestDemonBossSelect(BaseModel):
-    enable: bool = Field(
-        default=False,
-        description="是否开启极封魔",
-    )
-    best_demon_kiryou_select: bool = Field(title='Best Kiryou Select', default=False, description='极鬼灵歌姬是否开启')
+    best_demon_kiryou_utahime_select: bool = Field(title='Best Kiryou Utahime Select', default=False, description='极鬼灵歌姬是否开启')
     best_demon_shinkirou_select: bool = Field(title='Best Shinkirou 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_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_gashadokuro_select: bool = Field(title='Best Gashadokuro Select', default=False, description='极荒骷髅是否开启')
     best_demon_namazu_select: bool = Field(title='Best Namazu Select', default=False, description='极地震鲇是否开启')
     best_demon_namazu_select: bool = Field(title='Best Namazu Select', default=False, description='极地震鲇是否开启')
+    best_demon_oboroguruma_select: bool = Field(title='Best Oboroguruma Select', default=False, description='极胧车是否开启')
+    best_demon_nightly_aramitama_select: bool = Field(title='Best Nightly Aramitama Select', default=False, description='极夜荒魂是否开启')
+
+    hide_fields = dynamic_hide('best_demon_kiryou_utahime_select', 'best_demon_oboroguruma_select',
+                               'best_demon_nightly_aramitama_select')
+
 
 
 # 不同封魔boss的御魂配置
 # 不同封魔boss的御魂配置
 class DemonConfig(BaseModel):
 class DemonConfig(BaseModel):
@@ -34,9 +48,7 @@ class DemonConfig(BaseModel):
     )
     )
     # 周一
     # 周一
     demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂1")
     demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂1")
-    demon_kiryou_utahime_supplementary: str = Field(
-        default="group,team", description="鬼灵歌姬御魂补充"
-    )
+    demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="鬼灵歌姬御魂补充")
     # 周二
     # 周二
     demon_shinkirou: str = Field(default="group,team", description="蜃气楼御魂")
     demon_shinkirou: str = Field(default="group,team", description="蜃气楼御魂")
     # 周三 土蜘蛛
     # 周三 土蜘蛛
@@ -50,29 +62,30 @@ class DemonConfig(BaseModel):
     # 周日 夜荒魂
     # 周日 夜荒魂
     demon_nightly_aramitama: str = Field(default="group,team", description="夜荒魂御魂")
     demon_nightly_aramitama: str = Field(default="group,team", description="夜荒魂御魂")
 
 
+
 # 不同极封魔boss的御魂配置
 # 不同极封魔boss的御魂配置
 class BestDemonConfig(BaseModel):
 class BestDemonConfig(BaseModel):
     enable: bool = Field(
     enable: bool = Field(
         default=False,
         default=False,
         description="通过预设名称来匹配极封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
         description="通过预设名称来匹配极封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
     )
     )
-    # 周一 鬼灵歌姬
     best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂1")
     best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂1")
-    best_demon_kiryou_utahime_supplementary: str = Field(
-        default="group,team", description="极鬼灵歌姬御魂补充"
-    )
-    # 周二 极蜃气楼
+    best_demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="极鬼灵歌姬御魂补充")
     best_demon_shinkirou: 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_tsuchigumo: str = Field(default="group,team", description="极土蜘蛛御魂")
-    # 周四 极荒骷髅
     best_demon_gashadokuro: str = Field(default="group,team", description="极荒骷髅御魂")
     best_demon_gashadokuro: str = Field(default="group,team", description="极荒骷髅御魂")
-    # 周五 极地震鲇
     best_demon_namazu: str = Field(default="group,team", description="极地震鲇御魂")
     best_demon_namazu: str = Field(default="group,team", description="极地震鲇御魂")
+    best_demon_oboroguruma: str = Field(default="group,team", description="极胧车御魂")
+    best_demon_nightly_aramitamau: str = Field(default="group,team", description="极夜荒魂御魂")
+
+    hide_fields = dynamic_hide('best_demon_kiryou_utahime', 'best_demon_kiryou_utahime_supplementary',
+                               'best_demon_oboroguruma', 'best_demon_nightly_aramitamau')
+
 
 
 class UtilizeScheduler(Scheduler):
 class UtilizeScheduler(Scheduler):
     priority: int = Field(default=2, description='priority_help')
     priority: int = Field(default=2, description='priority_help')
 
 
+
 class DemonEncounter(ConfigBase):
 class DemonEncounter(ConfigBase):
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
     box_buy_config: BoxBuyConfig = Field(default_factory=BoxBuyConfig)
     box_buy_config: BoxBuyConfig = Field(default_factory=BoxBuyConfig)

+ 31 - 95
tasks/DemonEncounter/script_task.py

@@ -13,6 +13,7 @@ from module.exception import TaskEnd
 from module.base.timer import Timer
 from module.base.timer import Timer
 
 
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
+from tasks.DemonEncounter.config import BossType, DemonEncounter
 from tasks.GameUi.game_ui import GameUi
 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_shikigami_records
 from tasks.DemonEncounter.assets import DemonEncounterAssets
 from tasks.DemonEncounter.assets import DemonEncounterAssets
@@ -32,9 +33,10 @@ class LanternClass(Enum):
 
 
 
 
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
-    best_boss_enable = False
+    conf: DemonEncounter = None
 
 
     def run(self):
     def run(self):
+        self.conf = self.config.demon_encounter
         if not self.check_time():
         if not self.check_time():
             logger.warning('Time is not right')
             logger.warning('Time is not right')
             raise TaskEnd('DemonEncounter')
             raise TaskEnd('DemonEncounter')
@@ -52,79 +54,23 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         raise TaskEnd('DemonEncounter')
         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):
     def checkout_soul(self):
         """
         """
         切换御魂
         切换御魂
         """
         """
-        # 判断今天是周几
-        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
-            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:
-            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:
-            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:
-            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:
-            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(",")
-        elif today == 6:
-            group, team = soul_config.demon_nightly_aramitama.split(",")
+        select_best_demon = getattr(self.conf.best_demon_boss_config, f'{self.boss_type}_select', False)
+        if select_best_demon:
+            group, team = getattr(self.conf.best_demon_soul_config, self.boss_type).split(",")
+        else:
+            group, team = getattr(self.conf.demon_soul_config, self.boss_type).split(",")
         if group and team:
         if group and team:
             self.run_switch_soul_by_name(group, team)
             self.run_switch_soul_by_name(group, team)
-        if today == 0:
-            # 获取group,team
-            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)
+            if datetime.now().weekday() == 0:
+                if select_best_demon:
+                    group, team = getattr(self.conf.best_demon_soul_config, f'{self.boss_type}_supplementary').split(",")
+                else:
+                    group, team = getattr(self.conf.demon_soul_config, f'{self.boss_type}_supplementary').split(",")
+                self.run_switch_soul_by_name(group, team)
 
 
     def execute_boss(self):
     def execute_boss(self):
         """
         """
@@ -132,7 +78,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         :return:
         :return:
         """
         """
         logger.hr('Start boss battle', 1)
         logger.hr('Start boss battle', 1)
-        self.init_best_boss_enable()
 
 
         def find_boss():
         def find_boss():
             find_btn_clicked = False
             find_btn_clicked = False
@@ -150,22 +95,10 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                     # 没找到boss但地图中央出现宝箱,导致点击宝箱出现50勾玉购买界面
                     # 没找到boss但地图中央出现宝箱,导致点击宝箱出现50勾玉购买界面
                     self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
                     self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
                     continue
                     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):
                 if find_btn_clicked and self.click(self.C_DM_BOSS_CLICK, interval=5):
                     find_btn_clicked = False
                     find_btn_clicked = False
                     continue
                     continue
-                if self.best_boss_enable:
+                if self.best_demon_enable:
                     self.device.click_record_clear()
                     self.device.click_record_clear()
                     if self.appear(self.I_DE_BOSS_BEST) and (not find_btn_clicked):
                     if self.appear(self.I_DE_BOSS_BEST) and (not find_btn_clicked):
                         self.device.click_record_remove(self.I_DE_BOSS_BEST)
                         self.device.click_record_remove(self.I_DE_BOSS_BEST)
@@ -186,7 +119,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             logger.info('trying to enter boss...')
             logger.info('trying to enter boss...')
             # 点击集结挑战
             # 点击集结挑战
             boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
             boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
-            ocr_people_item = self.O_DE_BEST_BOSS_PEOPLE if self.best_boss_enable else self.O_DE_BOSS_PEOPLE
+            ocr_people_item = self.O_DE_BEST_BOSS_PEOPLE if self.best_demon_enable else self.O_DE_BOSS_PEOPLE
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
 
 
@@ -237,8 +170,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         time.sleep(5)
         time.sleep(5)
         # 延长时间并在战斗结束后改回来
         # 延长时间并在战斗结束后改回来
         self.device.stuck_timer_long = Timer(480, count=480).start()
         self.device.stuck_timer_long = Timer(480, count=480).start()
-        #
-        config = self.con
         while True:
         while True:
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_BOSS_DONE_CHECK):
             if self.appear(self.I_BOSS_DONE_CHECK):
@@ -254,7 +185,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 sleep(2)
                 sleep(2)
                 continue
                 continue
             if self.appear(self.I_PREPARE_HIGHLIGHT):
             if self.appear(self.I_PREPARE_HIGHLIGHT):
-                self.run_general_battle(config)
+                self.run_general_battle()
                 continue
                 continue
             logger.info('Unknown scene Or Boss fight failed.waiting for Prepare_Button appear...')
             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.wait_until_appear(self.I_PREPARE_HIGHLIGHT, wait_time=2)
@@ -329,10 +260,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                     self._boss(match_click[i])
                     self._boss(match_click[i])
             time.sleep(1)
             time.sleep(1)
 
 
-    @cached_property
-    def con(self) -> GeneralBattleConfig:
-        return GeneralBattleConfig()
-
     def check_lantern(self, index: int = 1):
     def check_lantern(self, index: int = 1):
         """
         """
         检查灯笼的类型
         检查灯笼的类型
@@ -411,7 +338,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 logger.info('Buy one hundred sushi for 50 jade')
                 logger.info('Buy one hundred sushi for 50 jade')
                 self.click(self.I_JADE_50)
                 self.click(self.I_JADE_50)
                 continue
                 continue
-            
 
 
     def _mail(self, target_click):
     def _mail(self, target_click):
         # 答题
         # 答题
@@ -480,7 +406,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             time.sleep(0.5)
             time.sleep(0.5)
 
 
     def _battle(self, target_click):
     def _battle(self, target_click):
-        config = self.con
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.appear(self.I_DE_LOCATION):
             if not self.appear(self.I_DE_LOCATION):
@@ -499,12 +424,11 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 
 
             if self.click(target_click, interval=1):
             if self.click(target_click, interval=1):
                 continue
                 continue
-        if self.run_general_battle(config):
+        if self.run_general_battle():
             logger.info('Battle End')
             logger.info('Battle End')
 
 
     def _realm(self, target_click):
     def _realm(self, target_click):
         # 结界
         # 结界
-        config = self.con
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.appear(self.I_DE_LOCATION):
             if not self.appear(self.I_DE_LOCATION):
@@ -515,7 +439,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 
 
             if self.click(target_click, interval=1):
             if self.click(target_click, interval=1):
                 continue
                 continue
-        if self.run_general_battle(config):
+        if self.run_general_battle():
             logger.info('Battle End')
             logger.info('Battle End')
 
 
     def _mystery(self, target_click):
     def _mystery(self, target_click):
@@ -595,6 +519,18 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 logger.warning('Obtain battle timeout')
                 logger.warning('Obtain battle timeout')
                 return True
                 return True
 
 
+    @property
+    def boss_type(self) -> str:
+        boss_name = BossType(datetime.now().weekday()).name
+        if self.best_demon_enable:
+            return f'best_demon_{boss_name}'
+        return f'demon_{boss_name}'
+
+    @property
+    def best_demon_enable(self) -> bool:
+        boss_name = BossType(datetime.now().weekday()).name
+        return getattr(self.conf.best_demon_boss_config, f'best_demon_{boss_name}_select', False)
+
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config