LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 22:09:25 +08:00
Code Activity

Merge branch 'refs/heads/LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
This commit is contained in:
LA_DI_DA
2024-10-25 12:00:50 +08:00
parent e8525ffaf0 25b5349fd3
commit a2e6986dcd
217 changed files with 538 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
submodule/AlasMaaBridge/module/handler/handler.py
View File

@@ -131,8 +131,12 @@ class AssistantHandler:
self.callback_list.remove(self.penguin_id_callback)
def annihilation_callback(self, m, d):
if m == self.Message.SubTaskError:
self.signal = m
# Skip annihilation error task callback temporary
# https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/10623
ignoreErrorKeywords = ["FightSeries-Indicator","FightSeries-Icon"]
if m == self.Message.SubTaskError \
and deep_get(d, keys='first') != ignoreErrorKeywords:
self.signal = m
def fight_stop_count_callback(self, m, d):
if m == self.Message.SubTaskCompleted: