Kaynağa Gözat

refactor(GeneralBattle): 重构预设队伍和预设组的点击区域

- 调整了预设队伍和预设组的点击区域,使之更加精确- 添加了新的绿标点击区域 C_GREEN_MARK_AREA
- 增加了新的 OCR 规则 O_PRESET,用于识别预设按钮
ChengRanORZ 1 yıl önce
ebeveyn
işleme
4db458a6ac

+ 11 - 7
tasks/Component/GeneralBattle/assets.py

@@ -35,19 +35,19 @@ class GeneralBattleAssets:
 	# 预设队伍4 
 	C_PRESET_TEAM_4 = RuleClick(roi_front=(193,596,464,35), roi_back=(193,596,464,35), name="preset_team_4")
 	# 预设组1 
-	C_PRESET_GROUP_1 = RuleClick(roi_front=(28,238,134,56), roi_back=(28,238,134,56), name="preset_group_1")
+	C_PRESET_GROUP_1 = RuleClick(roi_front=(35,240,25,50), roi_back=(35,240,25,50), name="preset_group_1")
 	# 预设组2 
-	C_PRESET_GROUP_2 = RuleClick(roi_front=(31,298,132,60), roi_back=(31,298,132,60), name="preset_group_2")
+	C_PRESET_GROUP_2 = RuleClick(roi_front=(35,305,25,50), roi_back=(35,305,25,50), name="preset_group_2")
 	# 预设组3 
-	C_PRESET_GROUP_3 = RuleClick(roi_front=(31,362,135,59), roi_back=(31,362,135,59), name="preset_group_3")
+	C_PRESET_GROUP_3 = RuleClick(roi_front=(35,365,25,50), roi_back=(35,365,25,50), name="preset_group_3")
 	# 预设组4 
-	C_PRESET_GROUP_4 = RuleClick(roi_front=(29,427,133,57), roi_back=(29,427,133,57), name="preset_group_4")
+	C_PRESET_GROUP_4 = RuleClick(roi_front=(35,430,25,50), roi_back=(35,430,25,50), name="preset_group_4")
 	# 预设组5 
-	C_PRESET_GROUP_5 = RuleClick(roi_front=(31,489,133,60), roi_back=(31,489,133,60), name="preset_group_5")
+	C_PRESET_GROUP_5 = RuleClick(roi_front=(35,495,25,50), roi_back=(35,495,25,50), name="preset_group_5")
 	# 预设组6 
-	C_PRESET_GROUP_6 = RuleClick(roi_front=(31,549,132,63), roi_back=(31,549,132,63), name="preset_group_6")
+	C_PRESET_GROUP_6 = RuleClick(roi_front=(35,555,25,50), roi_back=(35,555,25,50), name="preset_group_6")
 	# 预设组7 
-	C_PRESET_GROUP_7 = RuleClick(roi_front=(29,615,137,63), roi_back=(29,615,137,63), name="preset_group_7")
+	C_PRESET_GROUP_7 = RuleClick(roi_front=(35,615,25,50), roi_back=(35,615,25,50), name="preset_group_7")
 	# 从左开始第一个绿标 
 	C_GREEN_LEFT_1 = RuleClick(roi_front=(128,433,90,150), roi_back=(128,433,90,150), name="green_left_1")
 	# 从左开始第二个绿标 
@@ -60,6 +60,8 @@ class GeneralBattleAssets:
 	C_GREEN_LEFT_5 = RuleClick(roi_front=(1059,416,85,145), roi_back=(1059,416,85,145), name="green_left_5")
 	# 绿标阴阳师 
 	C_GREEN_MAIN = RuleClick(roi_front=(590,454,88,178), roi_back=(590,454,88,178), name="green_main")
+	# 绿标点击 区域,默认为全屏,需要在代码中更新其区域 
+	C_GREEN_MARK_AREA = RuleClick(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), name="green_mark_area")
 	# 战斗的时候有一定的概率随机点击 
 	C_RANDOM_CLICK = RuleClick(roi_front=(104,79,1050,507), roi_back=(255,65,100,100), name="random_click")
 
@@ -125,6 +127,8 @@ class GeneralBattleAssets:
 	# Ocr Rule Assets
 	# 准备 
 	O_BATTLE_PREPARE = RuleOcr(roi=(1122,546,92,51), area=(1122,546,92,51), mode="Single", method="Default", keyword="准备", name="battle_prepare")
+	# 预设,部分场景预设按钮上的文字为'预设'+数字,导致点击preset失败 
+	O_PRESET = RuleOcr(roi=(20,620,60,80), area=(20,620,60,80), mode="Single", method="Default", keyword="预", name="preset")
 
 
 	# Swipe Rule Assets

+ 114 - 108
tasks/Component/GeneralBattle/gb/click.json

@@ -1,110 +1,116 @@
 [
-    {
-        "itemName": "preset_team_1",
-        "roiFront": "196,234,464,114",
-        "roiBack": "196,234,464,114",
-        "description": "预设队伍1"
-    },
-    {
-        "itemName": "preset_team_2",
-        "roiFront": "197,358,465,103",
-        "roiBack": "197,358,465,103",
-        "description": "预设队伍2"
-    },
-    {
-        "itemName": "preset_team_3",
-        "roiFront": "195,480,462,100",
-        "roiBack": "195,480,462,100",
-        "description": "预设队伍3"
-    },
-    {
-        "itemName": "preset_team_4",
-        "roiFront": "193,596,464,35",
-        "roiBack": "193,596,464,35",
-        "description": "预设队伍4"
-    },
-    {
-        "itemName": "preset_group_1",
-        "roiFront": "28,238,134,56",
-        "roiBack": "28,238,134,56",
-        "description": "预设组1"
-    },
-    {
-        "itemName": "preset_group_2",
-        "roiFront": "31,298,132,60",
-        "roiBack": "31,298,132,60",
-        "description": "预设组2"
-    },
-    {
-        "itemName": "preset_group_3",
-        "roiFront": "31,362,135,59",
-        "roiBack": "31,362,135,59",
-        "description": "预设组3"
-    },
-    {
-        "itemName": "preset_group_4",
-        "roiFront": "29,427,133,57",
-        "roiBack": "29,427,133,57",
-        "description": "预设组4"
-    },
-    {
-        "itemName": "preset_group_5",
-        "roiFront": "31,489,133,60",
-        "roiBack": "31,489,133,60",
-        "description": "预设组5"
-    },
-    {
-        "itemName": "preset_group_6",
-        "roiFront": "31,549,132,63",
-        "roiBack": "31,549,132,63",
-        "description": "预设组6"
-    },
-    {
-        "itemName": "preset_group_7",
-        "roiFront": "29,615,137,63",
-        "roiBack": "29,615,137,63",
-        "description": "预设组7"
-    },
-    {
-        "itemName": "green_left_1",
-        "roiFront": "128,433,90,150",
-        "roiBack": "128,433,90,150",
-        "description": "从左开始第一个绿标"
-    },
-    {
-        "itemName": "green_left_2",
-        "roiFront": "371,385,81,145",
-        "roiBack": "371,385,81,145",
-        "description": "从左开始第二个绿标"
-    },
-    {
-        "itemName": "green_left_3",
-        "roiFront": "586,328,100,76",
-        "roiBack": "586,328,100,76",
-        "description": "从左开始第三个绿标"
-    },
-    {
-        "itemName": "green_left_4",
-        "roiFront": "817,379,77,133",
-        "roiBack": "817,379,77,133",
-        "description": "从左开始第四个绿标"
-    },
-    {
-        "itemName": "green_left_5",
-        "roiFront": "1059,416,85,145",
-        "roiBack": "1059,416,85,145",
-        "description": "从左开始第五个绿标"
-    },
-    {
-        "itemName": "green_main",
-        "roiFront": "590,454,88,178",
-        "roiBack": "590,454,88,178",
-        "description": "绿标阴阳师"
-    },
-    {
-        "itemName": "random_click",
-        "roiFront": "104,79,1050,507",
-        "roiBack": "255,65,100,100",
-        "description": "战斗的时候有一定的概率随机点击"
-    }
+  {
+    "itemName": "preset_team_1",
+    "roiFront": "195,235,465,110",
+    "roiBack": "195,235,465,110",
+    "description": "预设队伍1"
+  },
+  {
+    "itemName": "preset_team_2",
+    "roiFront": "195,355,465,110",
+    "roiBack": "195,355,465,110",
+    "description": "预设队伍2"
+  },
+  {
+    "itemName": "preset_team_3",
+    "roiFront": "195,475,465,110",
+    "roiBack": "195,475,465,110",
+    "description": "预设队伍3"
+  },
+  {
+    "itemName": "preset_team_4",
+    "roiFront": "195,595,465,35",
+    "roiBack": "195,595,465,35",
+    "description": "预设队伍4"
+  },
+  {
+    "itemName": "preset_group_1",
+    "roiFront": "35,240,25,50",
+    "roiBack": "35,240,25,50",
+    "description": "预设组1"
+  },
+  {
+    "itemName": "preset_group_2",
+    "roiFront": "35,305,25,50",
+    "roiBack": "35,305,25,50",
+    "description": "预设组2"
+  },
+  {
+    "itemName": "preset_group_3",
+    "roiFront": "35,365,25,50",
+    "roiBack": "35,365,25,50",
+    "description": "预设组3"
+  },
+  {
+    "itemName": "preset_group_4",
+    "roiFront": "35,430,25,50",
+    "roiBack": "35,430,25,50",
+    "description": "预设组4"
+  },
+  {
+    "itemName": "preset_group_5",
+    "roiFront": "35,495,25,50",
+    "roiBack": "35,495,25,50",
+    "description": "预设组5"
+  },
+  {
+    "itemName": "preset_group_6",
+    "roiFront": "35,555,25,50",
+    "roiBack": "35,555,25,50",
+    "description": "预设组6"
+  },
+  {
+    "itemName": "preset_group_7",
+    "roiFront": "35,615,25,50",
+    "roiBack": "35,615,25,50",
+    "description": "预设组7"
+  },
+  {
+    "itemName": "green_left_1",
+    "roiFront": "128,433,90,150",
+    "roiBack": "128,433,90,150",
+    "description": "从左开始第一个绿标"
+  },
+  {
+    "itemName": "green_left_2",
+    "roiFront": "371,385,81,145",
+    "roiBack": "371,385,81,145",
+    "description": "从左开始第二个绿标"
+  },
+  {
+    "itemName": "green_left_3",
+    "roiFront": "586,328,100,76",
+    "roiBack": "586,328,100,76",
+    "description": "从左开始第三个绿标"
+  },
+  {
+    "itemName": "green_left_4",
+    "roiFront": "817,379,77,133",
+    "roiBack": "817,379,77,133",
+    "description": "从左开始第四个绿标"
+  },
+  {
+    "itemName": "green_left_5",
+    "roiFront": "1059,416,85,145",
+    "roiBack": "1059,416,85,145",
+    "description": "从左开始第五个绿标"
+  },
+  {
+    "itemName": "green_main",
+    "roiFront": "590,454,88,178",
+    "roiBack": "590,454,88,178",
+    "description": "绿标阴阳师"
+  },
+  {
+    "itemName": "green_mark_area",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "description": "绿标点击 区域,默认为全屏,需要在代码中更新其区域"
+  },
+  {
+    "itemName": "random_click",
+    "roiFront": "104,79,1050,507",
+    "roiBack": "255,65,100,100",
+    "description": "战斗的时候有一定的概率随机点击"
+  }
 ]

