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

Merge pull request #427 from qiyh99/master

逢魔之时增加每天自动修改御魂
huangrunheng 2 лет назад
Родитель
Сommit
19c226b7e5
3 измененных файлов с 68 добавлено и 6 удалено
  1. 13 1
      config/template.json
  2. 24 3
      tasks/DemonEncounter/config.py
  3. 31 2
      tasks/DemonEncounter/script_task.py

+ 13 - 1
config/template.json

@@ -245,7 +245,19 @@
       "priority": 2,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "demon_soul_config": {
+      "enable": false,
+      "demon_kiryou_utahime": "-1,-1",
+      "demon_kiryou_utahime_supplementary": "-1,-1",
+      "demon_shinkirou": "-1,-1",
+      "demon_tsuchigumo": "-1,-1",
+      "demon_gashadokuro": "-1,-1",
+      "demon_namazu": "-1,-1",
+      "demon_oboroguruma": "-1,-1",
+      "demon_nightly_aramitama": "-1,-1"
     }
   },
   "daily_trifles": {

+ 24 - 3
tasks/DemonEncounter/config.py

@@ -10,11 +10,32 @@ from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Utils.config_enum import ShikigamiClass
 
+
+# 不同封魔boss的御魂配置
+class DemonConfig(BaseModel):
+    enable: bool = Field(default=False)
+    # 周一
+    demon_kiryou_utahime: str = Field(default="-1,-1", description="鬼灵歌姬御魂1")
+    demon_kiryou_utahime_supplementary: str = Field(
+        default="-1,-1", description="鬼灵歌姬御魂补充"
+    )
+    # 周二
+    demon_shinkirou: str = Field(default="-1,-1", description="蜃气楼御魂")
+    # 周三 土蜘蛛
+    demon_tsuchigumo: str = Field(default="-1,-1", description="土蜘蛛御魂")
+    # 周四 荒骷髅
+    demon_gashadokuro: str = Field(default="-1,-1", description="荒骷髅御魂")
+    # 周五 地震鲇
+    demon_namazu: str = Field(default="-1,-1", description="地震鲇御魂")
+    # 周六 胧车
+    demon_oboroguruma: str = Field(default="-1,-1", description="胧车御魂")
+    # 周日 夜荒魂
+    demon_nightly_aramitama: str = Field(default="-1,-1", description="夜荒魂御魂")
+
+
 class UtilizeScheduler(Scheduler):
     priority = Field(default=2, description='priority_help')
 
 class DemonEncounter(ConfigBase):
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
-    # general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
-
-
+    demon_soul_config: DemonConfig = Field(default_factory=DemonConfig)

+ 31 - 2
tasks/DemonEncounter/script_task.py

@@ -11,8 +11,9 @@ from module.logger import logger
 from module.exception import TaskEnd
 from module.base.timer import Timer
 
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_demon_encounter
+from tasks.GameUi.page import page_demon_encounter, 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
@@ -27,13 +28,18 @@ class LanternClass(Enum):
     MYSTERY = 5  # 神秘任务
 
 
-class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
+class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 
     def run(self):
         if not self.check_time():
             logger.warning('Time is not right')
             raise TaskEnd('DemonEncounter')
         self.ui_get_current_page()
+        # 切换御魂
+        soul_config = self.config.demon_encounter.demon_soul_config
+        if soul_config.enable:
+            self.ui_goto(page_shikigami_records)
+            self.checkout_soul()
         self.ui_goto(page_demon_encounter)
         self.execute_lantern()
         self.execute_boss()
@@ -41,6 +47,28 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         raise TaskEnd('DemonEncounter')
 
+    def checkout_soul(self):
+        """
+        切换御魂
+        """
+        # 判断今天是周几
+        today = datetime.now().weekday()
+        soul_config = self.config.demon_encounter.demon_soul_config
+        if today == 0:
+            self.run_switch_soul(soul_config.demon_kiryou_utahime)
+            self.run_switch_soul(soul_config.demon_kiryou_utahime_supplementary)
+        elif today == 1:
+            self.run_switch_soul(soul_config.demon_shinkirou)
+        elif today == 2:
+            self.run_switch_soul(soul_config.demon_tsuchigumo)
+        elif today == 3:
+            self.run_switch_soul(soul_config.demon_gashadokuro)
+        elif today == 4:
+            self.run_switch_soul(soul_config.demon_namazu)
+        elif today == 5:
+            self.run_switch_soul(soul_config.demon_oboroguruma)
+        elif today == 6:
+            self.run_switch_soul(soul_config.demon_nightly_aramitama)
 
     def execute_boss(self):
         """
@@ -405,6 +433,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
                 logger.warning('Obtain battle timeout')
                 return True
 
+
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device