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

add(BondlingFairyland): support new four bondling types and fix page check

Azure 1 год назад
Родитель
Сommit
f97ba398a5

+ 13 - 5
tasks/BondlingFairyland/assets.py

@@ -12,17 +12,21 @@ class BondlingFairylandAssets:
 
 
 	# Click Rule Assets
 	# Click Rule Assets
 	# description 
 	# description 
-	C_STONE_1 = RuleClick(roi_front=(230,533,23,20), roi_back=(0,0,100,100), name="stone_1")
+	C_STONE_1 = RuleClick(roi_front=(228,502,26,58), roi_back=(0,0,100,100), name="stone_1")
 	# description 
 	# description 
-	C_STONE_2 = RuleClick(roi_front=(441,569,23,20), roi_back=(0,0,100,100), name="stone_2")
+	C_STONE_2 = RuleClick(roi_front=(439,528,25,62), roi_back=(0,0,100,100), name="stone_2")
 	# description 
 	# description 
-	C_STONE_3 = RuleClick(roi_front=(692,537,23,20), roi_back=(0,0,100,100), name="stone_3")
+	C_STONE_3 = RuleClick(roi_front=(687,505,26,56), roi_back=(0,0,100,100), name="stone_3")
 	# description 
 	# description 
-	C_STONE_4 = RuleClick(roi_front=(944,529,23,20), roi_back=(0,0,100,100), name="stone_4")
+	C_STONE_4 = RuleClick(roi_front=(944,497,22,50), roi_back=(0,0,100,100), name="stone_4")
 	# description 
 	# description 
 	C_STONE_5 = RuleClick(roi_front=(1041,494,25,25), roi_back=(0,0,100,100), name="stone_5")
 	C_STONE_5 = RuleClick(roi_front=(1041,494,25,25), roi_back=(0,0,100,100), name="stone_5")
 	# description 
 	# description 
 	C_CAP_SUCCESS = RuleClick(roi_front=(317,102,378,363), roi_back=(0,0,100,100), name="cap_success")
 	C_CAP_SUCCESS = RuleClick(roi_front=(317,102,378,363), roi_back=(0,0,100,100), name="cap_success")
