소스 검색

fix(BondlingFairyland): adopt new ui and add minimal mode switch

Azure 11 달 전
부모
커밋
7339ff985b

+ 17 - 13
tasks/BondlingFairyland/assets.py

@@ -117,33 +117,37 @@ class BondlingFairylandAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 启用自动结契 
 	# 启用自动结契 
-	I_C_AUTO_TRUE = RuleImage(roi_front=(765,157,50,24), roi_back=(752,145,79,51), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_true.png")
+	I_C_AUTO_TRUE = RuleImage(roi_front=(765,200,50,24), roi_back=(749,187,79,51), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_true.png")
 	# 关闭自动结契 
 	# 关闭自动结契 
-	I_C_AUTO_FALSE = RuleImage(roi_front=(768,156,43,25), roi_back=(745,146,88,44), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_false.png")
+	I_C_AUTO_FALSE = RuleImage(roi_front=(766,200,43,25), roi_back=(745,189,88,44), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_false.png")
 	# 启用低级盘子 
 	# 启用低级盘子 
-	I_C_LOW_TRUE = RuleImage(roi_front=(524,242,30,32), roi_back=(512,233,51,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_true.png")
+	I_C_LOW_TRUE = RuleImage(roi_front=(523,284,30,32), roi_back=(514,274,51,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_true.png")
 	# 禁用低级盘子 
 	# 禁用低级盘子 
-	I_C_LOW_FALSE = RuleImage(roi_front=(521,238,33,35), roi_back=(513,231,48,47), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_false.png")
+	I_C_LOW_FALSE = RuleImage(roi_front=(521,282,33,35), roi_back=(513,275,48,47), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_false.png")
 	# 启用中级盘子 
 	# 启用中级盘子 
-	I_C_MIDUM_TRUE = RuleImage(roi_front=(663,241,31,31), roi_back=(657,238,41,38), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_true.png")
+	I_C_MIDUM_TRUE = RuleImage(roi_front=(663,283,31,31), roi_back=(653,277,49,46), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_true.png")
 	# 禁用中级盘子 
 	# 禁用中级盘子 
-	I_C_MIDUM_FALSE = RuleImage(roi_front=(662,241,31,32), roi_back=(654,234,49,45), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_false.png")
+	I_C_MIDUM_FALSE = RuleImage(roi_front=(662,283,31,32), roi_back=(654,276,49,45), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_false.png")
 	# 启用高级盘子 
 	# 启用高级盘子 
-	I_C_HIGH_TRUE = RuleImage(roi_front=(800,239,33,36), roi_back=(796,236,42,44), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_true.png")
+	I_C_HIGH_TRUE = RuleImage(roi_front=(800,283,33,36), roi_back=(792,273,49,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_true.png")
 	# 禁用高级盘子 
 	# 禁用高级盘子 
-	I_C_HIGH_FALSE = RuleImage(roi_front=(801,241,32,34), roi_back=(792,232,51,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_false.png")
+	I_C_HIGH_FALSE = RuleImage(roi_front=(801,283,32,34), roi_back=(792,273,51,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_false.png")
 	# 启用优先连接羁绊式神 
 	# 启用优先连接羁绊式神 
-	I_C_FIRST_ENABLE = RuleImage(roi_front=(507,517,33,31), roi_back=(499,510,49,47), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_enable.png")
+	I_C_FIRST_ENABLE = RuleImage(roi_front=(507,563,33,31), roi_back=(500,553,49,47), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_enable.png")
 	# 禁用优先连接羁绊式神 
 	# 禁用优先连接羁绊式神 
-	I_C_FIRST_DISABLE = RuleImage(roi_front=(708,518,38,34), roi_back=(703,513,46,44), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_disable.png")
+	I_C_FIRST_DISABLE = RuleImage(roi_front=(708,560,38,34), roi_back=(702,553,49,49), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_disable.png")
 	# 结契设置确定 
 	# 结契设置确定 
-	I_CAPTION_ENSURE = RuleImage(roi_front=(668,567,129,56), roi_back=(655,557,153,77), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_caption_ensure.png")
+	I_CAPTION_ENSURE = RuleImage(roi_front=(665,610,129,56), roi_back=(652,601,153,77), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_caption_ensure.png")
 	# 结契设置按钮 
 	# 结契设置按钮 
 	I_CLICK_CAPTION = RuleImage(roi_front=(68,414,54,42), roi_back=(48,398,97,81), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_click_caption.png")
 	I_CLICK_CAPTION = RuleImage(roi_front=(68,414,54,42), roi_back=(48,398,97,81), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_click_caption.png")
 	# 禁用连续使用盘子 
 	# 禁用连续使用盘子 
-	I_C_CONTINUOUS_DISABLE = RuleImage(roi_front=(710,424,33,36), roi_back=(700,417,50,52), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_continuous_disable.png")
+	I_C_CONTINUOUS_DISABLE = RuleImage(roi_front=(709,468,33,36), roi_back=(702,462,50,52), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_continuous_disable.png")
 	# 启用连续使用盘子 
 	# 启用连续使用盘子 
-	I_C_CONTINUOUS_ENABLE = RuleImage(roi_front=(508,424,32,34), roi_back=(501,417,47,48), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_continuous_enable.png")
+	I_C_CONTINUOUS_ENABLE = RuleImage(roi_front=(508,468,32,34), roi_back=(500,461,47,48), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_continuous_enable.png")
+	# 启用结契极简模式 
+	I_C_MINIMAL_MODE_ENABLE = RuleImage(roi_front=(764,155,48,24), roi_back=(757,149,63,39), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_minimal_mode_enable.png")
+	# 禁用结契极简模式 
+	I_C_MINIMAL_MODE_DISABLE = RuleImage(roi_front=(764,156,46,23), roi_back=(758,148,62,39), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_minimal_mode_disable.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

BIN
tasks/BondlingFairyland/capture/capture_c_minimal_mode_disable.png


BIN
tasks/BondlingFairyland/capture/capture_c_minimal_mode_enable.png


+ 44 - 26
tasks/BondlingFairyland/capture/image.json

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "c_auto_true",
     "itemName": "c_auto_true",
     "imageName": "capture_c_auto_true.png",
     "imageName": "capture_c_auto_true.png",
-    "roiFront": "765,157,50,24",
-    "roiBack": "752,145,79,51",
+    "roiFront": "765,200,50,24",
+    "roiBack": "749,187,79,51",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "启用自动结契"
     "description": "启用自动结契"
@@ -11,8 +11,8 @@
   {
   {
     "itemName": "c_auto_false",
     "itemName": "c_auto_false",
     "imageName": "capture_c_auto_false.png",
     "imageName": "capture_c_auto_false.png",
-    "roiFront": "768,156,43,25",
-    "roiBack": "745,146,88,44",
+    "roiFront": "766,200,43,25",
+    "roiBack": "745,189,88,44",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "关闭自动结契"
     "description": "关闭自动结契"
@@ -20,8 +20,8 @@
   {
   {
     "itemName": "c_low_true",
     "itemName": "c_low_true",
     "imageName": "capture_c_low_true.png",
     "imageName": "capture_c_low_true.png",
-    "roiFront": "524,242,30,32",
-    "roiBack": "512,233,51,50",
+    "roiFront": "523,284,30,32",
+    "roiBack": "514,274,51,50",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "启用低级盘子"
     "description": "启用低级盘子"
@@ -29,8 +29,8 @@
   {
   {
     "itemName": "c_low_false",
     "itemName": "c_low_false",
     "imageName": "capture_c_low_false.png",
     "imageName": "capture_c_low_false.png",
-    "roiFront": "521,238,33,35",
-    "roiBack": "513,231,48,47",
+    "roiFront": "521,282,33,35",
+    "roiBack": "513,275,48,47",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "禁用低级盘子"
     "description": "禁用低级盘子"
@@ -38,8 +38,8 @@
   {
   {
     "itemName": "c_midum_true",
     "itemName": "c_midum_true",
     "imageName": "capture_c_midum_true.png",
     "imageName": "capture_c_midum_true.png",
-    "roiFront": "663,241,31,31",
-    "roiBack": "657,238,41,38",
+    "roiFront": "663,283,31,31",
+    "roiBack": "653,277,49,46",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "启用中级盘子"
     "description": "启用中级盘子"
@@ -47,8 +47,8 @@
   {
   {
     "itemName": "c_midum_false",
     "itemName": "c_midum_false",
     "imageName": "capture_c_midum_false.png",
     "imageName": "capture_c_midum_false.png",
-    "roiFront": "662,241,31,32",
-    "roiBack": "654,234,49,45",
+    "roiFront": "662,283,31,32",
+    "roiBack": "654,276,49,45",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "禁用中级盘子"
     "description": "禁用中级盘子"
@@ -56,8 +56,8 @@
   {
   {
     "itemName": "c_high_true",
     "itemName": "c_high_true",
     "imageName": "capture_c_high_true.png",
     "imageName": "capture_c_high_true.png",
-    "roiFront": "800,239,33,36",
-    "roiBack": "796,236,42,44",
+    "roiFront": "800,283,33,36",
+    "roiBack": "792,273,49,50",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "启用高级盘子"
     "description": "启用高级盘子"
@@ -65,8 +65,8 @@
   {
   {
     "itemName": "c_high_false",
     "itemName": "c_high_false",
     "imageName": "capture_c_high_false.png",
     "imageName": "capture_c_high_false.png",
-    "roiFront": "801,241,32,34",
-    "roiBack": "792,232,51,50",
+    "roiFront": "801,283,32,34",
+    "roiBack": "792,273,51,50",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "禁用高级盘子"
     "description": "禁用高级盘子"
@@ -74,8 +74,8 @@
   {
   {
     "itemName": "c_first_enable",
     "itemName": "c_first_enable",
     "imageName": "capture_c_first_enable.png",
     "imageName": "capture_c_first_enable.png",
-    "roiFront": "507,517,33,31",
-    "roiBack": "499,510,49,47",
+    "roiFront": "507,563,33,31",
+    "roiBack": "500,553,49,47",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "启用优先连接羁绊式神"
     "description": "启用优先连接羁绊式神"
@@ -83,8 +83,8 @@
   {
   {
     "itemName": "c_first_disable",
     "itemName": "c_first_disable",
     "imageName": "capture_c_first_disable.png",
     "imageName": "capture_c_first_disable.png",
-    "roiFront": "708,518,38,34",
-    "roiBack": "703,513,46,44",
+    "roiFront": "708,560,38,34",
+    "roiBack": "702,553,49,49",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "禁用优先连接羁绊式神"
     "description": "禁用优先连接羁绊式神"
@@ -92,8 +92,8 @@
   {
   {
     "itemName": "caption_ensure",
     "itemName": "caption_ensure",
     "imageName": "capture_caption_ensure.png",
     "imageName": "capture_caption_ensure.png",
-    "roiFront": "668,567,129,56",
-    "roiBack": "655,557,153,77",
+    "roiFront": "665,610,129,56",
+    "roiBack": "652,601,153,77",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "结契设置确定"
     "description": "结契设置确定"
@@ -110,8 +110,8 @@
   {
   {
     "itemName": "c_continuous_disable",
     "itemName": "c_continuous_disable",
     "imageName": "capture_c_continuous_disable.png",
     "imageName": "capture_c_continuous_disable.png",
-    "roiFront": "710,424,33,36",
-    "roiBack": "700,417,50,52",
+    "roiFront": "709,468,33,36",
+    "roiBack": "702,462,50,52",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "禁用连续使用盘子"
     "description": "禁用连续使用盘子"
@@ -119,10 +119,28 @@
   {
   {
     "itemName": "c_continuous_enable",
     "itemName": "c_continuous_enable",
     "imageName": "capture_c_continuous_enable.png",
     "imageName": "capture_c_continuous_enable.png",
-    "roiFront": "508,424,32,34",
-    "roiBack": "501,417,47,48",
+    "roiFront": "508,468,32,34",
+    "roiBack": "500,461,47,48",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "启用连续使用盘子"
     "description": "启用连续使用盘子"
+  },
+  {
+    "itemName": "c_minimal_mode_enable",
+    "imageName": "capture_c_minimal_mode_enable.png",
+    "roiFront": "764,155,48,24",
+    "roiBack": "757,149,63,39",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "启用结契极简模式"
+  },
+  {
+    "itemName": "c_minimal_mode_disable",
+    "imageName": "capture_c_minimal_mode_disable.png",
+    "roiFront": "764,156,46,23",
+    "roiBack": "758,148,62,39",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "禁用结契极简模式"
   }
   }
 ]
 ]

+ 12 - 40
tasks/BondlingFairyland/script_task.py

@@ -338,6 +338,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.appear(self.I_STONE_SURE):
             if not self.appear(self.I_STONE_SURE):
+                sleep(random.uniform(1.5, 2))  # 等待购买后的动画, 否则已经买了但是下次再点击还会出现该界面
                 return True
                 return True
             for i in range(3):
             for i in range(3):
                 if self.appear_then_click(self.I_BUY_PLUS, interval=1):
                 if self.appear_then_click(self.I_BUY_PLUS, interval=1):
@@ -530,19 +531,9 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         if mode == BondlingMode.MODE1:
         if mode == BondlingMode.MODE1:
             return None
             return None
         logger.info(f'Capture setting mode: {mode}')
         logger.info(f'Capture setting mode: {mode}')
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_CAPTION_ENSURE):
-                break
-            if self.appear_then_click(self.I_CLICK_CAPTION, interval=1):
-                continue
-
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_C_AUTO_TRUE):
-                break
-            if self.appear_then_click(self.I_C_AUTO_FALSE, interval=1):
-                continue
+        self.ui_click(self.I_CLICK_CAPTION, self.I_CAPTION_ENSURE, interval=1)  # 打开结契设置
+        self.ui_click(self.I_C_AUTO_FALSE, self.I_C_AUTO_TRUE, interval=1)  # 自动结契
+        self.ui_click(self.I_C_MINIMAL_MODE_DISABLE, self.I_C_MINIMAL_MODE_ENABLE, interval=0.8)  # 极简模式
 
 
         target_true = None
         target_true = None
         target_false = None
         target_false = None
@@ -561,34 +552,15 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         elif mode == BondlingMode.MODE4:  # 高级盘子不需要设置连续结契和羁绊式神
         elif mode == BondlingMode.MODE4:  # 高级盘子不需要设置连续结契和羁绊式神
             target_true = self.I_C_HIGH_TRUE
             target_true = self.I_C_HIGH_TRUE
             target_false = self.I_C_HIGH_FALSE
             target_false = self.I_C_HIGH_FALSE
-        # 切换盘子
-        while target_true is not None:
-            self.screenshot()
-            if self.appear(target_true):
-                break
-            if self.appear_then_click(target_false, interval=1):
-                continue
-        # 是否连续结契
-        while target_continuous is not None:
-            self.screenshot()
-            if not self.appear(target_continuous):
-                break
-            if self.appear_then_click(target_continuous, interval=1):
-                continue
-        # 是否使用羁绊式神
-        while target_first is not None:
-            self.screenshot()
-            if not self.appear(target_first):
-                break
-            if self.appear_then_click(target_first, interval=1):
-                continue
+        if target_true is not None:  # 切换盘子
+            self.ui_click(target_false, target_true, interval=1)
+        if target_continuous is not None:  # 是否连续结契
+            self.ui_click_until_disappear(target_continuous, interval=1)
+        if target_first is not None:  # 是否使用羁绊式神
+            self.ui_click_until_disappear(target_first, interval=1)
         # 点击确定退出
         # 点击确定退出
-        while 1:
-            self.screenshot()
-            if not self.appear(self.I_CAPTION_ENSURE):
-                break
-            if self.appear_then_click(self.I_CAPTION_ENSURE, interval=1):
-                continue
+        self.ui_click_until_disappear(self.I_CAPTION_ENSURE, interval=1)
+        return None
 
 
     def enter_shikigami_records(self) -> None:
     def enter_shikigami_records(self) -> None:
         """
         """