Преглед изворни кода

Merge pull request #617 from ljxun/dev

契灵组队实现,队长队员切换(按次数的一半)身份必选handoff1和handoff2
huangrunheng пре 1 година
родитељ
комит
2efa9bc2e7

+ 16 - 6
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,12 +55,7 @@ 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_INVITE_ENSURE = RuleImage(roi_front=(500,541,132,60), roi_back=(478,523,378,92), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/gi_invite_ensure.png")
-	# 判断是否点中好友了 
-	I_SELECTED = RuleImage(roi_front=(895,373,33,32), roi_back=(380,157,568,350), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/gi_selected.png")
-	# 用来判断当前的列表是哪儿的 
-	I_FLAG_1_ON = RuleImage(roi_front=(373,127,22,21), roi_back=(3373,127,22,21), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/ball/gi_flag_1_on.png")
+
 
 
 	# Image Rule Assets
@@ -124,6 +123,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 - 27
tasks/BondlingFairyland/ball/image.json

@@ -52,32 +52,5 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "契灵创建队伍"
-  },
-  {
-    "itemName": "invite_ensure",
-    "imageName": "gi_invite_ensure.png",
-    "roiFront": "500,541,132,60",
-    "roiBack": "478,523,378,92",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "点击邀请"
-  },
-  {
-    "itemName": "selected",
-    "imageName": "gi_selected.png",
-    "roiFront": "895,373,33,32",
-    "roiBack": "380,157,568,350",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "判断是否点中好友了"
-  },
-  {
-    "itemName": "flag_1_on",
-    "imageName": "gi_flag_1_on.png",
-    "roiFront": "373,127,22,21",
-    "roiBack": "3373,127,22,21",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "用来判断当前的列表是哪儿的"
   }
 ]

+ 2 - 0
tasks/BondlingFairyland/config.py

@@ -34,6 +34,8 @@ class UserStatus(str, Enum):
     LEADER = 'leader'
     MEMBER = 'member'
     ALONE = 'alone'
+    handoff1 = 'handoff1'
+    handoff2 = 'handoff2'
     # WILD = 'wild'  # 还不打算实现
 class BondlingConfig(ConfigBase):
     # 身份

+ 12 - 28
tasks/BondlingFairyland/general_invite.py

@@ -45,7 +45,7 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
 
     """
 
-    def run_invite(self, config: InviteConfig, is_first: bool = False) -> bool:
+    def run_invite(self, config: InviteConfig, is_first: bool = False, is_over: bool = True) -> bool:
         """
         队长!!身份。。。在组队界面邀请好友( 如果开启is_first) 等待队员进入开启挑战
         请注意,返回的时候成功时是进入战斗了!!!
@@ -120,8 +120,11 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
 
             # 点击挑战
             if fire:
-                self.click_fire()
-                return True
+                if is_over:
+                    self.click_fire()
+                    return True
+                else:
+                    return True
 
             if self.timer_invite and self.timer_invite.reached():
                 if is_first:
@@ -351,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] = '寮友'
@@ -412,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": "跨区邀请"
   }
 ]

+ 38 - 19
tasks/BondlingFairyland/script_task.py

@@ -70,6 +70,17 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         self.current_count = 0
         self.limit_count: int = limit_count
 
+        if UserStatus.handoff1 == cong.bondling_config.user_status:
+            self.limit_count: int = limit_count//2
+            self.switch_ball()
+        if UserStatus.handoff2 == cong.bondling_config.user_status:
+            self.limit_count: int = limit_count//2
+            self.run_member()
+            self.current_count = 0
+            self.ui_get_current_page()
+            self.ui_goto(page_bondling_fairyland)
+            self.switch_ball()
+
         match cong.bondling_config.user_status:
             case UserStatus.LEADER:
                 self.switch_ball()
@@ -106,7 +117,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             #     logger.info('Orochi count limit out')
             #     break
             if datetime.now() - self.start_time >= self.limit_time:
-                logger.info('Orochi time limit out')
+                logger.info('BondlingFairyland time limit out')
                 break
 
             if self.check_then_accept():
@@ -138,15 +149,13 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             # 如果还在战斗中,就退出战斗
             if self.exit_battle():
                 pass
-
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
-
-        if success:
+                # 引用配置
+        if UserStatus.MEMBER == self.config.bondling_fairyland.bondling_config.user_status:
+            self.ui_get_current_page()
+            self.ui_goto(page_main)
             self.set_next_run(task='BondlingFairyland', finish=True, success=True)
-        else:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=False)
-        raise TaskEnd
+            raise TaskEnd
+
 
     def switch_ball(self):
         cong = self.config.bondling_fairyland
@@ -212,13 +221,10 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
         self.ui_get_current_page()
         self.ui_goto(page_main)
-
-        if success:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=True)
-        else:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=False)
+        self.set_next_run(task='BondlingFairyland', finish=True, success=True)
         raise TaskEnd
 
+
     def run_stone(self, bondling_stone_enable: bool, bondling_stone_class: BondlingClass):
         """
         使用结契石 进行召唤 契灵
@@ -384,6 +390,12 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 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):
@@ -682,6 +694,10 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
             if self.current_count >= self.limit_count:
                 if self.appear(self.I_GI_IN_ROOM):
+                    # 次数达到也要邀请好友进房间,然后退出,不然队员无法判断是否完成契灵,出现异常
+                    self.run_invite(config=self.config.bondling_fairyland.invite_config, is_over=False)
+                    # 等待三秒让队员进房间,避免队员没进房间出现异常
+                    sleep(3)
                     logger.info('bondling_fairyland count limit out')
                     break
 
@@ -722,12 +738,14 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             pass
 
         self.ui_get_current_page()
+        self.ui_goto(page_bondling_fairyland)
+        # 引用配置
+        if UserStatus.handoff1 == self.config.bondling_fairyland.bondling_config.user_status:
+            self.current_count = 0
+            self.run_member()
+        self.ui_get_current_page()
         self.ui_goto(page_main)
-
-        if success:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=True)
-        else:
-            self.set_next_run(task='BondlingFairyland', finish=True, success=False)
+        self.set_next_run(task='BondlingFairyland', finish=True, success=True)
         raise TaskEnd
 
     def wait_battle(self, wait_time: time) -> bool:
@@ -865,6 +883,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 break
 
             if self.is_in_room():
+                logger.info("进入到组队房间!is_in_room")
                 return True
             # 被秒开
             # https://github.com/runhey/OnmyojiAutoScript/issues/230