+	# 逢魔之原地域 
+	C_AREA_2 = RuleClick(roi_front=(689,118,121,77), roi_back=(0,0,100,100), name="area_2")
+	# 平安京地域 
+	C_AREA_1 = RuleClick(roi_front=(628,314,108,137), roi_back=(0,0,100,100), name="area_1")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
@@ -58,7 +62,11 @@ class BondlingFairylandAssets:
 	# 求援 
 	# 求援 
 	I_BALL_HELP = RuleImage(roi_front=(963,571,100,100), roi_back=(963,571,100,100), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/ball_ball_help.png")
 	I_BALL_HELP = RuleImage(roi_front=(963,571,100,100), roi_back=(963,571,100,100), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/ball_ball_help.png")
 	# 契灵创建队伍 
 	# 契灵创建队伍 
-	I_CREATE_TEAM = RuleImage(roi_front=(569,491,141,50), roi_back=(569,491,141,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/create_team.png")
+	I_CREATE_TEAM = RuleImage(roi_front=(569,491,141,50), roi_back=(569,491,141,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/ball_create_team.png")
+	# 地域 
+	I_BALL_AREA = RuleImage(roi_front=(61,631,50,48), roi_back=(8,582,138,137), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/ball_ball_area.png")
+	# 地域页面 
+	I_CHECK_AREA = RuleImage(roi_front=(489,377,238,95), roi_back=(454,337,314,170), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/ball_check_area.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

BIN
tasks/BondlingFairyland/ball/ball_ball_area.png


BIN
tasks/BondlingFairyland/ball/ball_check_area.png


+ 0 - 0
tasks/BondlingFairyland/ball/create_team.png → tasks/BondlingFairyland/ball/ball_create_team.png


+ 19 - 1
tasks/BondlingFairyland/ball/image.json

@@ -46,11 +46,29 @@
   },
   },
   {
   {
     "itemName": "create_team",
     "itemName": "create_team",
-    "imageName": "create_team.png",
+    "imageName": "ball_create_team.png",
     "roiFront": "569,491,141,50",
     "roiFront": "569,491,141,50",
     "roiBack": "569,491,141,50",
     "roiBack": "569,491,141,50",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "契灵创建队伍"
     "description": "契灵创建队伍"
+  },
+  {
+    "itemName": "ball_area",
+    "imageName": "ball_ball_area.png",
+    "roiFront": "61,631,50,48",
+    "roiBack": "8,582,138,137",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "地域"
+  },
+  {
+    "itemName": "check_area",
+    "imageName": "ball_check_area.png",
+    "roiFront": "489,377,238,95",
+    "roiBack": "454,337,314,170",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "地域页面"
   }
   }
 ]
 ]

+ 16 - 4
tasks/BondlingFairyland/click.json

@@ -1,25 +1,25 @@
 [
 [
   {
   {
     "itemName": "stone_1",
     "itemName": "stone_1",
-    "roiFront": "230,533,23,20",
+    "roiFront": "228,502,26,58",
     "roiBack": "0,0,100,100",
     "roiBack": "0,0,100,100",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "stone_2",
     "itemName": "stone_2",
-    "roiFront": "441,569,23,20",
+    "roiFront": "439,528,25,62",
     "roiBack": "0,0,100,100",
     "roiBack": "0,0,100,100",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "stone_3",
     "itemName": "stone_3",
-    "roiFront": "692,537,23,20",
+    "roiFront": "687,505,26,56",
     "roiBack": "0,0,100,100",
     "roiBack": "0,0,100,100",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "stone_4",
     "itemName": "stone_4",
-    "roiFront": "944,529,23,20",
+    "roiFront": "944,497,22,50",
     "roiBack": "0,0,100,100",
     "roiBack": "0,0,100,100",
     "description": "description"
     "description": "description"
   },
   },
@@ -34,5 +34,17 @@
     "roiFront": "317,102,378,363",
     "roiFront": "317,102,378,363",
     "roiBack": "0,0,100,100",
     "roiBack": "0,0,100,100",
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "area_2",
+    "roiFront": "689,118,121,77",
+    "roiBack": "0,0,100,100",
+    "description": "逢魔之原地域"
+  },
+  {
+    "itemName": "area_1",
+    "roiFront": "628,314,108,137",
+    "roiBack": "0,0,100,100",
+    "description": "平安京地域"
   }
   }
 ]
 ]

+ 39 - 20
tasks/BondlingFairyland/config.py

@@ -13,7 +13,6 @@ from tasks.Component.GeneralInvite.config_invite import InviteConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
 
 
 
-
 class BondlingMode(str, Enum):
 class BondlingMode(str, Enum):
     MODE1 = 'mode_1'
     MODE1 = 'mode_1'
     MODE2 = 'mode_2'
     MODE2 = 'mode_2'
@@ -22,9 +21,26 @@ class BondlingMode(str, Enum):
 
 
 class BondlingClass(str, Enum):
 class BondlingClass(str, Enum):
     TOMB_GUARD = '镇墓兽'
     TOMB_GUARD = '镇墓兽'
+    AZURE_BASAN = '火灵'
     SNOWBALL = '茨球'
     SNOWBALL = '茨球'
     LITTLE_KURO = '小黑'
     LITTLE_KURO = '小黑'
-    AZURE_BASAN = '火灵'
+
+    BONDLING_2_1 = '针女'
+    BONDLING_2_2 = '薙魂'
+    BONDLING_2_3 = '月魔兔'
+    BONDLING_2_4 = '狐火'
+
+    @staticmethod
+    def get_index(value) -> int:
+        """根据枚举值或枚举返回对应顺序(从1开始)"""
+        if isinstance(value, BondlingClass):
+            member = value
+        else:
+            try:
+                member = BondlingClass(value)
+            except ValueError:
+                return None
+        return list(BondlingClass).index(member) + 1
 
 
 
 
 class UserStatus(str, Enum):
 class UserStatus(str, Enum):
@@ -39,7 +55,7 @@ class UserStatus(str, Enum):
 class BondlingConfig(ConfigBase):
 class BondlingConfig(ConfigBase):
     # 身份
     # 身份
     user_status: UserStatus = Field(default=UserStatus.ALONE, description='user_status_help')
     user_status: UserStatus = Field(default=UserStatus.ALONE, description='user_status_help')
-    bondling_mode: BondlingMode = Field(default=BondlingMode.MODE1, description='bondling_mode_help')
+    bondling_mode: BondlingMode = Field(default=BondlingMode.MODE1, description='目前没用但需要切换到mode2,结契设置需要提前配置好')
     limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     limit_count: int = Field(default=30, description='limit_count_help')
     limit_count: int = Field(default=30, description='limit_count_help')
     bondling_stone_enable: bool = Field(default=False, description='bondling_stone_enable_help')
     bondling_stone_enable: bool = Field(default=False, description='bondling_stone_enable_help')
@@ -47,15 +63,25 @@ class BondlingConfig(ConfigBase):
 
 
 
 
 class BondlingSwitchSoul(ConfigBase):
 class BondlingSwitchSoul(ConfigBase):
-    auto_switch_soul: bool = Field(default=False, description='auto_switch_soul_help')
-    # 镇墓兽 config
-    tomb_guard_switch: str = Field(default='-1,-1', description='tomb_guard_switch_help')
-    # 茨球 config
-    snowball_switch: str = Field(default='-1,-1', description='snowball_switch_help')
-    # 小黑 config
-    little_kuro_switch: str = Field(default='-1,-1', description='little_kuro_switch_help')
-    # 火灵 config
-    azure_basan_switch: str = Field(default='-1,-1', description='azure_basan_switch_help')
+    enable: bool = Field(default=False, description='若是数字分隔,则自动以编号方式切换御魂(组号,队伍号),限制组号1-7,队伍号1-4\n若非数字,则自动以ocr方式切换御魂(组名,队伍名)')
+    tomb_guard_switch: str = Field(default='', description='tomb_guard_switch_help')
+    snowball_switch: str = Field(default='', description='snowball_switch_help')
+    little_kuro_switch: str = Field(default='', description='little_kuro_switch_help')
+    azure_basan_switch: str = Field(default='', description='azure_basan_switch_help')
+    bondling_2_1_switch: str = Field(default='', description='设置针女御魂装配分组')
+    bondling_2_2_switch: str = Field(default='', description='设置薙魂御魂装配分组')
+    bondling_2_3_switch: str = Field(default='', description='设置月魔兔御魂装配分组')
+    bondling_2_4_switch: str = Field(default='', description='设置狐火御魂装配分组')
+
+    def get_switch_by_enum(self, bondling_enum: BondlingClass) -> tuple[str, tuple[str | int, str | int]]:
+        """根据枚举获取对应的 切换类型, (group,team)"""
+        group_team = getattr(self, f"{bondling_enum.name.lower()}_switch", None)
+        if group_team is None or group_team.strip() == '' or ',' not in group_team or len(group_team.split(',')) != 2:
+            return None, (None, None)
+        group, team = group_team.split(',')
+        if group.isdigit() and team.isdigit():
+            return 'int', (int(group), int(team))
+        return 'str', (group, team)
 
 
 
 
 class BondlingCheck(ConfigBase):
 class BondlingCheck(ConfigBase):
@@ -67,14 +93,7 @@ class BondlingFairyland(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
     bondling_check: BondlingCheck = Field(default_factory=BondlingCheck)
     bondling_check: BondlingCheck = Field(default_factory=BondlingCheck)
     bondling_config: BondlingConfig = Field(default_factory=BondlingConfig)
     bondling_config: BondlingConfig = Field(default_factory=BondlingConfig)
-    bondling_switch_soul: BondlingSwitchSoul = Field(default_factory=BondlingSwitchSoul)
     invite_config: InviteConfig = Field(default_factory=InviteConfig)
     invite_config: InviteConfig = Field(default_factory=InviteConfig)
     battle_config: BattleConfig = Field(default_factory=BattleConfig)
     battle_config: BattleConfig = Field(default_factory=BattleConfig)
     # battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     # battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
-
-    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
-
-
-
-
-
+    bondling_switch_soul: BondlingSwitchSoul = Field(default_factory=BondlingSwitchSoul)

+ 31 - 35
tasks/BondlingFairyland/script_task.py

@@ -59,29 +59,19 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             logger.info(f'契忆数量: {cu} 小于 {MAX_COUNT}, 继续任务')
             logger.info(f'契忆数量: {cu} 小于 {MAX_COUNT}, 继续任务')
 
 
         logger.hr('第二步, 切换御魂', 2)
         logger.hr('第二步, 切换御魂', 2)
-        # 御魂切换方式一
-        if cong.switch_soul_config.enable:
-            self.ui_get_current_page()
-            self.ui_goto(page_shikigami_records)
-            self.run_switch_soul(cong.switch_soul_config.switch_group_team)
-        # 御魂切换方式二
-        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)
+        if cong.bondling_switch_soul.enable:
+            type_str, (group, team) = cong.bondling_switch_soul.get_switch_by_enum(cong.bondling_config.bondling_stone_class)
+            if type_str is None:
+                logger.warning(f'Invalid switch soul config on {cong.bondling_config.bondling_stone_class.value}, not switch')
+            else:
+                self.ui_goto_page(page_shikigami_records)
+                if type_str == 'int':
+                    self.run_switch_soul((group, team))
+                if type_str == 'str':
+                    self.run_switch_soul_by_name(group, team)
 
 
         logger.hr('第三步, 前往契灵主界面', 2)
         logger.hr('第三步, 前往契灵主界面', 2)
-        self.ui_get_current_page()
-        self.ui_goto(page_bondling_fairyland)
-
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_CHECK_BONDLING_FAIRYLAND, interval=1):
-                break
-            if self.appear(self.I_BALL_HELP, interval=1):
-                self.ui_get_current_page()
-                self.ui_goto(page_bondling_fairyland)
-                continue
+        self.ui_goto_page(page_bondling_fairyland)
 
 
         logger.hr('第四步, 开始战斗准备', 2)
         logger.hr('第四步, 开始战斗准备', 2)
         self.current_count = 0
         self.current_count = 0
@@ -280,17 +270,8 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         battle_config = cong.battle_config
         battle_config = cong.battle_config
 
 
         logger.info(f'抓捕契灵: [{bondling_config.bondling_stone_class}] ')
         logger.info(f'抓捕契灵: [{bondling_config.bondling_stone_class}] ')
-        match bondling_config.bondling_stone_class:
-            case BondlingClass.TOMB_GUARD:
-                current_ball_index = 1
-            case BondlingClass.AZURE_BASAN:
-                current_ball_index = 2
-            case BondlingClass.SNOWBALL:
-                current_ball_index = 3
-            case BondlingClass.LITTLE_KURO:
-                current_ball_index = 4
-            case _:
-                current_ball_index = 1
+        idx = BondlingClass.get_index(bondling_config.bondling_stone_class)
+        current_ball_index = idx if idx is not None else 1
 
 
         while 1:
         while 1:
 
 
@@ -491,10 +472,16 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         :param index:
         :param index:
         :return:
         :return:
         """
         """
+        def get_click_area(ind: int):
+            """获取对应契灵地域点击位置"""
+            if 1 <= ind <= 4:  # 平安京
+                return self.C_AREA_1
+            if 5 <= ind <= 8:  # 逢魔之原
+                return self.C_AREA_2
+            return None
 
 
         def get_click_target(ind: int):
         def get_click_target(ind: int):
-            if ind > 5 or ind < 1:
-                raise ValueError('index must be 1-5')
+            """获取对应契灵点击位置"""
             match = {
             match = {
                 1: self.C_STONE_1,
                 1: self.C_STONE_1,
                 2: self.C_STONE_2,
                 2: self.C_STONE_2,
@@ -502,8 +489,17 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 4: self.C_STONE_4,
                 4: self.C_STONE_4,
                 5: self.C_STONE_5,
                 5: self.C_STONE_5,
             }
             }
-            return match[ind]
+            return match[(ind - 1) % 4 + 1]
 
 
+        # 进入地域页面
+        while True:
+            self.screenshot()
+            if self.appear(self.I_CHECK_AREA, interval=0.8):
+                break
+            if self.appear_then_click(self.I_BALL_AREA, interval=1.2):
+                continue
+        # 点击对应地域并返回契灵主界面
+        self.ui_click(get_click_area(index), self.I_BALL_AREA, interval=0.8)
         click_target = get_click_target(index)
         click_target = get_click_target(index)
         click_count = 0
         click_count = 0
         logger.info(f'Click ball index: {index}')
         logger.info(f'Click ball index: {index}')

+ 2 - 1
tasks/GameUi/page.py

@@ -4,6 +4,7 @@ import random
 
 
 import traceback
 import traceback
 from module.atom.click import RuleClick
 from module.atom.click import RuleClick
+from tasks.BondlingFairyland.assets import BondlingFairylandAssets
 from tasks.GlobalGame.assets import GlobalGameAssets as GGA
 from tasks.GlobalGame.assets import GlobalGameAssets as GGA
 from tasks.GameUi.assets import GameUiAssets as G
 from tasks.GameUi.assets import GameUiAssets as G
 from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
 from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
@@ -110,7 +111,7 @@ page_six_gates = Page(G.I_CHECK_SIX_GATES)
 page_six_gates.link(button=G.I_SIX_GATES_GOTO_EXPLORATION, destination=page_exploration)
 page_six_gates.link(button=G.I_SIX_GATES_GOTO_EXPLORATION, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_SIX_GATES, destination=page_six_gates)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_SIX_GATES, destination=page_six_gates)
 # 契灵之境 bondling fairyland
 # 契灵之境 bondling fairyland
-page_bondling_fairyland = Page(G.I_CHECK_BONDLING_FAIRYLAND)
+page_bondling_fairyland = Page(BondlingFairylandAssets.I_BALL_AREA)
 page_bondling_fairyland.link(button=G.I_BACK_YOLLOW, destination=page_exploration)
 page_bondling_fairyland.link(button=G.I_BACK_YOLLOW, destination=page_exploration)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_BONDLING_FAIRYLAND, destination=page_bondling_fairyland)
 page_exploration.link(button=G.I_EXPLORATION_GOTO_BONDLING_FAIRYLAND, destination=page_bondling_fairyland)
 # 英杰试炼 hero test
 # 英杰试炼 hero test