LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 14:39:25 +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

75
submodule/AlasMaaBridge/module/config/argument/args.json
View File

@@ -44,6 +44,10 @@
"PenguinID": {
"type": "input",
"value": null
},
"ReportToYiTuLiu": {
"type": "checkbox",
"value": false
}
},
"Emulator": {
@@ -210,6 +214,18 @@
"value": 5,
"display": "hide"
},
"Series": {
"type": "select",
"value": 1,
"option": [
1,
2,
3,
4,
5,
6
]
},
"Drops": {
"type": "textarea",
"value": null,
@@ -311,6 +327,18 @@
"type": "input",
"value": null
},
"Series": {
"type": "select",
"value": 1,
"option": [
1,
2,
3,
4,
5,
6
]
},
"Drops": {
"type": "textarea",
"value": null
@@ -412,6 +440,18 @@
"value": null,
"display": "hide"
},
"Series": {
"type": "select",
"value": 1,
"option": [
1,
2,
3,
4,
5,
6
]
},
"Drops": {
"type": "textarea",
"value": null,
@@ -606,6 +646,19 @@
"Expedite": {
"type": "checkbox",
"value": false
},
"FirstTags": {
"type": "input",
"value": null
},
"ExtraTagsMode": {
"type": "select",
"value": 0,
"option": [
0,
1,
2
]
}
},
"Storage": {
@@ -652,7 +705,7 @@
"MaaInfrast": {
"Facility": {
"type": "textarea",
"value": "Mfg > Trade > Power > Control > Reception > Office > Dorm"
"value": "Training > Mfg > Trade > Power > Control > Reception > Office > Dorm"
},
"Drones": {
"type": "select",
@@ -908,7 +961,8 @@
"value": 0,
"option": [
0,
1
1,
4
]
},
"StartsCount": {
@@ -927,6 +981,10 @@
"type": "select",
"value": "指挥分队",
"option": [
"永恒狩猎分队",
"生活至上分队",
"科学主义分队",
"特训分队",
"心胜于物分队",
"物尽其用分队",
"以人为本分队",
@@ -964,6 +1022,19 @@
"friend_support",
"nonfriend_support"
]
},
"startWithEliteTwo": {
"type": "select",
"value": "no_use",
"option": [
"no_use",
"start_with_elite_two",
"only_start_with_elite_two"
]
},
"refreshTraderWithDice": {
"type": "checkbox",
"value": false
}
},
"Storage": {

48
submodule/AlasMaaBridge/module/config/argument/argument.yaml
View File

@@ -41,30 +41,34 @@ MaaEmulator:
valuetype: str
PackageName:
value: Official
option: [Official, Bilibili, YoStarEN, YoStarJP, YoStarKR, txwy]
option: [ Official, Bilibili, YoStarEN, YoStarJP, YoStarKR, txwy ]
MaaPath:
value: D:/Program Files/MAA
type: textarea
TouchMethod:
value: minitouch
option: [minitouch, maatouch, adb]
option: [ minitouch, maatouch, adb ]
DeploymentWithPause:
value: false
MaaRecord:
ReportToPenguin: false
PenguinID: null
ReportToYiTuLiu: false
MaaFight:
Stage:
value: last
option: [last, 1-7, LS-6, CA-5, SK-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2, custom]
option: [ last, 1-7, LS-6, CA-5, SK-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2, custom ]
CustomStage: null
MedicineTactics:
value: no_use
option: [no_use, expiring, run_out]
option: [ no_use, expiring, run_out ]
Medicine: null
Stone: null
Times: null
Series:
value: 1
option: [ 1,2,3,4,5,6 ]
Drops:
value: null
type: textarea
@@ -74,25 +78,25 @@ MaaFightWeekly:
Enable: true
Monday:
value: default
option: [default, LS-6, SK-5, AP-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2]
option: [ default, LS-6, SK-5, AP-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2 ]
Tuesday:
value: default
option: [default, LS-6, CA-5, CE-6, PR-B-1, PR-B-2, PR-D-1, PR-D-2]
option: [ default, LS-6, CA-5, CE-6, PR-B-1, PR-B-2, PR-D-1, PR-D-2 ]
Wednesday:
value: default
option: [default, LS-6, CA-5, SK-5, PR-C-1, PR-C-2, PR-D-1, PR-D-2]
option: [ default, LS-6, CA-5, SK-5, PR-C-1, PR-C-2, PR-D-1, PR-D-2 ]
Thursday:
value: default
option: [default, LS-6, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2]
option: [ default, LS-6, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2 ]
Friday:
value: default
option: [default, LS-6, CA-5, SK-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2]
option: [ default, LS-6, CA-5, SK-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2 ]
Saturday:
value: default
option: [default, LS-6, SK-5, AP-5, CE-6, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2]
option: [ default, LS-6, SK-5, AP-5, CE-6, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2 ]
Sunday:
value: default
option: [default, LS-6, CA-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2]
option: [ default, LS-6, CA-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2 ]
MaaRecruit:
Refresh: true
@@ -103,14 +107,18 @@ MaaRecruit:
Level3ShortTime: True
Times: 4
Expedite: false
FirstTags: null
ExtraTagsMode:
value: 0
option: [ 0,1,2 ]
MaaInfrast:
Facility:
value: Mfg > Trade > Power > Control > Reception > Office > Dorm
value: Training > Mfg > Trade > Power > Control > Reception > Office > Dorm
type: textarea
Drones:
value: Money
option: [_NotUse, Money, SyntheticJade, CombatRecord, PureGold, OriginStone, Chip]
option: [ _NotUse, Money, SyntheticJade, CombatRecord, PureGold, OriginStone, Chip ]
WorkThreshold: 12
ShiftThreshold: 4
Notstationed: true
@@ -121,7 +129,7 @@ MaaCustomInfrast:
Enable: false
BuiltinConfig:
value: custom
option: [custom, 153-3, 243-3, 243-4, 252-3, 333-3]
option: [ custom, 153-3, 243-3, 243-4, 252-3, 333-3 ]
Filename:
value: null
type: textarea
@@ -144,23 +152,27 @@ MaaMall:
MaaRoguelike:
Theme:
value: Sami
option: [Phantom, Mizuki, Sami]
option: [ Phantom, Mizuki, Sami ]
Mode:
value: 0
option: [0, 1]
option: [ 0, 1, 4 ]
StartsCount: 9999999
InvestmentsCount: 9999999
StopWhenInvestmentFull: false
Squad:
value: 指挥分队
option: [心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队]
option: [ 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 ]
Roles:
value: 取长补短
option: [先手必胜, 稳扎稳打, 取长补短, 随心所欲]
option: [ 先手必胜, 稳扎稳打, 取长补短, 随心所欲 ]
CoreChar: null
Support:
value: no_use
option: [ no_use, friend_support, nonfriend_support ]
startWithEliteTwo:
value: no_use
option: [ no_use, start_with_elite_two, only_start_with_elite_two ]
refreshTraderWithDice: false
MaaAward:
Mail: False

12
submodule/AlasMaaBridge/module/config/config_generated.py
View File

@@ -37,6 +37,7 @@ class GeneratedConfig:
# Group `MaaRecord`
MaaRecord_ReportToPenguin = False
MaaRecord_PenguinID = None
MaaRecord_ReportToYiTuLiu = False
# Group `MaaFight`
MaaFight_Stage = 'last' # last, 1-7, LS-6, CA-5, SK-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2, custom
@@ -45,6 +46,7 @@ class GeneratedConfig:
MaaFight_Medicine = None
MaaFight_Stone = None
MaaFight_Times = None
MaaFight_Series = 1 # 1, 2, 3, 4, 5, 6
MaaFight_Drops = None
MaaFight_DrGrandet = False
@@ -67,9 +69,11 @@ class GeneratedConfig:
MaaRecruit_Level3ShortTime = True
MaaRecruit_Times = 4
MaaRecruit_Expedite = False
MaaRecruit_FirstTags = None
MaaRecruit_ExtraTagsMode = 0 # 0, 1, 2
# Group `MaaInfrast`
MaaInfrast_Facility = 'Mfg > Trade > Power > Control > Reception > Office > Dorm'
MaaInfrast_Facility = 'Training > Mfg > Trade > Power > Control > Reception > Office > Dorm'
MaaInfrast_Drones = 'Money' # _NotUse, Money, SyntheticJade, CombatRecord, PureGold, OriginStone, Chip
MaaInfrast_WorkThreshold = 12
MaaInfrast_ShiftThreshold = 4
@@ -96,14 +100,16 @@ class GeneratedConfig:
# Group `MaaRoguelike`
MaaRoguelike_Theme = 'Sami' # Phantom, Mizuki, Sami
MaaRoguelike_Mode = 0 # 0, 1
MaaRoguelike_Mode = 0 # 0, 1, 4
MaaRoguelike_StartsCount = 9999999
MaaRoguelike_InvestmentsCount = 9999999
MaaRoguelike_StopWhenInvestmentFull = False
MaaRoguelike_Squad = '指挥分队' # 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
MaaRoguelike_Squad = '指挥分队' # 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
MaaRoguelike_Roles = '取长补短' # 先手必胜, 稳扎稳打, 取长补短, 随心所欲
MaaRoguelike_CoreChar = None
MaaRoguelike_Support = 'no_use' # no_use, friend_support, nonfriend_support
MaaRoguelike_startWithEliteTwo = 'no_use' # no_use, start_with_elite_two, only_start_with_elite_two
MaaRoguelike_refreshTraderWithDice = False
# Group `MaaAward`
MaaAward_Mail = False

43
submodule/AlasMaaBridge/module/config/i18n/en-US.json
View File

@@ -170,6 +170,10 @@
"PenguinID": {
"name": "MaaRecord.PenguinID.name",
"help": "MaaRecord.PenguinID.help"
},
"ReportToYiTuLiu": {
"name": "MaaRecord.ReportToYiTuLiu.name",
"help": "MaaRecord.ReportToYiTuLiu.help"
}
},
"MaaFight": {
@@ -220,6 +224,16 @@
"name": "MaaFight.Times.name",
"help": "MaaFight.Times.help"
},
"Series": {
"name": "MaaFight.Series.name",
"help": "MaaFight.Series.help",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
},
"Drops": {
"name": "MaaFight.Drops.name",
"help": "MaaFight.Drops.help"
@@ -365,6 +379,17 @@
"Expedite": {
"name": "MaaRecruit.Expedite.name",
"help": "MaaRecruit.Expedite.help"
},
"FirstTags": {
"name": "MaaRecruit.FirstTags.name",
"help": "MaaRecruit.FirstTags.help"
},
"ExtraTagsMode": {
"name": "MaaRecruit.ExtraTagsMode.name",
"help": "MaaRecruit.ExtraTagsMode.help",
"0": "0",
"1": "1",
"2": "2"
}
},
"MaaInfrast": {
@@ -494,7 +519,8 @@
"name": "MaaRoguelike.Mode.name",
"help": "MaaRoguelike.Mode.help",
"0": "0",
"1": "1"
"1": "1",
"4": "4"
},
"StartsCount": {
"name": "MaaRoguelike.StartsCount.name",
@@ -511,6 +537,10 @@
"Squad": {
"name": "MaaRoguelike.Squad.name",
"help": "MaaRoguelike.Squad.help",
"永恒狩猎分队": "永恒狩猎分队",
"生活至上分队": "生活至上分队",
"科学主义分队": "科学主义分队",
"特训分队": "特训分队",
"心胜于物分队": "心胜于物分队",
"物尽其用分队": "物尽其用分队",
"以人为本分队": "以人为本分队",
@@ -543,6 +573,17 @@
"no_use": "no_use",
"friend_support": "friend_support",
"nonfriend_support": "nonfriend_support"
},
"startWithEliteTwo": {
"name": "MaaRoguelike.startWithEliteTwo.name",
"help": "MaaRoguelike.startWithEliteTwo.help",
"no_use": "no_use",
"start_with_elite_two": "start_with_elite_two",
"only_start_with_elite_two": "only_start_with_elite_two"
},
"refreshTraderWithDice": {
"name": "MaaRoguelike.refreshTraderWithDice.name",
"help": "MaaRoguelike.refreshTraderWithDice.help"
}
},
"MaaAward": {

43
submodule/AlasMaaBridge/module/config/i18n/ja-JP.json
View File

@@ -170,6 +170,10 @@
"PenguinID": {
"name": "MaaRecord.PenguinID.name",
"help": "MaaRecord.PenguinID.help"
},
"ReportToYiTuLiu": {
"name": "MaaRecord.ReportToYiTuLiu.name",
"help": "MaaRecord.ReportToYiTuLiu.help"
}
},
"MaaFight": {
@@ -220,6 +224,16 @@
"name": "MaaFight.Times.name",
"help": "MaaFight.Times.help"
},
"Series": {
"name": "MaaFight.Series.name",
"help": "MaaFight.Series.help",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
},
"Drops": {
"name": "MaaFight.Drops.name",
"help": "MaaFight.Drops.help"
@@ -365,6 +379,17 @@
"Expedite": {
"name": "MaaRecruit.Expedite.name",
"help": "MaaRecruit.Expedite.help"
},
"FirstTags": {
"name": "MaaRecruit.FirstTags.name",
"help": "MaaRecruit.FirstTags.help"
},
"ExtraTagsMode": {
"name": "MaaRecruit.ExtraTagsMode.name",
"help": "MaaRecruit.ExtraTagsMode.help",
"0": "0",
"1": "1",
"2": "2"
}
},
"MaaInfrast": {
@@ -494,7 +519,8 @@
"name": "MaaRoguelike.Mode.name",
"help": "MaaRoguelike.Mode.help",
"0": "0",
"1": "1"
"1": "1",
"4": "4"
},
"StartsCount": {
"name": "MaaRoguelike.StartsCount.name",
@@ -511,6 +537,10 @@
"Squad": {
"name": "MaaRoguelike.Squad.name",
"help": "MaaRoguelike.Squad.help",
"永恒狩猎分队": "永恒狩猎分队",
"生活至上分队": "生活至上分队",
"科学主义分队": "科学主义分队",
"特训分队": "特训分队",
"心胜于物分队": "心胜于物分队",
"物尽其用分队": "物尽其用分队",
"以人为本分队": "以人为本分队",
@@ -543,6 +573,17 @@
"no_use": "no_use",
"friend_support": "friend_support",
"nonfriend_support": "nonfriend_support"
},
"startWithEliteTwo": {
"name": "MaaRoguelike.startWithEliteTwo.name",
"help": "MaaRoguelike.startWithEliteTwo.help",
"no_use": "no_use",
"start_with_elite_two": "start_with_elite_two",
"only_start_with_elite_two": "only_start_with_elite_two"
},
"refreshTraderWithDice": {
"name": "MaaRoguelike.refreshTraderWithDice.name",
"help": "MaaRoguelike.refreshTraderWithDice.help"
}
},
"MaaAward": {

51
submodule/AlasMaaBridge/module/config/i18n/zh-CN.json
View File

@@ -170,6 +170,10 @@
"PenguinID": {
"name": "企鹅物流ID",
"help": "留空即可，第一次上传后会自动生成"
},
"ReportToYiTuLiu": {
"name": "上传到一图流",
"help": ""
}
},
"MaaFight": {
@@ -220,6 +224,16 @@
"name": "指定次数",
"help": ""
},
"Series": {
"name": "连战次数",
"help": "",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
},
"Drops": {
"name": "指定掉落",
"help": "以\"掉落物:数量 > 掉落物:数量\"的形式，支持中文名称和物品ID\n注意：填写多种掉落物时，任何一种掉落物刷满都会使任务结束"
@@ -365,6 +379,17 @@
"Expedite": {
"name": "自动使用加急许可",
"help": ""
},
"FirstTags": {
"name": "三星 Tag 时的 Tag 倾向",
"help": "用英文;分隔"
},
"ExtraTagsMode": {
"name": "公招多选 Tag 的策略",
"help": "",
"0": "默认不选择额外 Tag",
"1": "选择高星时总是选择三个 Tag",
"2": "尽可能多地选且只选高星 Tag"
}
},
"MaaInfrast": {
@@ -494,7 +519,8 @@
"name": "策略",
"help": "",
"0": "刷蜡烛",
"1": "刷源石锭"
"1": "刷源石锭",
"4": "刷开局"
},
"StartsCount": {
"name": "开始探索X次后停止任务",
@@ -511,9 +537,13 @@
"Squad": {
"name": "开局分队",
"help": "",
"心胜于物分队": "心胜于物分队",
"物尽其用分队": "物尽其用分队",
"以人为本分队": "以人为本分队",
"永恒狩猎分队": "永恒狩猎分队(萨米)",
"生活至上分队": "生活至上分队(萨米)",
"科学主义分队": "科学主义分队(萨米)",
"特训分队": "特训分队(萨米)",
"心胜于物分队": "心胜于物分队(水月)",
"物尽其用分队": "物尽其用分队(水月)",
"以人为本分队": "以人为本分队(水月)",
"指挥分队": "指挥分队",
"集群分队": "集群分队",
"后勤分队": "后勤分队",
@@ -522,7 +552,7 @@
"堡垒战术分队": "堡垒战术分队",
"远程战术分队": "远程战术分队",
"破坏战术分队": "破坏战术分队",
"研究分队": "研究分队",
"研究分队": "研究分队(傀影、水月)",
"高规格分队": "高规格分队"
},
"Roles": {
@@ -543,6 +573,17 @@
"no_use": "不使用",
"friend_support": "好友助战",
"nonfriend_support": "好友+非好友助战"
},
"startWithEliteTwo": {
"name": "凹「开局干员」精二直升",
"help": "需要选择职业队",
"no_use": "不凹精二直升",
"start_with_elite_two": "凹精二直升",
"only_start_with_elite_two": "只凹直升精二，不进行作战"
},
"refreshTraderWithDice": {
"name": "刷新商店(指路鳞)",
"help": "只支持水月与深蓝之树"
}
},
"MaaAward": {

43
submodule/AlasMaaBridge/module/config/i18n/zh-TW.json
View File

@@ -170,6 +170,10 @@
"PenguinID": {
"name": "MaaRecord.PenguinID.name",
"help": "MaaRecord.PenguinID.help"
},
"ReportToYiTuLiu": {
"name": "MaaRecord.ReportToYiTuLiu.name",
"help": "MaaRecord.ReportToYiTuLiu.help"
}
},
"MaaFight": {
@@ -220,6 +224,16 @@
"name": "MaaFight.Times.name",
"help": "MaaFight.Times.help"
},
"Series": {
"name": "MaaFight.Series.name",
"help": "MaaFight.Series.help",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
},
"Drops": {
"name": "MaaFight.Drops.name",
"help": "MaaFight.Drops.help"
@@ -365,6 +379,17 @@
"Expedite": {
"name": "MaaRecruit.Expedite.name",
"help": "MaaRecruit.Expedite.help"
},
"FirstTags": {
"name": "MaaRecruit.FirstTags.name",
"help": "MaaRecruit.FirstTags.help"
},
"ExtraTagsMode": {
"name": "MaaRecruit.ExtraTagsMode.name",
"help": "MaaRecruit.ExtraTagsMode.help",
"0": "0",
"1": "1",
"2": "2"
}
},
"MaaInfrast": {
@@ -494,7 +519,8 @@
"name": "MaaRoguelike.Mode.name",
"help": "MaaRoguelike.Mode.help",
"0": "0",
"1": "1"
"1": "1",
"4": "4"
},
"StartsCount": {
"name": "MaaRoguelike.StartsCount.name",
@@ -511,6 +537,10 @@
"Squad": {
"name": "MaaRoguelike.Squad.name",
"help": "MaaRoguelike.Squad.help",
"永恒狩猎分队": "永恒狩猎分队",
"生活至上分队": "生活至上分队",
"科学主义分队": "科学主义分队",
"特训分队": "特训分队",
"心胜于物分队": "心胜于物分队",
"物尽其用分队": "物尽其用分队",
"以人为本分队": "以人为本分队",
@@ -543,6 +573,17 @@
"no_use": "no_use",
"friend_support": "friend_support",
"nonfriend_support": "nonfriend_support"
},
"startWithEliteTwo": {
"name": "MaaRoguelike.startWithEliteTwo.name",
"help": "MaaRoguelike.startWithEliteTwo.help",
"no_use": "no_use",
"start_with_elite_two": "start_with_elite_two",
"only_start_with_elite_two": "only_start_with_elite_two"
},
"refreshTraderWithDice": {
"name": "MaaRoguelike.refreshTraderWithDice.name",
"help": "MaaRoguelike.refreshTraderWithDice.help"
}
},
"MaaAward": {

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)