Forráskód Böngészése

Merge pull request #758 from Hurry2/dev

六道之门 增加御魂预设2
huangrunheng 1 éve
szülő
commit
617480c5da
2 módosított fájl, 18 hozzáadás és 6 törlés
  1. 2 1
      tasks/SixRealms/config.py
  2. 16 5
      tasks/SixRealms/script_task.py

+ 2 - 1
tasks/SixRealms/config.py

@@ -17,7 +17,8 @@ class SixRealmsGate(BaseModel):
 
 class SixRealms(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    switch_soul_config_1: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    switch_soul_config_2: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
     six_realms_gate: SixRealmsGate = Field(default_factory=SixRealmsGate)
 
 

+ 16 - 5
tasks/SixRealms/script_task.py

@@ -31,16 +31,27 @@ class ScriptTask(GameUi, SwitchSoul, MoonSea):
         return self.config.model.six_realms
 
     def run(self):
-        if self._config.switch_soul_config.enable:
+        if self._config.switch_soul_config_1.enable:
             self.ui_get_current_page()
             self.ui_goto(page_shikigami_records)
-            self.run_switch_soul(self._config.switch_soul_config.switch_group_team)
-        if self._config.switch_soul_config.enable_switch_by_name:
+            self.run_switch_soul(self._config.switch_soul_config_1.switch_group_team)
+        if self._config.switch_soul_config_1.enable_switch_by_name:
             self.ui_get_current_page()
             self.ui_goto(page_shikigami_records)
             self.run_switch_soul_by_name(
-                self._config.switch_soul_config.group_name,
-                self._config.switch_soul_config.team_name
+                self._config.switch_soul_config_1.group_name,
+                self._config.switch_soul_config_1.team_name
+            )
+        if self._config.switch_soul_config_2.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(self._config.switch_soul_config_2.switch_group_team)
+        if self._config.switch_soul_config_2.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(
+                self._config.switch_soul_config_2.group_name,
+                self._config.switch_soul_config_2.team_name
             )
         self.ui_get_current_page()
         self.ui_goto(page_six_gates)