浏览代码

refactor(BondlingFairyland): 重构契灵仙境任务- 优化了契灵仙境中的球点击逻辑
- 新增了鸣契石购买功能
-调整了界面导航和状态检查逻辑
- 优化了代码结构,提高了可读性和可维护性

ljxun 1 年之前
父节点
当前提交
a4f116d3b4

+ 18 - 10
tasks/BondlingFairyland/assets.py

@@ -28,16 +28,18 @@ class BondlingFairylandAssets:
 	# Ocr Rule Assets
 	# Ocr-description 
 	O_B_BONDLING_CLASS = RuleOcr(roi=(266,271,79,112), area=(287,271,36,112), mode="Single", method="Default", keyword="", name="b_bondling_class")
-	# Ocr-description 
+	# 小盘子 
 	O_B_LOW_NUMBER = RuleOcr(roi=(490,24,98,36), area=(490,24,98,36), mode="DigitCounter", method="Default", keyword="", name="b_low_number")
-	# Ocr-description 
+	# 中盘子 
 	O_B_MEDIUM_NUMBER = RuleOcr(roi=(687,21,101,36), area=(687,21,101,36), mode="DigitCounter", method="Default", keyword="", name="b_medium_number")
-	# Ocr-description 
+	# 大盘子 
 	O_B_HIGH_NUMBER = RuleOcr(roi=(883,23,100,32), area=(883,23,100,32), mode="DigitCounter", method="Default", keyword="", name="b_high_number")
-	# Ocr-description 
+	# 鸣契石 
 	O_B_STONE_NUMBER = RuleOcr(roi=(858,22,82,40), area=(858,22,82,40), mode="DigitCounter", method="Default", keyword="", name="b_stone_number")
+	# 召唤契灵数量 
+	O_B_SUMMON_BALL_NUMBER = RuleOcr(roi=(546,540,100,45), area=(546,540,100,45), mode="Single", method="Default", keyword="", name="b_summon_ball_number")
 	# 抓捕契灵剩余数量 
-	O_B_BALL_NUMBER = RuleOcr(roi=(1183,532,77,30), area=(1183,532,77,30), mode="DigitCounter", method="Default", keyword="", name="b_ball_number")
+	O_B_BALL_NUMBER = RuleOcr(roi=(1190,532,70,30), area=(1190,532,70,30), mode="DigitCounter", method="Default", keyword="", name="b_ball_number")
 	# 好友邀请 
 	O_FRIEND = RuleOcr(roi=(357,89,100,54), area=(357,89,100,54), mode="Single", method="Default", keyword="", name="friend")
 	# 跨区邀请 
@@ -139,17 +141,23 @@ class BondlingFairylandAssets:
 	# description 
 	C_LEFT_1 = RuleClick(roi_front=(167,198,128,265), roi_back=(167,198,128,265), name="left_1")
 	# description 
-	C_LEFT_2 = RuleClick(roi_front=(423,190,139,277), roi_back=(423,190,139,277), name="left_2")
+	C_LEFT_2 = RuleClick(roi_front=(423,226,111,241), roi_back=(423,226,111,241), name="left_2")
 	# description 
-	C_LEFT_3 = RuleClick(roi_front=(676,176,159,307), roi_back=(676,176,159,307), name="left_3")
+	C_LEFT_3 = RuleClick(roi_front=(676,176,107,275), roi_back=(676,176,107,275), name="left_3")
 	# description 
-	C_LEFT_4 = RuleClick(roi_front=(923,198,155,279), roi_back=(923,198,155,279), name="left_4")
+	C_LEFT_4 = RuleClick(roi_front=(918,223,108,235), roi_back=(918,223,108,235), name="left_4")
 
 
 	# Image Rule Assets
 	# description 