+ 9 - 0
tasks/Component/GeneralBattle/gb/ocr.json

@@ -7,5 +7,14 @@
     "method": "Default",
     "keyword": "准备",
     "description": "准备"
+  },
+  {
+    "itemName": "preset",
+    "roiFront": "20,620,60,80",
+    "roiBack":  "20,620,60,80",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "预",
+    "description": "预设,部分场景预设按钮上的文字为'预设'+数字,导致点击preset失败"
   }
 ]

+ 100 - 43
tasks/Component/GeneralBattle/general_battle.py

@@ -5,6 +5,9 @@ import time
 import random
 from time import sleep
 
+import cv2
+
+from module.base.utils import get_color, color_similar
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.config_general_battle import GreenMarkType, GeneralBattleConfig
 from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
@@ -294,62 +297,80 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
                 break
             if self.appear_then_click(self.I_PRESET, threshold=0.8, interval=1):
                 continue
+            if self.ocr_appear(self.O_PRESET):
+                self.click(self.O_PRESET, interval=1)
+                continue
         logger.info("Click preset button")
 
+        def get_unselect_color(tmp1, tmp2, tmp3, size):
+            # 获取未选择分组的颜色,3组之中必定存在两个颜色相似
+            # area 参数格式是(x1,y1,x2,y2)
+            color_1 = get_color(self.device.image,
+                                (tmp1.roi_back[0], tmp1.roi_back[1],
+                                 tmp1.roi_back[0] + size[0], tmp1.roi_back[1] + size[1]))
+            color_2 = get_color(self.device.image,
+                                (tmp2.roi_back[0], tmp2.roi_back[1],
+                                 tmp2.roi_back[0] + size[0], tmp2.roi_back[1] + size[1]))
+            color_3 = get_color(self.device.image,
+                                (tmp3.roi_back[0], tmp3.roi_back[1],
+                                 tmp3.roi_back[0] + size[0], tmp3.roi_back[1] + size[1]))
+
+            if color_similar(color_1, color_2):
+                return color_1
+            if color_similar(color_2, color_3):
+                return color_2
+            return color_3
+
         # 选择预设组
-        x, y = None, None
-        match preset_group:
-            case 1:
-                x, y = self.C_PRESET_GROUP_1.coord()
-            case 2:
-                x, y = self.C_PRESET_GROUP_2.coord()
-            case 3:
-                x, y = self.C_PRESET_GROUP_3.coord()
-            case 4:
-                x, y = self.C_PRESET_GROUP_4.coord()
-            case 5:
-                x, y = self.C_PRESET_GROUP_5.coord()
-            case 6:
-                x, y = self.C_PRESET_GROUP_6.coord()
-            case 7:
-                x, y = self.C_PRESET_GROUP_7.coord()
-            case _:
-                x, y = self.C_PRESET_GROUP_1.coord()
-        count = 0
-        while count < 3:
-            self.device.click(x, y)
-            sleep(0.02)
-            count += 1
+        tmp = self.__getattribute__("C_PRESET_GROUP_" + str(preset_group))
+        if tmp is None:
+            tmp = self.C_PRESET_GROUP_1
+        color_size = [self.C_PRESET_GROUP_1.roi_back[2],
+                      self.C_PRESET_GROUP_1.roi_back[3]]
+        # unselected_color = get_unselect_color(self.C_PRESET_GROUP_1, self.C_PRESET_GROUP_2, self.C_PRESET_GROUP_3, size=color_size)
+        # 考虑到有些预设组没有预设,所以这里取一个比较固定的颜色
+        unselected_color = (224.9, 208.3, 187.4)
+        while True:
+            self.screenshot()
+            color_tmp = get_color(self.device.image,
+                                  (tmp.roi_back[0], tmp.roi_back[1], tmp.roi_back[0] + color_size[0],
+                                   tmp.roi_back[1] + color_size[1]))
+            if color_similar(color_tmp, unselected_color):
+                self.click(tmp, interval=0.2)
+                continue
+            break
+
         logger.info("Select preset group")
 
         # 选择预设的队伍
         time.sleep(0.5)
