Merge 850eee7783 into 2cad7ebbac

module/alas.py

@@ -368,9 +368,7 @@ class AzurLaneAutoScript:
             return
         try:
             from module.device.platform.platform_windows import PlatformWindows
-            from deploy.Windows.alas import AlasManager
             PlatformWindows(self.config).kill_process_by_regex("aas\.exe")
-            AlasManager().alas_kill()
         except:
             logger.error("Failed to stop AAS. It may be due to a lack of administrator privileges.")        
 

module/device/device.py

@@ -186,6 +186,3 @@ class Device(Screenshot, Control, AppControl, Platform):
         super().app_stop()
         self.stuck_record_clear()
         self.click_record_clear()
-
-    def back(self):
-        self.adb_shell("input keyevent 4")

tasks/base/ui.py

@@ -1,12 +1,11 @@
 from module.base.button import ButtonWrapper
-from module.base.decorator import run_once, Config
+from module.base.decorator import run_once
 from module.base.timer import Timer
-from module.exception import GameNotRunningError, GamePageUnknownError, RequestHumanTakeover
+from module.exception import GameNotRunningError, GamePageUnknownError
 from module.logger import logger
-from module.ocr.ocr import Ocr, Digit
+from module.ocr.ocr import Ocr
 from tasks.base.main_page import MainPage
 from tasks.base.page import Page, page_main
-from tasks.login.assets.assets_login import LOGIN_LOADING, OCR_YEAR
 from tasks.base.assets.assets_base_page import BACK
 
 
@@ -14,16 +13,6 @@ class UI(MainPage):
     ui_current: Page
     ui_main_confirm_timer = Timer(0.2, count=2)
 
-    @Config.when(Emulator_GameLanguage='zhs')
-    def appear_trademark_year(self):
-        ocr_year = Digit(OCR_YEAR).ocr_single_line(self.device.image)
-        return ocr_year == 2023
-
-    @Config.when(Emulator_GameLanguage=None)
-    def appear_trademark_year(self):
-        ocr_year = Digit(OCR_YEAR).ocr_single_line(self.device.image)
-        return ocr_year == 2021
-    
     def ui_page_appear(self, page):
         """
         Args:
@@ -61,7 +50,6 @@ class UI(MainPage):
 
         timeout = Timer(10, count=20).start()
         back_timer = Timer(0.5, count=2)
-        u2_back = True
         while 1:
             if skip_first_screenshot:
                 skip_first_screenshot = False
@@ -90,19 +78,8 @@ class UI(MainPage):
                 timeout.reset()
                 continue
             if back_timer.reached_and_reset():
-                # this might be bad but it works
-                if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year():
-                    from tasks.login.login import Login
-                    Login(self.config, self.device).handle_app_login()
-                    timeout.reset()
-                    continue
                 logger.info("Unknown page, try to back")
-                if u2_back:
+                self.device.click(BACK)
-                    self.device.back()
-                    u2_back = False
-                else:
-                    self.device.click(BACK)
-                    u2_back = True
 
             app_check()
             minicap_check()
@@ -130,7 +107,7 @@ class UI(MainPage):
         self.interval_clear(list(Page.iter_check_buttons()))
 
         # loading_timer = Timer(0.5)
-        back_timer = Timer(10, 10)
+
         logger.hr(f"UI goto {destination}")
         while 1:
             if skip_first_screenshot:
@@ -149,7 +126,6 @@ class UI(MainPage):
             # Destination page
             if self.ui_page_appear(destination):
                 logger.info(f'Page arrive: {destination}')
-                self.close_popup(destination.check_button)
                 if self.ui_page_confirm(destination):
                     logger.info(f'Page arrive confirm {destination}')
                 break
@@ -161,7 +137,6 @@ class UI(MainPage):
                     continue
                 if self.appear(page.check_button, interval=5):
                     logger.info(f'Page switch: {page} -> {page.parent}')
-                    self.close_popup(page.check_button)
                     # self.handle_lang_check(page)
                     if self.ui_page_confirm(page):
                         logger.info(f'Page arrive confirm {page}')
@@ -177,15 +152,6 @@ class UI(MainPage):
             if self.ui_additional():
                 continue
 
-            back_timer.start()
-            if back_timer.reached_and_reset():
-                if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year():
-                    from tasks.login.login import Login
-                    Login(self.config, self.device).handle_app_login()
-                    continue
-                self.device.back()
-                logger.info("Unknown page, try to back")
-
         # Reset connection
         Page.clear_connection()
 
@@ -210,7 +176,6 @@ class UI(MainPage):
 
         if self.ui_current == destination:
             logger.info("Already at %s" % destination)
-            self.close_popup(destination.check_button)
             return False
         else:
             logger.info("Goto %s" % destination)
@@ -434,18 +399,3 @@ class UI(MainPage):
             button (Button):
         """
         pass
-
-    def close_popup(self, check_button):
-        if not self.match_color(check_button):
-            timer = Timer(5, 5).start()
-            wait = Timer(1).start()
-            while 1:
-                self.device.screenshot()
-                if self.match_color(check_button) or not self.appear(check_button):
-                    break
-                self.device.back()
-                if timer.reached():
-                    logger.error("Failed to close popup")
-                    raise RequestHumanTakeover
-                while not wait.reached():
-                    pass    

