Przeglądaj źródła

Merge pull request #67 from endlesswxk/dev

添加一些场景切换御魂功能
huangrunheng 3 lat temu
rodzic
commit
3dd9032527

+ 8 - 1
tasks/AreaBoss/script_task.py

@@ -30,6 +30,13 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.ui_get_current_page()
             self.ui_goto(page_shikigami_records)
             self.run_switch_soul(self.config.area_boss.switch_soul.switch_group_team)
+
+        if self.config.area_boss.switch_soul.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(self.config.area_boss.switch_soul.group_name,
+                                         self.config.area_boss.switch_soul.team_name)
+
         self.ui_get_current_page()
         self.ui_goto(page_area_boss)
 
@@ -105,7 +112,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    from memory_profiler import profile
+
     c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)

+ 2 - 1
tasks/BondlingFairyland/config.py

@@ -5,6 +5,7 @@ from pydantic import BaseModel, Field
 from enum import Enum
 from datetime import datetime, time
 
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase
 from tasks.BondlingFairyland.config_battle import BattleConfig
@@ -51,7 +52,7 @@ class BondlingFairyland(ConfigBase):
     bondling_config: BondlingConfig = Field(default_factory=BondlingConfig)
     bondling_switch_soul: BondlingSwitchSoul = Field(default_factory=BondlingSwitchSoul)
     battle_config: BattleConfig = Field(default_factory=BattleConfig)
-
+    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
 
 
 

+ 10 - 3
tasks/BondlingFairyland/script_task.py

@@ -17,7 +17,7 @@ from tasks.BondlingFairyland.battle import BondlingBattle
 from tasks.BondlingFairyland.config_battle import BattleConfig
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul, switch_parser
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
-from tasks.GameUi.page import page_main, page_bondling_fairyland
+from tasks.GameUi.page import page_main, page_bondling_fairyland, page_shikigami_records
 
 from module.atom.image import RuleImage
 from module.logger import logger
@@ -29,10 +29,17 @@ class ScriptTask(GameUi, BondlingBattle, SwitchSoul, BondlingFairylandAssets):
     first_catch = True  # 用于记录是否是第一次捕捉
 
     def run(self):
-        self.ui_get_current_page()
-        self.ui_goto(page_bondling_fairyland)
         # 引用配置
         cong = self.config.bondling_fairyland
+
+        if cong.switch_soul_config.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(cong.switch_soul_config.group_name, cong.switch_soul_config.team_name)
+
+        self.ui_get_current_page()
+        self.ui_goto(page_bondling_fairyland)
+
         bondling_config = cong.bondling_config
         bondling_switch_soul = cong.bondling_switch_soul
         battle_config = cong.battle_config

BIN
tasks/Component/GeneralBattle/gb/gb_present_less_than_5.png


+ 10 - 1
tasks/Component/GeneralBattle/gb/image.json

@@ -192,9 +192,18 @@
     "itemName": "de_win",
     "imageName": "gb_de_win.png",
     "roiFront": "481,47,100,100",
-    "roiBack": "331,40,301,117",
+    "roiBack": "481,47,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "针对封魔的特殊"
+  },
+  {
+    "itemName": "present_less_than_5",
+    "imageName": "gb_present_less_than_5.png",
+    "roiFront": "222,648,418,43",
+    "roiBack": "222,648,418,43",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

+ 3 - 0
tasks/Component/GeneralBattle/general_battle.py

@@ -284,6 +284,9 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
 
             if self.appear(self.I_PRESET_ENSURE):
                 break
+            # 首个队伍没有满足5个式神,未出现预设按钮的情况下跳出循环
+            if self.appear(self.I_PRESENT_LESS_THAN_5):
+                break
             if self.appear_then_click(self.I_PRESET, threshold=0.8, interval=1):
                 continue
         logger.info("Click preset button")

+ 7 - 0
tasks/GoldYoukai/script_task.py

@@ -26,6 +26,13 @@ class ScriptTask(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul,
             self.ui_get_current_page()
             self.ui_goto(page_shikigami_records)
             self.run_switch_soul(self.config.gold_youkai.switch_soul.switch_group_team)
+
+        if self.config.gold_youkai.switch_soul.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(self.config.gold_youkai.switch_soul.group_name,
+                                         self.config.gold_youkai.switch_soul.team_name)
+
         # 开启加成
         con = self.config.gold_youkai.gold_youkai
         if con.buff_gold_50_click or con.buff_gold_100_click:

+ 2 - 1
tasks/Orochi/config.py

@@ -5,6 +5,7 @@ from pydantic import BaseModel, Field
 from enum import Enum
 from datetime import datetime, time
 
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.GeneralInvite.config_invite import InviteConfig
@@ -48,4 +49,4 @@ class Orochi(ConfigBase):
     orochi_config: OrochiConfig = Field(default_factory=OrochiConfig)
     invite_config: InviteConfig = Field(default_factory=InviteConfig)
     general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
-
+    switch_soul: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)

+ 15 - 2
tasks/Orochi/script_task.py

@@ -8,16 +8,29 @@ from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.GeneralBuff.general_buff import GeneralBuff
 from tasks.Component.GeneralRoom.general_room import GeneralRoom
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_soul_zones
+from tasks.GameUi.page import page_main, page_soul_zones, page_shikigami_records
 from tasks.Orochi.assets import OrochiAssets
 from tasks.Orochi.config import Orochi, UserStatus
 from module.logger import logger
 from module.exception import TaskEnd
 
-class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi, OrochiAssets):
+class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi, SwitchSoul, OrochiAssets):
 
     def run(self) -> bool:
+        # 御魂切换方式一
+        if self.config.orochi.switch_soul.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(self.config.orochi.switch_soul.switch_group_team)
+
+        # 御魂切换方式二
+        if self.config.orochi.switch_soul.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(self.config.orochi.switch_soul.group_name,
+                                         self.config.orochi.switch_soul.team_name)
 
         limit_count = self.config.orochi.orochi_config.limit_count
         limit_time = self.config.orochi.orochi_config.limit_time

+ 4 - 4
tasks/RyouToppa/script_task.py

@@ -29,10 +29,10 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RyouToppaAssets):
         self.medal_grid = ImageGrid([RealmRaidAssets.I_MEDAL_5, RealmRaidAssets.I_MEDAL_4, RealmRaidAssets.I_MEDAL_3,
                                      RealmRaidAssets.I_MEDAL_2, RealmRaidAssets.I_MEDAL_1, RealmRaidAssets.I_MEDAL_0])
 
-        # if config.switch_soul_config.enable:
-        #     self.ui_get_current_page()
-        #     self.ui_goto(page_shikigami_records)
-        #     self.run_switch_soul(config.switch_soul_config.switch_group_team)
+        if config.switch_soul_config.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(config.switch_soul_config.switch_group_team)
 
         if config.switch_soul_config.enable_switch_by_name:
             self.ui_get_current_page()