فهرست منبع

契灵增加跨区组队

ljxun 1 سال پیش
والد
کامیت
4faa228a6c

+ 15 - 2
tasks/BondlingFairyland/assets.py

@@ -36,6 +36,10 @@ class BondlingFairylandAssets:
 	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_FRIEND = RuleOcr(roi=(357,89,100,54), area=(357,89,100,54), mode="Single", method="Default", keyword="", name="friend")
+	# 跨区邀请 
+	O_KUAQU = RuleOcr(roi=(472,88,100,54), area=(472,88,100,54), mode="Single", method="Default", keyword="", name="kuaqu")
 
 
 	# Image Rule Assets
@@ -51,8 +55,6 @@ 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_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_FLAG_1_ON = RuleImage(roi_front=(373,127,22,21), roi_back=(373,127,22,21), threshold=0.7, method="Template matching", file="./tasks/BondlingFairyland/ball/gi_flag_1_on.png")
 
 
 	# Image Rule Assets
@@ -120,6 +122,17 @@ class BondlingFairylandAssets:
 	I_CLICK_CAPTION = RuleImage(roi_front=(177,625,59,51), roi_back=(177,625,59,51), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_click_caption.png")
 
 
+	# Image Rule Assets
+	# description 
+	I_SELECT_KUAQU_ON = RuleImage(roi_front=(485,124,79,31), roi_back=(485,124,79,31), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/invite/select_kuaqu_on.png")
+	# description 
+	I_SELECT_FRIEND_OFF = RuleImage(roi_front=(366,121,78,32), roi_back=(366,121,78,32), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/invite/select_friend_off.png")
+	# description 
+	I_SELECT_FRIEND_ON = RuleImage(roi_front=(376,121,63,38), roi_back=(376,121,63,38), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/invite/select_friend_on.png")
+	# description 
+	I_SELECT_KUAQU_OFF = RuleImage(roi_front=(490,119,68,33), roi_back=(490,119,68,33), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/invite/select_kuaqu_off.png")
+
+
 	# Click Rule Assets
 	# description 
 	C_LEFT_1 = RuleClick(roi_front=(167,198,128,265), roi_back=(167,198,128,265), name="left_1")

BIN
tasks/BondlingFairyland/ball/gi_flag_1_on.png


+ 0 - 9
tasks/BondlingFairyland/ball/image.json

@@ -52,14 +52,5 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "契灵创建队伍"
-  },
-  {
-    "itemName": "flag_1_on",
-    "imageName": "gi_flag_1_on.png",
-    "roiFront": "373,127,22,21",
-    "roiBack": "373,127,22,21",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "用来判断当前的列表是哪儿的"
   }
 ]

+ 6 - 25
tasks/BondlingFairyland/general_invite.py

@@ -354,21 +354,14 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         friend_class = []
         class_ocr = [self.O_F_LIST_1, self.O_F_LIST_2, self.O_F_LIST_3, self.O_F_LIST_4]
         class_index = 0
-        list_1 = self.O_F_LIST_1.ocr(self.device.image)
-        list_2 = self.O_F_LIST_2.ocr(self.device.image)
-        list_3 = self.O_F_LIST_3.ocr(self.device.image)
-        list_4 = self.O_F_LIST_4.ocr(self.device.image)
+        list_1 = self.O_FRIEND.ocr(self.device.image)
+        list_2 = self.O_KUAQU.ocr(self.device.image)
         list_1 = list_1.replace(' ', '').replace('、', '')
         list_2 = list_2.replace(' ', '').replace('、', '')
-        list_3 = list_3.replace(' ', '').replace('、', '')
         if list_1 is not None and list_1 != '' and list_1 in self.friend_class:
             friend_class.append(list_1)
         if list_2 is not None and list_2 != '' and list_2 in self.friend_class:
             friend_class.append(list_2)
-        if list_3 is not None and list_3 != '' and list_3 in self.friend_class:
-            friend_class.append(list_3)
-        if list_4 is not None and list_4 != '' and list_4 in self.friend_class:
-            friend_class.append(list_4)
         for i in range(len(friend_class)):
             if friend_class[i] == '蔡友':
                 friend_class[i] = '寮友'
@@ -415,27 +408,15 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
             # 首先切换到不同的好友列表
             while index == 0:
                 self.screenshot()
-                if self.appear(self.I_FLAG_1_ON):
+                if self.appear(self.I_SELECT_FRIEND_ON):
                     break
-                if self.appear_then_click(self.I_FLAG_1_OFF, interval=1):
+                if self.appear_then_click(self.I_SELECT_FRIEND_OFF, interval=1):
                     continue
             while index == 1:
                 self.screenshot()
-                if self.appear(self.I_FLAG_2_ON):
-                    break
-                if self.appear_then_click(self.I_FLAG_2_OFF, interval=1):
-                    continue
-            while index == 2:
-                self.screenshot()
-                if self.appear(self.I_FLAG_3_ON):
-                    break
-                if self.appear_then_click(self.I_FLAG_3_OFF, interval=1):
-                    continue
-            while index == 3:
-                self.screenshot()
-                if self.appear(self.I_FLAG_4_ON):
+                if self.appear(self.I_SELECT_KUAQU_ON):
                     break
-                if self.appear_then_click(self.I_FLAG_4_OFF, interval=1):
+                if self.appear_then_click(self.I_SELECT_KUAQU_OFF, interval=1):
                     continue
 
             # 选中好友, 在这里游戏获取在线的好友并不是很快,根据不同的设备会有不同的时间,而且没有什么元素提供我们来判断

+ 38 - 0
tasks/BondlingFairyland/invite/image.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "select_kuaqu_on",
+    "imageName": "select_kuaqu_on.png",
+    "roiFront": "485,124,79,31",
+    "roiBack": "485,124,79,31",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "select_friend_off",
+    "imageName": "select_friend_off.png",
+    "roiFront": "366,121,78,32",
+    "roiBack": "366,121,78,32",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "select_friend_on",
+    "imageName": "select_friend_on.png",
+    "roiFront": "376,121,63,38",
+    "roiBack": "376,121,63,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "select_kuaqu_off",
+    "imageName": "select_kuaqu_off.png",
+    "roiFront": "490,119,68,33",
+    "roiBack": "490,119,68,33",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/BondlingFairyland/invite/select_friend_off.png


BIN
tasks/BondlingFairyland/invite/select_friend_on.png


BIN
tasks/BondlingFairyland/invite/select_kuaqu_off.png


BIN
tasks/BondlingFairyland/invite/select_kuaqu_on.png


+ 18 - 0
tasks/BondlingFairyland/ocr.json

@@ -43,5 +43,23 @@
     "method": "Default",
     "keyword": "",
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "friend",
+    "roiFront": "357,89,100,54",
+    "roiBack": "357,89,100,54",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "好友邀请"
+  },
+  {
+    "itemName": "kuaqu",
+    "roiFront": "472,88,100,54",
+    "roiBack": "472,88,100,54",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "跨区邀请"
   }
 ]

+ 1 - 1
tasks/BondlingFairyland/script_task.py

@@ -915,7 +915,7 @@ if __name__ == '__main__':
     from module.device.device import Device
     import cv2
 
-    config = Config('du')
+    config = Config('oas1')
     device = Device(config)
     task = ScriptTask(config, device)
     image = task.screenshot()