-	I_STONE_ENTER = RuleImage(roi_front=(1167,472,38,41), roi_back=(1167,472,38,41), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/stone_stone_enter.png")
+	I_STONE_ENTER = RuleImage(roi_front=(1172,444,38,41), roi_back=(1172,444,38,41), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/stone_stone_enter.png")
+	# description 
+	I_STONE_SURE = RuleImage(roi_front=(644,621,56,39), roi_back=(618,614,120,52), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/stone_stone_sure.png")
+	# description 
+	I_BUY_PLUS = RuleImage(roi_front=(765,543,43,40), roi_back=(765,543,43,40), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/buy_plus.png")
+	# description 
+	I_BUY_ADD = RuleImage(roi_front=(678,540,43,40), roi_back=(678,540,43,40), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/buy_add.png")
 	# description 
-	I_STONE_SURE = RuleImage(roi_front=(1152,601,75,70), roi_back=(1152,601,75,70), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/stone_stone_sure.png")
+	I_BUY_SUB = RuleImage(roi_front=(468,540,43,40), roi_back=(468,540,43,40), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/buy_sub.png")
 
 

+ 15 - 6
tasks/BondlingFairyland/ocr.json

@@ -15,7 +15,7 @@
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
-    "description": "Ocr-description"
+    "description": "小盘子"
   },
   {
     "itemName": "b_medium_number",
@@ -24,7 +24,7 @@
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
-    "description": "Ocr-description"
+    "description": "中盘子"
   },
   {
     "itemName": "b_high_number",
@@ -33,7 +33,7 @@
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
-    "description": "Ocr-description"
+    "description": "大盘子"
   },
   {
     "itemName": "b_stone_number",
@@ -42,12 +42,21 @@
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
-    "description": "Ocr-description"
+    "description": "鸣契石"
+  },
+  {
+    "itemName": "b_summon_ball_number",
+    "roiFront": "546,540,100,45",
+    "roiBack": "546,540,100,45",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "召唤契灵数量"
   },
   {
     "itemName": "b_ball_number",
-    "roiFront": "1183,532,77,30",
-    "roiBack": "1183,532,77,30",
+    "roiFront": "1190,532,70,30",
+    "roiBack": "1190,532,70,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 46 - 44
tasks/BondlingFairyland/script_task.py

@@ -41,7 +41,7 @@ class BondlingNumberMax(Exception):
 class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul, BondlingFairylandAssets):
     ball_pos_list = [None, None, None, None, None]  # 用于记录每一个位置的球是否出现
     first_catch = True  # 用于记录是否是第一次捕捉
-
+    current_ball_index = 5
     def run(self):
         # 引用配置
         cong = self.config.bondling_fairyland
@@ -108,7 +108,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 while 1:
                     self.screenshot()
                     if self.appear(self.I_GI_IN_ROOM):
-                        break
+                        return True
                     if click_count >= 6:
                         logger.error('Click fire failed')
                         logger.error(
@@ -124,21 +124,23 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                         self.appear_then_click(self.I_CREATE_TEAM, interval=2)
                         continue
                     # 求援
-                    if self.appear_then_click(self.I_BALL_HELP, interval=1):
-                        # cu, res, total = self.O_B_BALL_NUMBER.ocr(self.device.image)
-                        # logger.info(f'ball is cu {cu}, total {total}')
-                        # if cu == 0 and total == 99:
-                        #     logger.info('ball is not enough')
-                        #     break
-                        # self.screenshot()
-                        # if self.appear_then_click(self.I_BALL_HELP, interval=2):
+                    if self.appear(self.I_BALL_HELP, interval=1):
+                        cu, res, total = self.O_B_BALL_NUMBER.ocr(self.device.image)
+                        logger.info(f'ball is cu {cu}, total {total}')
+                        if cu <= 0 and total == 99:
+                            logger.info('ball is not enough')
+                            return False
+                        if self.appear_then_click(self.I_BALL_HELP, interval=2):
+                            sleep(1)
                             click_count += 1
                             continue
 
             self.screenshot()
+
             if success:
                 is_first = True
-                create_bond_team()
+                if not create_bond_team():
+                    return True
 
             self.check_and_invite(True)
 
@@ -269,43 +271,34 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         bondling_switch_soul = cong.bondling_switch_soul
         battle_config = cong.battle_config
 
-        current_ball_index = 5
-        # current_ball = 5  # 用于记录当前捕捉的球的位置
         success = True
         while 1:
 
             if not self.in_search_ui(screenshot=True):
-                sleep(0.4)
+                self.ui_get_current_page()
+                self.ui_goto(page_bondling_fairyland)
                 continue
-            # if current_ball == 0:
-            #     if self.run_stone(bondling_config.bondling_stone_enable, bondling_config.bondling_stone_class):
-            #         current_ball = 5
-            #         logger.info(f'Current ball number: {current_ball} ')
-            #
-            #     if current_ball == 5:
-            #         continue
-            #     if self.run_search(bondling_config):
-            #         current_ball = 5
-            #         logger.info(f'Current ball number: {current_ball} ')
-            #     else:
-            #         break
 
             if bondling_config.bondling_mode != BondlingMode.MODE1:
-                if self.ball_click(current_ball_index):
-                    logger.info(f'Current ball number: {current_ball_index} ')
+                if self.ball_click(self.current_ball_index):
+                    logger.info(f'Current ball number: {self.current_ball_index} ')
                 else:
                     # 如果点击了3次还是没有进去,那可能说明这个位置没有球
-                    if current_ball_index == 1:
-                        break
+                    if self.current_ball_index == 1:
+                        if self.run_stone(bondling_config.bondling_stone_enable, bondling_config.bondling_stone_class):
+                            self.current_ball_index = 5
+                            continue
+                        else:
+                            break
                     else:
-                        current_ball_index -= 1
-                    logger.info(f'Current ball number: {current_ball_index} ')
+                        self.current_ball_index -= 1
+                    logger.info(f'Current ball number: {self.current_ball_index} ')
                     continue
 
                 try:
                     # 执行捕捉
                     if self.run_catch(bondling_config, bondling_switch_soul, battle_config):
-                        logger.info(f'Catch successful and current ball number: {current_ball_index} ')
+                        logger.info(f'Catch successful and current ball number: {self.current_ball_index} ')
                     else:
                         break
                 except BondlingNumberMax:
@@ -342,7 +335,8 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         """
         if not bondling_stone_enable:
             return False
-
+        self.ui_get_current_page()
+        self.ui_goto(page_bondling_fairyland)
         while 1:
             self.screenshot()
             # 检查是不是在探查界面,
@@ -381,13 +375,28 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                         self.screenshot()
                         if not self.appear(self.I_STONE_SURE):
                             break
+                        for i in range(0, 5):
+                            if self.appear_then_click(self.I_BUY_ADD, interval=1):
+                                sleep(0.5)
+                                continue
+                        if self.appear_then_click(self.I_GI_SURE, interval=1):
+                            continue
+                        # current = self.O_B_SUMMON_BALL_NUMBER.ocr(self.device.image)
+                        # try:
+                        #     if int(current) >= 1:
+                        #         if self.appear_then_click(self.I_STONE_SURE, interval=1):
+                        #             continue
+                        # except ValueError:
+                        #     logger.warning(f'No challenge count, exit')
                         if self.appear_then_click(self.I_STONE_SURE, interval=1):
                             continue
+
                     break
 
                 if self.appear_then_click(self.I_STONE_ENTER, interval=1):
                     click_count += 1
                     continue
+            return True
 
     def run_search(self, bondling_config: BondlingConfig):
         """
@@ -515,21 +524,13 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             # 引用配置
             cong = self.config.bondling_fairyland
             match cong.bondling_config.user_status:
-                case UserStatus.LEADER:
-                    if self.run_leader():
-                        return success
-                case UserStatus.handoff1:
-                    if self.run_leader():
-                        return success
-                case UserStatus.handoff2:
-                    if self.run_leader():
-                        return success
                 case UserStatus.ALONE:
                     self.run_alone()
                     if self.run_battle(battle_config, limit_count=self.limit_count):
                         return success
                 case _:
-                    logger.error('Unknown user status')
+                    if self.run_leader():
+                        return success
 
     def is_room_dead(self) -> bool:
         # 如果在探索界面或者是出现在组队界面,那就是可能房间死了
@@ -916,4 +917,5 @@ if __name__ == '__main__':
     # con = config.bondling_fairyland
     # task.lock_team()
     task.run()
+    # task.run_stone(True,BondlingClass.TOMB_GUARD)
     # task.run_invite(config=config.bondling_fairyland.invite_config, is_over=False, is_first=True)

二进制
tasks/BondlingFairyland/stone/buy_add.png


二进制
tasks/BondlingFairyland/stone/buy_plus.png


二进制
tasks/BondlingFairyland/stone/buy_sub.png


+ 6 - 6
tasks/BondlingFairyland/stone/click.json

@@ -7,20 +7,20 @@
   },
   {
     "itemName": "left_2",
-    "roiFront": "423,190,139,277",
-    "roiBack": "423,190,139,277",
+    "roiFront": "423,226,111,241",
+    "roiBack": "423,226,111,241",
     "description": "description"
   },
   {
     "itemName": "left_3",
-    "roiFront": "676,176,159,307",
-    "roiBack": "676,176,159,307",
+    "roiFront": "676,176,107,275",
+    "roiBack": "676,176,107,275",
     "description": "description"
   },
   {
     "itemName": "left_4",
-    "roiFront": "923,198,155,279",
-    "roiBack": "923,198,155,279",
+    "roiFront": "918,223,108,235",
+    "roiBack": "918,223,108,235",
     "description": "description"
   }
 ]

+ 31 - 4
tasks/BondlingFairyland/stone/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "stone_enter",
     "imageName": "stone_stone_enter.png",
-    "roiFront": "1167,472,38,41",
-    "roiBack": "1167,472,38,41",
+    "roiFront": "1172,444,38,41",
+    "roiBack": "1172,444,38,41",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -11,8 +11,35 @@
   {
     "itemName": "stone_sure",
     "imageName": "stone_stone_sure.png",
-    "roiFront": "1152,601,75,70",
-    "roiBack": "1152,601,75,70",
+    "roiFront": "644,621,56,39",
+    "roiBack": "618,614,120,52",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "buy_plus",
+    "imageName": "buy_plus.png",
+    "roiFront": "765,543,43,40",
+    "roiBack": "765,543,43,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "buy_add",
+    "imageName": "buy_add.png",
+    "roiFront": "678,540,43,40",
+    "roiBack": "678,540,43,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "buy_sub",
+    "imageName": "buy_sub.png",
+    "roiFront": "468,540,43,40",
+    "roiBack": "468,540,43,40",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

二进制
tasks/BondlingFairyland/stone/stone_stone_enter.png


二进制
tasks/BondlingFairyland/stone/stone_stone_sure.png