Răsfoiți Sursa

fix: 队友加离队识别

doge 3 luni în urmă
părinte
comite
bba5d25ad9

+ 1 - 3
tasks/Exploration/assets.py

@@ -110,7 +110,7 @@ class ExplorationAssets:
 	# description 
 	I_E_EXIT_CONFIRM = RuleImage(roi_front=(694,380,163,49), roi_back=(694,380,163,49), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_e_exit_confirm.png")
 	# 宝箱 
-	I_TREASURE_BOX_CLICK = RuleImage(roi_front=(31,537,39,29), roi_back=(11,520,378,65), threshold=0.65, method="Template matching", file="./tasks/Exploration/res/res_treasure_box_click.png")
+	I_TREASURE_BOX_CLICK = RuleImage(roi_front=(31,543,27,24), roi_back=(11,520,378,65), threshold=0.65, method="Template matching", file="./tasks/Exploration/res/res_treasure_box_click.png")
 	# 困28滚动到最后 
 	I_SWIPE_END = RuleImage(roi_front=(994,234,119,100), roi_back=(968,196,311,165), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_swipe_end.png")
 	# 队伍的表情标志 
@@ -123,8 +123,6 @@ class ExplorationAssets:
 	I_EXP_ARROW_RIGHT = RuleImage(roi_front=(1240,117,24,21), roi_back=(1178,74,100,100), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_arrow_right.png")
 	# 箭头,打开 
 	I_EXP_ARROW_LEFT = RuleImage(roi_front=(1244,115,18,26), roi_back=(1178,78,100,100), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_arrow_left.png")
-	# 組隊時隊長是否在副本内 
-	I_EXP_LEADER = RuleImage(roi_front=(119,299,17,21), roi_back=(1,105,162,248), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_leader.png")
 
 
 	# Long Click Rule Assets

+ 1 - 10
tasks/Exploration/res/image.json

@@ -173,7 +173,7 @@
   {
     "itemName": "treasure_box_click",
     "imageName": "res_treasure_box_click.png",
-    "roiFront": "31,537,39,29",
+    "roiFront": "31,543,27,24",
     "roiBack": "11,520,378,65",
     "method": "Template matching",
     "threshold": 0.65,
@@ -232,14 +232,5 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "箭头,打开"
-  },
-  {
-    "itemName": "exp_leader",
-    "imageName": "res_exp_leader.png",
-    "roiFront": "119,299,17,21",
-    "roiBack": "1,105,162,248",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "組隊時隊長是否在副本内"
   }
 ]

BIN
tasks/Exploration/res/res_treasure_box_click.png


+ 43 - 43
tasks/Exploration/solo.py

@@ -15,6 +15,8 @@ from tasks.Exploration.config import ChooseRarity, AutoRotate, UserStatus, Explo
 class SoloExploration(BaseExploration):
     INVITE_FLAG_OFF = (157, 109, 83)
     INVITE_FLAG_ON = (227, 193, 153)
+    INVITE_TIMEOUT = 20
+    FRIEND_LEAVE_TIMEOUT = 10
     explore_init = False
 
     @cached_property
@@ -41,6 +43,25 @@ class SoloExploration(BaseExploration):
         finally:
             self.I_TREASURE_BOX_CLICK.roi_back = original_roi_back
 
+    def _check_mate_leave(self, friend_leave_timer: Timer):
+        if not self.appear(self.I_TEAM_EMOJI):
+            logger.warning('Team emoji not appear')
+            if not friend_leave_timer.started():
+                logger.warning('Mate leave, start timer')
+                friend_leave_timer = Timer(self.FRIEND_LEAVE_TIMEOUT)
+                friend_leave_timer.start()
+            elif friend_leave_timer.reached():
+                logger.warning('Mate leave timer reached')
+                logger.warning('Exit team')
+                self.quit_explore()
+                return friend_leave_timer, True
+        else:
+            # 再次出现则重新计时,进入对局标志消失
+            if friend_leave_timer.started():
+                logger.warning('Team emoji appear again, clear friend_leave_timer')
+            friend_leave_timer = Timer(self.FRIEND_LEAVE_TIMEOUT)
+        return friend_leave_timer, False
+
     def run_solo(self):
         logger.hr('solo')
         search_fail_cnt = 0
@@ -79,7 +100,7 @@ class SoloExploration(BaseExploration):
                     self.ui_click(self.I_E_AUTO_ROTATE_OFF, stop=self.I_E_AUTO_ROTATE_ON)
                     self.explore_init = True
                     continue
-                if self._handle_treasure_box(roi_back=(5, 520, 325, 70)):
+                if self._handle_treasure_box():
                     continue
                 # 小纸人
                 if self.appear(self.I_BATTLE_REWARD):
@@ -131,7 +152,7 @@ class SoloExploration(BaseExploration):
         logger.hr('leader')
         search_fail_cnt = 0
         swipe_unchanged_cnt = 0
-        friend_leave_timer = Timer(10)
+        friend_leave_timer = Timer(self.FRIEND_LEAVE_TIMEOUT)
 
         while 1:
             self.screenshot()
@@ -143,22 +164,6 @@ class SoloExploration(BaseExploration):
                 # 打开右边箭头
                 if not self.wait_world_stable():
                     continue
-                # if self.appear(self.I_TREASURE_BOX_CLICK):
-                #     # 宝箱
-                #     logger.info('Treasure box appear, get it.')
-                #     self.wait_until_stable(self.I_UI_CANCEL, timer=Timer(0.6, 1))
-                #     while 1:
-                #         self.screenshot()
-                #         if self.appear(self.I_REWARD):
-                #             self.ui_click_until_disappear(self.I_REWARD)
-                #             logger.info('Get reward.')
-                #             break
-                #         if self.ui_reward_appear_click():
-                #             continue
-                #         if self.appear_then_click(self.I_UI_CANCEL, interval=0.8):
-                #             continue
-                #         if self.appear_then_click(self.I_TREASURE_BOX_CLICK, interval=1):
-                #             continue
                 if self.check_exit():
                     self.wait_until_stable(self.I_UI_CANCEL, timer=Timer(0.6, 2))
                     if self.appear(self.I_UI_CANCEL):
@@ -183,10 +188,11 @@ class SoloExploration(BaseExploration):
                         continue
                     if self.appear_then_click(self.I_ENSURE_PRIVATE_FALSE_2, interval=0.5):
                         continue
-                    if self.appear_then_click(self.I_EXP_CREATE_TEAM, interval=1):
-                        continue
+                    # 创建在组队前,组队蒙层后概率会被误识别
                     if self.appear_then_click(self.I_EXP_CREATE_ENSURE, interval=2):
                         continue
+                    if self.appear_then_click(self.I_EXP_CREATE_TEAM, interval=1):
+                        continue
             #
             elif scene == Scene.TEAM:
                 self.wait_until_stable(self.I_ADD_2, timer=Timer(0.8, 1))
@@ -214,27 +220,22 @@ class SoloExploration(BaseExploration):
                     if self._config.exploration_config.auto_rotate == AutoRotate.yes:
                         self.enter_settings_and_do_operations()
                     self.ui_click(self.I_E_AUTO_ROTATE_OFF, stop=self.I_E_AUTO_ROTATE_ON)
-                    friend_leave_timer = Timer(10)
+                    friend_leave_timer = Timer(self.FRIEND_LEAVE_TIMEOUT)
                     self.explore_init = True
                     continue
+                if self._handle_treasure_box():
+                    continue
                 # 小纸人
                 if self.appear(self.I_BATTLE_REWARD):
                     if self.ui_get_reward(self.I_BATTLE_REWARD):
                         continue
                 # 中途有人跑路
                 if not self.appear(self.I_TEAM_EMOJI):
-                    if not friend_leave_timer.started():
-                        logger.warning('Mate leave, start timer')
-                        friend_leave_timer = Timer(10)
-                        friend_leave_timer.start()
-                    elif friend_leave_timer.started() and friend_leave_timer.reached():
-                        logger.warning('Mate leave timer reached')
-                        logger.warning('Exit team')
-                        self.quit_explore()
+                    friend_leave_timer, mate_left = self._check_mate_leave(friend_leave_timer)
+                    if mate_left:
                         continue
                 else:
-                    logger.warning('Team emoji appear again, clear friend_leave_timer')
-                    friend_leave_timer = Timer(10)
+                    friend_leave_timer, _ = self._check_mate_leave(friend_leave_timer)
                 # boss
                 if self.appear(self.I_BOSS_BATTLE_BUTTON):
                     if self.fire(self.I_BOSS_BATTLE_BUTTON):
@@ -281,7 +282,7 @@ class SoloExploration(BaseExploration):
     def run_member(self):
         logger.hr('member')
         wait_timer = Timer(50)
-        friend_leave_timer = Timer(10)
+        friend_leave_timer = Timer(self.FRIEND_LEAVE_TIMEOUT)
 
         while 1:
             self.screenshot()
@@ -319,27 +320,21 @@ class SoloExploration(BaseExploration):
                     self.ui_click(self.I_E_AUTO_ROTATE_OFF, stop=self.I_E_AUTO_ROTATE_ON)
                     self.explore_init = True
                     continue
+                if self._handle_treasure_box():
+                    continue
                 # 小纸人
                 if self.appear(self.I_BATTLE_REWARD):
                     if self.ui_get_reward(self.I_BATTLE_REWARD):
                         continue
                 #
                 if not self.appear(self.I_TEAM_EMOJI):
-                    logger.warning('Team emoji not appear')
-                    if not friend_leave_timer.started():
-                        logger.warning('Mate leave, start timer')
-                        friend_leave_timer = Timer(10)
-                        friend_leave_timer.start()
-                    elif friend_leave_timer.started() and friend_leave_timer.reached():
-                        logger.warning('Mate leave timer reached')
-                        logger.warning('Exit team')
-                        self.quit_explore()
+                    friend_leave_timer, mate_left = self._check_mate_leave(friend_leave_timer)
+                    if mate_left:
                         wait_timer = Timer(50)
                         wait_timer.start()
                         continue
                 else:
-                    logger.warning('Team emoji appear again, clear friend_leave_timer')
-                    friend_leave_timer = Timer(10)
+                    friend_leave_timer, _ = self._check_mate_leave(friend_leave_timer)
             #
             elif scene == Scene.BATTLE_PREPARE or scene == Scene.BATTLE_FIGHTING:
                 logger.info('[run_member] Handling scene: BATTLE')
@@ -360,6 +355,11 @@ class SoloExploration(BaseExploration):
                 continue
             if self.appear_then_click(self.I_ADD_5_4, interval=1):
                 continue
+            # 避免中途队友进来邀请死循环
+            if not self.appear(self.I_ADD_2) or not self.appear(self.I_ADD_2):
+                # 可能刚好点到人,点一下空地方
+                self.device.click(x=370, y=480, control_name='exploration_invite_friend_prevent')
+                return True
 
         friend_class = []
         class_ocr = [self.O_F_LIST_1, self.O_F_LIST_2, self.O_F_LIST_3, self.O_F_LIST_4]