Merge pull request #550 from LmeSzinc/dev

Bug fix

module/webui/updater.py

@@ -234,8 +234,8 @@ class Updater(DeployConfig, GitManager, PipManager):
                 self.event.clear()
                 ProcessManager.restart_processes(instances, self.event)
                 return
-            time.sleep(0.25)
-            if time.time() - start_time > 60 * 10:
+            time.sleep(5)
+            if time.time() - start_time > 60 * 20:
                 logger.warning("Waiting alas shutdown timeout, force kill")
                 for alas in _instances:
                     alas.stop()

tasks/character/assets/assets_character_switch.py

@@ -63,6 +63,26 @@ TrailblazerDestructionMale = ButtonWrapper(
         button=(1169, 156, 1187, 174),
     ),
 )
+TrailblazerHarmonyFemale = ButtonWrapper(
+    name='TrailblazerHarmonyFemale',
+    share=Button(
+        file='./assets/share/character/switch/TrailblazerHarmonyFemale.png',
+        area=(1174, 242, 1192, 260),
+        search=(1154, 222, 1212, 280),
+        color=(197, 165, 158),
+        button=(1174, 242, 1192, 260),
+    ),
+)
+TrailblazerHarmonyMale = ButtonWrapper(
+    name='TrailblazerHarmonyMale',
+    share=Button(
+        file='./assets/share/character/switch/TrailblazerHarmonyMale.png',
+        area=(1175, 321, 1193, 339),
+        search=(1155, 301, 1213, 359),
+        color=(181, 152, 147),
+        button=(1175, 321, 1193, 339),
+    ),
+)
 TrailblazerPreservationFemale = ButtonWrapper(
     name='TrailblazerPreservationFemale',
     share=Button(

tasks/character/keywords/__init__.py

@@ -30,6 +30,7 @@ DICT_SORTED_RANGES = {
         Qingque,
         # Slow bullet
         Robin,
+        TrailblazerHarmony,
     ],
     # Archer, but her parabolic trajectory has 0% accuracy on moving targets
     'ArcherSecondary': [

tasks/character/switch.py

@@ -22,6 +22,7 @@ class OcrCharacterName(OcrWhiteLetterOnComplexBackground):
         result = result.replace('蛆', '妲')
         # Dan Heng o.ImbibitorLunae
         result = re.sub(r'[0Oo\-. ]{1,3}Imbi', 'Imbi', result)
+        result = result.replace('舟恒', '丹恒')
 
         result = re.sub(r'院.?梅', '阮•梅', result)
 
@@ -98,6 +99,10 @@ class CharacterSwitch(UI):
                 TrailblazerPreservationFemale,
 
             ],
+            KEYWORDS_CHARACTER_LIST.TrailblazerHarmony: [
+                TrailblazerHarmonyMale,
+                TrailblazerHarmonyFemale,
+            ],
             KEYWORDS_CHARACTER_LIST.Huohuo: [Huohuo],
             KEYWORDS_CHARACTER_LIST.FuXuan: [FuXuan],
         }

tasks/rogue/entry/entry.py

@@ -202,6 +202,9 @@ class RogueEntry(RouteBase, RogueRewardHandler, RoguePathHandler, DungeonRogueUI
             if self.handle_ui_close(LEVEL_CONFIRM, interval=2):
                 interval.clear()
                 continue
+            if self.handle_ui_close(ROGUE_LAUNCH, interval=2):
+                interval.clear()
+                continue
 
             if self.is_page_rogue_main() \
                     and self.image_color_count(OCR_WORLD, color=(255, 255, 255), threshold=221, count=50):

tasks/rogue/rogue.py

@@ -1,4 +1,4 @@
-from module.exception import ScriptError
+from module.exception import RequestHumanTakeover
 from module.logger import logger
 from tasks.battle_pass.keywords import KEYWORDS_BATTLE_PASS_QUEST
 from tasks.daily.keywords import KEYWORDS_DAILY_QUEST
@@ -21,7 +21,7 @@ class Rogue(RouteLoader, RogueEntry):
         except RogueTeamNotPrepared:
             logger.error(f'Please prepare your team in {self.config.RogueWorld_World} '
                          f'and start rogue task at team preparation page')
-            raise ScriptError
+            raise RequestHumanTakeover
         except RogueReachedWeeklyPointLimit:
             logger.hr('Reached rogue weekly point limit')
             return False