-        match preset_team:
-            case 1:
-                x, y = self.C_PRESET_TEAM_1.coord()
-            case 2:
-                x, y = self.C_PRESET_TEAM_2.coord()
-            case 3:
-                x, y = self.C_PRESET_TEAM_3.coord()
-            case 4:
-                x, y = self.C_PRESET_TEAM_4.coord()
-            case _:
-                x, y = self.C_PRESET_TEAM_1.coord()
-        count = 0
-        while count < 3:
-            self.device.click(x, y)
-            sleep(0.02)
-            count += 1
+        tmp = self.__getattribute__("C_PRESET_TEAM_" + str(preset_team))
+        if tmp is None:
+            tmp = self.C_PRESET_TEAM_1
+        color_size = [5, 5]
+        # unselected_color = get_unselect_color(self.C_PRESET_TEAM_1, self.C_PRESET_TEAM_2, self.C_PRESET_TEAM_3, size=color_size )
+        unselected_color = (216.8, 185.0, 146.8)
+        while True:
+            self.screenshot()
+            color_tmp = get_color(self.device.image,
+                                  (tmp.roi_back[0], tmp.roi_back[1], tmp.roi_back[0] + color_size[0],
+                                   tmp.roi_back[1] + color_size[1]))
+            if color_similar(color_tmp, unselected_color):
+                self.click(tmp, interval=0.2)
+                continue
+            break
+
+        self.click(tmp)
         logger.info("Select preset team")
 
         # 点击预设确认
         self.wait_until_appear(self.I_PRESET_ENSURE, wait_time=1)
         while 1:
             self.screenshot()
-            if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8):
-                continue
             if not self.appear(self.I_PRESET_ENSURE):
                 break
+            if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8, interval=0.2):
+                continue
         logger.info("Click preset ensure")
 
     def random_click_swipt(self):
@@ -497,5 +518,41 @@ if __name__ == '__main__':
     c = Config('oas1')
     d = Device(c)
     t = GeneralBattle(c, d)
-
-    t.check_buff([BuffClass.EXP_50, BuffClass.GOLD_50])
+    self = t
+    # t.check_buff([BuffClass.EXP_50, BuffClass.GOLD_50])
+
+    img = cv2.imread(r"E:\preset3.png")
+    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+    self.device.image = img
+
+
+    def get_unselect_color(tmp1, tmp2, tmp3, size):
+        # 获取未选择分组的颜色,3组之中必定存在两个颜色相似
+        # area 参数格式是(x1,y1,x2,y2)
+        color_1 = get_color(self.device.image,
+                            (tmp1.roi_back[0], tmp1.roi_back[1],
+                             tmp1.roi_back[0] + size[0], tmp1.roi_back[1] + size[1]))
+        color_2 = get_color(self.device.image,
+                            (tmp2.roi_back[0], tmp2.roi_back[1],
+                             tmp2.roi_back[0] + size[0], tmp2.roi_back[1] + size[1]))
+        color_3 = get_color(self.device.image,
+                            (tmp3.roi_back[0], tmp3.roi_back[1],
+                             tmp3.roi_back[0] + size[0], tmp3.roi_back[1] + size[1]))
+
+        if color_similar(color_1, color_2):
+            return color_1
+        if color_similar(color_2, color_3):
+            return color_2
+        return color_3
+
+
+    color_size = [self.C_PRESET_GROUP_1.roi_back[2],
+                  self.C_PRESET_GROUP_1.roi_back[3]]
+    unselected_color = get_unselect_color(self.C_PRESET_GROUP_1, self.C_PRESET_GROUP_2, self.C_PRESET_GROUP_3,
+                                          size=color_size)
+    print("")
+    color_size = [5, 5]
+    unselected_color = get_unselect_color(self.C_PRESET_TEAM_1, self.C_PRESET_TEAM_2, self.C_PRESET_TEAM_3,
+                                          size=color_size
+                                          )
+    print("")