LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 11:19:29 +08:00
Code Activity

Merge branch 'lme_master'

Browse Source 
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment_change.py
This commit is contained in:
Zuosizhu
2024-05-19 00:50:11 +08:00
parent a3e1d994bb f06d2b33df
commit 5123bd9949
30 changed files with 688 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,8 +218,10 @@ class AssistantHandler:
def fight(self):
args = {
"report_to_penguin": self.config.MaaRecord_ReportToPenguin,
"report_to_yituliu": self.config.MaaRecord_ReportToYiTuLiu,
"client_type": self.config.MaaEmulator_PackageName,
"DrGrandet": self.config.MaaFight_DrGrandet,
"series": int(self.config.MaaFight_Series)
}
# Set stage
if self.config.MaaFight_Stage == 'last':
@@ -307,7 +309,8 @@ class AssistantHandler:
"confirm": confirm,
"times": self.config.MaaRecruit_Times,
"expedite": self.config.MaaRecruit_Expedite,
"skip_robot": self.config.MaaRecruit_SkipRobot
"skip_robot": self.config.MaaRecruit_SkipRobot,
"extra_tags_mode": self.config.MaaRecruit_ExtraTagsMode
}
if self.config.MaaRecruit_Level3ShortTime:
@@ -318,6 +321,9 @@ class AssistantHandler:
elif self.config.MaaRecord_ReportToPenguin and not self.config.MaaRecord_PenguinID:
self.callback_list.append(self.penguin_id_callback)
if self.config.MaaRecruit_FirstTags:
args["first_tags"] = self.config.MaaRecruit_FirstTags.split(';')
self.maa_start('Recruit', args)
self.config.task_delay(success=True)
@@ -329,7 +335,7 @@ class AssistantHandler:
"replenish": self.config.MaaInfrast_Replenish,
"dorm_notstationed_enabled": self.config.MaaInfrast_Notstationed,
"dorm_trust_enabled": self.config.MaaInfrast_Trust,
"continue_train": self.config.MaaInfrast_ContinueTraining
"continue_training": self.config.MaaInfrast_ContinueTraining
}
if self.config.MaaCustomInfrast_Enable:
@@ -444,14 +450,29 @@ class AssistantHandler:
"investments_count": self.config.MaaRoguelike_InvestmentsCount,
"stop_when_investment_full": self.config.MaaRoguelike_StopWhenInvestmentFull,
"squad": self.config.MaaRoguelike_Squad,
"roles": self.config.MaaRoguelike_Roles
"roles": self.config.MaaRoguelike_Roles,
}
if (self.config.MaaRoguelike_Theme != "Mizuki" and self.config.MaaRoguelike_Squad in ["心胜于物分队",
"物尽其用分队",
"以人为本分队"]) or (
self.config.MaaRoguelike_Theme != "Sami" and self.config.MaaRoguelike_Squad in ["永恒狩猎分队",
"生活至上分队",
"科学主义分队",
"特训分队"]):
args["squad"] = "指挥分队"
if self.config.MaaRoguelike_CoreChar:
args["core_char"] = self.config.MaaRoguelike_CoreChar
if self.config.MaaRoguelike_Support != 'no_use':
args["use_support"] = True
if self.config.MaaRoguelike_Support == 'nonfriend_support':
args["use_nonfriend_support"] = True
if self.config.MaaRoguelike_Squad in ["突击战术分队", "堡垒战术分队", "远程战术分队",
"破坏战术分队"] and self.config.MaaRoguelike_Mode == 4 and self.config.MaaRoguelike_startWithEliteTwo != "no_use":
args["start_with_elite_two"] = True
args[self.config.MaaRoguelike_startWithEliteTwo] = True
if self.config.MaaRoguelike_Theme == "Mizuki":
args["refresh_trader_with_dice"] = self.config.MaaRoguelike_refreshTraderWithDice
self.task_switch_timer = Timer(30).start()
self.callback_list.append(self.roguelike_callback)
@@ -513,10 +534,10 @@ class AssistantHandler:
return
args = {
"stage_name": stage,
"filename": filename,
"formation": self.config.MaaCopilot_Formation
}
"stage_name": stage,
"filename": filename,
"formation": self.config.MaaCopilot_Formation
}
for i in range(self.config.MaaCopilot_Cycle):
if deep_get(homework, keys='type') == 'SSS':
self.maa_start('SSSCopilot', args)