tasks/login/assets/assets_login.py

@@ -51,24 +51,6 @@ LOGIN_LOADING = ButtonWrapper(
         button=(34, 682, 60, 707),
     ),
 )
-OCR_YEAR = ButtonWrapper(
-    name='OCR_YEAR',
-    jp=None,
-    en=Button(
-        file='./assets/en/login/OCR_YEAR.png',
-        area=(377, 689, 414, 701),
-        search=(357, 669, 434, 720),
-        color=(160, 157, 158),
-        button=(377, 689, 414, 701),
-    ),
-    zht=Button(
-        file='./assets/zht/login/OCR_YEAR.png',
-        area=(377, 689, 414, 701),
-        search=(357, 669, 434, 720),
-        color=(160, 157, 158),
-        button=(377, 689, 414, 701),
-    ),
-)
 SURVEY = ButtonWrapper(
     name='SURVEY',
     jp=None,

tasks/login/login.py

@@ -1,9 +1,11 @@
 from module.base.timer import Timer
+from module.base.decorator import Config
 from module.exception import GameNotRunningError
 from module.logger import logger
 from tasks.base.page import page_main
 from tasks.base.ui import UI
-from tasks.login.assets.assets_login import LOGIN_CONFIRM, LOGIN_LOADING, UPDATE
+from tasks.login.assets.assets_login import LOGIN_CONFIRM, LOGIN_LOADING, UPDATE, SURVEY
+from tasks.base.assets.assets_base_page import MAIN_GO_TO_MAIL
 
 
 class Login(UI):
@@ -29,11 +31,20 @@ class Login(UI):
                             return True
                         return False
 
+        @Config.when(Emulator_GameLanguage='en')
+        def _handle_survey(self):
+            if self.appear_then_click(SURVEY):
+                return True
+            return False
+
+        @Config.when(Emulator_GameLanguage=None)
+        def _handle_survey(self):
+            pass
+
         logger.hr('App login')
         orientation_timer = Timer(5)
         startup_timer = Timer(5).start()
         app_timer = Timer(5).start()
-        back_timer = Timer(2).start()
         login_success = False
 
         while 1:
@@ -62,11 +73,10 @@ class Login(UI):
                     break
 
             # Watch resource downloading and loading
-            loading = False
             if self.match_color(LOGIN_LOADING, interval=5, threshold=45):
                 logger.info('Game resources downloading or loading')
                 self.device.stuck_record_clear()
-                loading = True
+
             # Login
             if self.appear_then_click(LOGIN_CONFIRM):
                 login_success = True
@@ -80,10 +90,14 @@ class Login(UI):
             #     continue
             if self.appear_then_click(UPDATE):
                 continue
+            if _handle_survey(self):
+                continue
             if self.ui_additional():
                 continue
-            if not loading and back_timer.reached_and_reset() and not self.appear_trademark_year():
+            # press emulator back button when random popup in main
-                self.device.back()
+            if self.appear(MAIN_GO_TO_MAIL) and not self.match_color(MAIN_GO_TO_MAIL):
+                self.device.u2.press("back")
+                continue
 
         return True
 

tasks/schedule/schedule.py

@@ -114,7 +114,6 @@ class Schedule(ScheduleUI):
     def run(self):
         self.ui_ensure(page_schedule)
         self.task = self.valid_task
-        self.set_clickx()
         action_timer = Timer(0.5, 1)
         status = ScheduleStatus.OCR
 

tasks/schedule/ui.py

@@ -1,5 +1,4 @@
 from module.base.timer import Timer
-from module.base.decorator import Config
 from module.logger import logger
 from module.ocr.ocr import DigitCounter
 from tasks.base.ui import UI
@@ -8,19 +7,12 @@ from tasks.schedule.assets.assets_schedule import *
 from tasks.schedule.scroll_select import ScrollSelect
 import numpy as np
 
+
 SCROLL_SELECT = ScrollSelect(window_button=SCROLL, first_item_button=FIRST_ITEM, expected_button=LOCATIONS, clickx=1116)
 xs = np.linspace(299, 995, 3, dtype=int)
 ys = np.linspace(268, 573, 3, dtype=int)
 
 class ScheduleUI(UI):
-    @Config.when(Emulator_GameLanguage='jp')
-    def set_clickx(self):
-        SCROLL_SELECT.clickx = 1114
-
-    @Config.when(Emulator_GameLanguage=None)
-    def set_clickx(self):
-        pass
-    
     def select_then_check(self, dest_enter: ButtonWrapper, dest_check: ButtonWrapper):
         timer = Timer(8, 10).start()
         while 1:

tasks/tactical_challenge/tactical_challenge.py

@@ -33,10 +33,10 @@ class TacticalChallenge(TacticalChallengeUI):
         return self.config.stored.TacticalChallengeTicket.value
 
     def _player_select(self, select):
-        if not select:
+        if select:
             return random.choice(self.select_players)
         else:
-            return self.select_players[select-1]
+            return self.select_players[select]
 
     def _handle_challenge(self, status):
         match status: