Add: war_archives_20220818_cn and war_archives_20230803_cn

to avoid collision with REWARD_*_WHITE and misclicking

.github/pull.yml

@@ -1,8 +0,0 @@
-version: "1"
-rules:
-  - base: master
-    upstream: LmeSzinc:master
-    mergeMethod: merge
-    mergeUnstable: true
-label: ":arrow_heading_down: pull"
-conflictLabel: "merge-conflict": true

.github/workflows/main.yml

@@ -1,33 +0,0 @@
-name: Upstream Sync
-
-permissions:
-    contents: write
-
-on:
-    schedule:
-        - cron: "0 * * * *"
-    workflow_dispatch:
-
-jobs:
-    sync_with_upstream:
-        name: Sync with Upstream
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout target repo
-              uses: actions/checkout@v3
-
-            - name: Sync Upstream
-              uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
-              with:
-                  target_repo_token: ${{ secrets.GITHUB_TOKEN }}
-                  upstream_sync_repo: LmeSzinc/AzurLaneAutoScript
-                  upstream_sync_branch: master
-                  target_sync_branch: master
-                  test_mode: false
-
-            - name: Check for Failure
-              if: failure()
-              run: |
-                  echo "[Error] Due to a change in the workflow file of the upstream repository, GitHub has automatically suspended the scheduled automatic update. You need to manually sync your fork."
-                  exit 1

README.md

@@ -177,3 +177,4 @@ Alas 仍在活跃开发中，我们会不定期发布未来的工作在 [Issues]
 - QQ 八群：[938081688](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=3h8Gl323WkIt6yGx8Jx5Ht93puZxeA8T&authKey=xPT6kPm7W9jWO2TNzPdohJ27l1njxorwKmkDrbwwYGGA6Oni1xQSJhHsRIJ8w7GZ&noverify=0&group_code=938081688)
 - QQ 一群：[1087735381](https://jq.qq.com/?_wv=1027&k=I4NSqX7g) （有开发意向请加一群，入群需要提供你的Github用户名）
 - Bilibili 直播间：https://live.bilibili.com/22216705 ，偶尔直播写Alas，~~为了拯救Alas，Lme决定出道成为偶像~~
+

alas.py

@@ -14,8 +14,6 @@ from module.exception import *
 from module.logger import logger
 from module.notify import handle_notify
 
-RESTART_SENSITIVE_TASKS = ['OpsiObscure', 'OpsiAbyssal', 'OpsiCrossMonth']
-
 
 class AzurLaneAutoScript:
     stop_event: threading.Event = None
@@ -50,9 +48,6 @@ class AzurLaneAutoScript:
         except RequestHumanTakeover:
             logger.critical('Request human takeover')
             exit(1)
-        except EmulatorNotRunningError:
-            logger.critical('EmulatorNotRunningError')
-            exit(1)
         except Exception as e:
             logger.exception(e)
             exit(1)
@@ -101,10 +96,12 @@ class AzurLaneAutoScript:
             if self.checker.is_available():
                 logger.critical('Game page unknown')
                 self.save_error_log()
-                logger.warning('Restart to reset Game page in 10 seconds')
+                handle_notify(
-                self.config.task_call('Restart')
+                    self.config.Error_OnePushConfig,
-                self.device.sleep(10)
+                    title=f"Alas <{self.config_name}> crashed",
-                return False
+                    content=f"<{self.config_name}> GamePageUnknownError",
+                )
+                exit(1)
             else:
                 self.checker.wait_until_available()
                 return False
@@ -244,10 +241,6 @@ class AzurLaneAutoScript:
         from module.private_quarters.private_quarters import PrivateQuarters
         PrivateQuarters(config=self.config, device=self.device).run()
 
-    def island(self):
-        from module.island.island import Island
-        Island(config=self.config, device=self.device).run()
-
     def daily(self):
         from module.daily.daily import Daily
         Daily(config=self.config, device=self.device).run()
@@ -386,10 +379,6 @@ class AzurLaneAutoScript:
         from module.event_hospital.hospital import Hospital
         Hospital(config=self.config, device=self.device).run()
 
-    def hospital_event(self):
-        from module.event_hospital.hospital_event import HospitalEvent
-        HospitalEvent(config=self.config, device=self.device).run()
-
     def coalition(self):
         from module.coalition.coalition import Coalition
         Coalition(config=self.config, device=self.device).run()
@@ -430,14 +419,6 @@ class AzurLaneAutoScript:
         from module.eventstory.eventstory import EventStory
         EventStory(config=self.config, device=self.device, task="EventStory").run()
 
-    def box_disassemble(self):
-        from module.storage.box_disassemble import StorageBox
-        StorageBox(config=self.config, device=self.device, task="BoxDisassemble").run()
-
-    def island_pearl(self):
-        from module.island.pearl_daemon import IslandPearl
-        IslandPearl(config=self.config, device=self.device, task="IslandPearl").run()
-
     def azur_lane_uncensored(self):
         from module.daemon.uncensored import AzurLaneUncensored
         AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run()
@@ -560,12 +541,8 @@ class AzurLaneAutoScript:
             _ = self.device
             self.device.config = self.config
             # Skip first restart
-            if task == 'Restart':
+            if self.is_first_task and task == 'Restart':
-                if self.is_first_task:
+                logger.info('Skip task `Restart` at scheduler start')
-                    logger.info('Skip task `Restart` at scheduler start')
-                else:
-                    from module.handler.login import LoginHandler
-                    LoginHandler(self.config, self.device).app_restart()
                 self.config.task_delay(server_update=True)
                 del_cached_property(self, 'config')
                 continue
@@ -583,21 +560,17 @@ class AzurLaneAutoScript:
             failed = deep_get(self.failure_record, keys=task, default=0)
             failed = 0 if success else failed + 1
             deep_set(self.failure_record, keys=task, value=failed)
-            if failed >= 3 or (self.config.Error_StrictRestart and failed >= 1 and task in RESTART_SENSITIVE_TASKS):
+            if failed >= 3:
-                logger.critical(f"Task `{task}` failed {failed} or more times.")
+                logger.critical(f"Task `{task}` failed 3 or more times.")
                 logger.critical("Possible reason #1: You haven't used it correctly. "
                                 "Please read the help text of the options.")
                 logger.critical("Possible reason #2: There is a problem with this task. "
                                 "Please contact developers or try to fix it yourself.")
-                if self.config.Error_StrictRestart and task in RESTART_SENSITIVE_TASKS:
-                    logger.critical("Possible reason #3: This is a restart sensitive task. "
-                                    "Please take over the game manually or turn off 'StrictRestart' option.")
                 logger.critical('Request human takeover')
-
                 handle_notify(
                     self.config.Error_OnePushConfig,
                     title=f"Alas <{self.config_name}> crashed",
-                    content=f"<{self.config_name}> RequestHumanTakeover\nTask `{task}` failed {failed} or more times.",
+                    content=f"<{self.config_name}> RequestHumanTakeover\nTask `{task}` failed 3 or more times.",
                 )
                 exit(1)