Parcourir la source

Merge remote-tracking branch 'origin/dev' into dev

ryland il y a 2 ans
Parent
commit
52839250b9
2 fichiers modifiés avec 5 ajouts et 4 suppressions
  1. 3 2
      tasks/Component/GeneralInvite/general_invite.py
  2. 2 2
      tasks/GameUi/game_ui.py

+ 3 - 2
tasks/Component/GeneralInvite/general_invite.py

@@ -180,12 +180,13 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         while 1:
             self.screenshot()
             if not self.is_in_room() and \
-                    not self.appear_then_click(self.I_GI_SURE, interval=0.5) and \
+                    not self.appear_then_click(self.I_GI_SURE, interval=0.8) and \
                     not self.appear(self.I_BACK_YELLOW):
                 break
             if self.appear_then_click(self.I_GI_SURE, interval=0.5):
                 continue
-            if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.5):
+            if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.8):
+                self.wait_until_appear(self.I_GI_SURE, wait_time=0.8)
                 continue
         return True
 

+ 2 - 2
tasks/GameUi/game_ui.py

@@ -130,6 +130,8 @@ class GameUi(BaseTask, GameUiAssets):
                 if self.ui_page_appear(page=page):
                     logger.attr("UI", page.name)
                     self.ui_current = page
+                    if page == page_main and self.ensure_scroll_open():
+                        self.ui_click_until_disappear(RestartAssets.I_LOGIN_SCROOLL_CLOSE)
                     return page
             # Try to close unknown page
             for close in self.ui_close:
@@ -146,8 +148,6 @@ class GameUi(BaseTask, GameUiAssets):
             minicap_check()
             rotation_check()
 
-        if self.ensure_scroll_open():
-            self.ui_click_until_disappear(RestartAssets.I_LOGIN_SCROOLL_CLOSE)
 
         # Unknown page, need manual switching
         logger.warning("Unknown ui page")