Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

module/coalition/combat.py

@@ -36,6 +36,8 @@ class CoalitionCombat(CoalitionUI, CampaignBase):
                 # About (+53, +3)
                 continue
             if self.appear_then_click(COALITION_REWARD_CONFIRM, offset=(20, 20), interval=2):
+                # Stop clicking BATTLE_STATUS because combat ends
+                status_clicked = False
                 continue
             if self.handle_battle_status():
                 status_clicked = True

submodule/AlasMaaBridge/module/asst/utils.py

@@ -10,7 +10,14 @@ class InstanceOptionType(IntEnum):
     # 自动战斗、肉鸽、保全 是否使用 暂停下干员， "0" | "1"
     deployment_with_pause = 3
     # 是否使用 AdbLite， "0" | "1"
-    adb_lite_enabled = 4
+    adblite_enabled = 4
+    kill_on_adb_exit = 5
+
+
+class StaticOptionType(IntEnum):
+    invalid = 0
+    cpu_ocr = 1
+    gpu_ocr = 2
 
 
 @unique
@@ -28,6 +35,10 @@ class Message(Enum):
 
     AllTasksCompleted = auto()
 
+    AsyncCallInfo = auto()
+
+    Destroyed = auto()
+
     TaskChainError = 10000
 
     TaskChainStart = auto()