Просмотр исходного кода

Merge branch 'pr1673' into dev

neptine 4 месяцев назад
Родитель
Сommit
da133b2b36

+ 43 - 20
tasks/BondlingFairyland/general_invite.py

@@ -74,6 +74,11 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
                 logger.warning('Timeout, now is no room')
                 return False
 
+            if self.appear(self.I_INVITE_ENSURE) or self.appear(self.I_GI_CANCEL):
+                logger.warning('Invite page is still open, close it before checking room status')
+                self.close_invite_page()
+                continue
+
             if not self.is_in_room():
                 continue
 
@@ -100,6 +105,25 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
                     self.timer_invite.reset()
                 self.invite_friends(config)
 
+    def close_invite_page(self) -> bool:
+        """
+        Close the invite selector if it is still open, returning to the room page.
+        """
+        logger.info('Close invite page')
+        timer = Timer(3).start()
+        closed = False
+        while not timer.reached():
+            self.screenshot()
+            if not self.appear(self.I_INVITE_ENSURE) and not self.appear(self.I_GI_CANCEL):
+                return closed
+            if self.appear_then_click(self.I_GI_CANCEL, interval=0.8):
+                closed = True
+                continue
+            if self.appear_then_click(self.I_INVITE_ENSURE, interval=0.8):
+                closed = True
+                continue
+        return closed
+
     def ensure_enter(self) -> bool:
         """
         确认是否进入了组队界面
@@ -343,25 +367,26 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
             logger.info('Find recent friend')
             # 获取’最近‘在friend_class中的index
             if '最近' not in friend_class:
-                logger.warning('No recent friend')
-                return False
-            recent_index = friend_class.index('最近')
-            while recent_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
+                logger.warning('No recent friend, fallback to auto find')
+                find_mode = FindMode.AUTO_FIND
+            else:
+                recent_index = friend_class.index('最近')
+                while recent_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
 
-            logger.info(f'Now find friend in ”最近“')
-            sleep(1)
-            if not is_select:
-                if self.detect_select(name):
-                    is_select = True
-            sleep(1)
-            if not is_select:
-                if self.detect_select(name):
-                    is_select = True
+                logger.info(f'Now find friend in “最近”')
+                sleep(1)
+                if not is_select:
+                    if self.detect_select(name):
+                        is_select = True
+                sleep(1)
+                if not is_select:
+                    if self.detect_select(name):
+                        is_select = True
 
         for index in range(len(friend_class)):
             # 如果不是自动寻找,就跳过
@@ -472,5 +497,3 @@ if __name__ == '__main__':
     # t.run_invite(c.orochi.invite_config, is_first=True)
     t.screenshot()
     print(t.appear(t.I_FIRE, threshold=0.8))
-
-

+ 10 - 1
tasks/BondlingFairyland/script_task.py

@@ -113,7 +113,16 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                         continue
                     if self.appear(self.I_CREATE_TEAM, interval=1):
                         self.ensure_private()
-                        self.appear_then_click(self.I_CREATE_TEAM, interval=2)
+                        if self.appear_then_click(self.I_CREATE_TEAM, interval=2):
+                            logger.info('Wait up to 5s for bondling room after creating team')
+                            enter_timer = Timer(5).start()
+                            while not enter_timer.reached():
+                                self.screenshot()
+                                if self.appear(self.I_GI_IN_ROOM) or self.is_in_room(is_screenshot=False):
+                                    logger.info('Bondling room entered after creating team')
+                                    return True
+                                if self.appear(self.I_BALL_HELP) or self.appear(self.I_CREATE_TEAM):
+                                    break
                         continue
                     # 求援
                     if self.appear(self.I_BALL_AREA, interval=1):

+ 1 - 2
tasks/Component/GeneralInvite/assets.py

@@ -84,7 +84,7 @@ class GeneralInviteAssets:
 	# 勾选 默认邀请 
 	I_I_DEFAULT = RuleImage(roi_front=(541,342,41,39), roi_back=(541,342,41,39), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_default.png")
 	# description 
-	I_GI_CANCEL = RuleImage(roi_front=(438,407,171,55), roi_back=(438,407,171,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_cancel.png")
+	I_GI_CANCEL = RuleImage(roi_front=(438,407,171,55), roi_back=(438,407,171,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_cancel.png")
 	# 队长邀请 确定 
 	I_GI_SURE = RuleImage(roi_front=(670,402,175,60), roi_back=(670,402,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_sure.png")
 	# 所有的组队界面都有加成 
@@ -128,4 +128,3 @@ class GeneralInviteAssets:
 	# Ocr-description 
 	O_ONLINE = RuleOcr(roi=(790,102,124,42), area=(0,0,100,100), mode="Single", method="Default", keyword="", name="online")
 
-

+ 2 - 2
tasks/Component/GeneralInvite/gi/image.json

@@ -325,7 +325,7 @@
   },
   {
     "itemName": "gi_cancel",
-    "imageName": "gi_gi_cancel.png",
+    "imageName": "gi_cancel.png",
     "roiFront": "438,407,171,55",
     "roiBack": "438,407,171,55",
     "method": "Template matching",
@@ -377,4 +377,4 @@
     "threshold": 0.8,
     "description": "识别到寄养邀请"
   }
-]
+]

+ 2 - 2
tasks/GameUi/assets.py

@@ -88,8 +88,8 @@ class GameUiAssets:
 	I_CHECK_AREA_BOSS = RuleImage(roi_front=(20,320,150,130), roi_back=(20,320,150,130), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_area_boss.png")
 	# description 
 	I_CHECK_HEIAN_KITAN = RuleImage(roi_front=(27,48,47,39), roi_back=(27,48,47,39), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_heian_kitan.png")
-	# description 
-	I_CHECK_SIX_GATES = RuleImage(roi_front=(249,33,22,24), roi_back=(227,7,98,85), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_six_gates.png")
+	# 六道之门检查 
+	I_CHECK_SIX_GATES = RuleImage(roi_front=(411,297,21,21), roi_back=(395,262,54,85), threshold=0.85, method="Template matching", file="./tasks/GameUi/page/page_check_six_gates.png")
 	# description 
 	I_CHECK_BONDLING_FAIRYLAND = RuleImage(roi_front=(614,660,56,49), roi_back=(614,660,56,49), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_bondling_fairyland.png")
 	# description 

BIN
tasks/GameUi/page/page_check_six_gates.png


+ 4 - 4
tasks/GameUi/page/page_img.json

@@ -209,11 +209,11 @@
   {
     "itemName": "check_six_gates",
     "imageName": "page_check_six_gates.png",
-    "roiFront": "249,33,22,24",
-    "roiBack": "227,7,98,85",
+    "roiFront": "411,297,21,21",
+    "roiBack": "395,262,54,85",
     "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
+    "threshold": 0.85,
+    "description": "六道之门检查"
   },
   {
     "itemName": "check_bondling_fairyland",