Skip to content

Commit ae4d5c5

Browse files
authored
Merge pull request #1710 from LmeSzinc/dev
Add MAA submodule
2 parents 053b8ae + b2533c1 commit ae4d5c5

48 files changed

Lines changed: 5092 additions & 173 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config/*.yaml
77
!config/deploy.*.yaml
88
config/*.json
99
config/tmp*
10-
!config/template.json
10+
!config/template*.json
1111
*.pyw
1212
dev_tools/debug_tools
1313
.idea

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,5 @@ Alas 仍在活跃开发中,我们会不定期发布未来的工作在 [Issues]
163163
- [ALAuto](https://github.com/Egoistically/ALAuto),EN服的碧蓝航线脚本,已不再维护,Alas 模仿了其架构。
164164
- [ALAuto homg_trans_beta](https://github.com/asd111333/ALAuto/tree/homg_trans_beta),Alas 引入了其中的单应性变换至海图识别模块中。
165165
- [PyWebIO](https://github.com/pywebio/PyWebIO),Alas 使用的 GUI 库。
166+
- [MaaAssistantArknights](https://github.com/MaaAssistantArknights/MaaAssistantArknights),明日方舟小助手,全日常一键长草,现已加入Alas豪华午餐 -> [MAA 插件使用教程](https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/submodule_maa_cn)
166167

README_en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ Oh yeah, don't forget to read the [development documentation](https://github.com
105105
- [ALAuto](https://github.com/Egoistically/ALAuto), Another Azur Lane bot for EN, not maintaining anymore. Alas imitated its structure.
106106
- [ALAuto homg_trans_beta](https://github.com/asd111333/ALAuto/tree/homg_trans_beta), Alas introduced its homography transition into map detection.
107107
- [PyWebIO](https://github.com/pywebio/PyWebIO), GUI framework that Alas uses.
108+
- [MaaAssistantArknights](https://github.com/MaaAssistantArknights/MaaAssistantArknights), an Arknights assistant based on image recognition, helps you to complete daily quests efficiently! -> [MAA submodule tutorial](https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/submodule_maa_cn)
108109

5.82 KB
Loading
5.82 KB
Loading
5.82 KB
Loading
5.82 KB
Loading

config/template.maa.json

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
{
2+
"Maa": {
3+
"MaaEmulator": {
4+
"Serial": "127.0.0.1:5555",
5+
"PackageName": "Official",
6+
"Server": "CN",
7+
"MaaPath": "D:/Program Files/MAA"
8+
},
9+
"MaaRecord": {
10+
"ReportToPenguin": false,
11+
"PenguinID": null
12+
},
13+
"Emulator": {
14+
"ServerName": "disabled"
15+
},
16+
"Error": {
17+
"SaveError": false,
18+
"OnePushConfig": "provider: null"
19+
},
20+
"Optimization": {
21+
"WhenTaskQueueEmpty": "stay_there"
22+
}
23+
},
24+
"MaaStartup": {
25+
"Scheduler": {
26+
"Enable": true,
27+
"NextRun": "2020-01-01 04:00:00",
28+
"Command": "MaaStartup",
29+
"SuccessInterval": 0,
30+
"FailureInterval": 0,
31+
"ServerUpdate": "04:00"
32+
}
33+
},
34+
"MaaAnnihilation": {
35+
"Scheduler": {
36+
"Enable": false,
37+
"NextRun": "2020-01-01 04:00:00",
38+
"Command": "MaaAnnihilation",
39+
"SuccessInterval": 480,
40+
"FailureInterval": 120,
41+
"ServerUpdate": "04:00"
42+
},
43+
"MaaFight": {
44+
"Stage": "Annihilation",
45+
"Medicine": 0,
46+
"Stone": 0,
47+
"Times": 5,
48+
"Drops": null,
49+
"DrGrandet": false
50+
}
51+
},
52+
"MaaMaterial": {
53+
"Scheduler": {
54+
"Enable": false,
55+
"NextRun": "2020-01-01 04:00:00",
56+
"Command": "MaaMaterial",
57+
"SuccessInterval": 60,
58+
"FailureInterval": 120,
59+
"ServerUpdate": "04:00"
60+
},
61+
"MaaFight": {
62+
"Stage": "1-7",
63+
"Medicine": 0,
64+
"Stone": 0,
65+
"Times": 0,
66+
"Drops": null,
67+
"DrGrandet": false
68+
}
69+
},
70+
"MaaFight": {
71+
"Scheduler": {
72+
"Enable": false,
73+
"NextRun": "2020-01-01 04:00:00",
74+
"Command": "MaaFight",
75+
"SuccessInterval": 480,
76+
"FailureInterval": 120,
77+
"ServerUpdate": "04:00"
78+
},
79+
"MaaFight": {
80+
"Stage": "1-7",
81+
"Medicine": 0,
82+
"Stone": 0,
83+
"Times": 0,
84+
"Drops": null,
85+
"DrGrandet": false
86+
}
87+
},
88+
"MaaRecruit": {
89+
"Scheduler": {
90+
"Enable": false,
91+
"NextRun": "2020-01-01 04:00:00",
92+
"Command": "MaaRecruit",
93+
"SuccessInterval": 180,
94+
"FailureInterval": 120,
95+
"ServerUpdate": "04:00"
96+
},
97+
"MaaRecruit": {
98+
"Refresh": true,
99+
"SkipRobot": true,
100+
"Select3": true,
101+
"Select4": true,
102+
"Select5": true,
103+
"Level3ShortTime": true,
104+
"Times": 4,
105+
"Expedite": false
106+
}
107+
},
108+
"MaaInfrast": {
109+
"Scheduler": {
110+
"Enable": false,
111+
"NextRun": "2020-01-01 04:00:00",
112+
"Command": "MaaInfrast",
113+
"SuccessInterval": 60,
114+
"FailureInterval": 120,
115+
"ServerUpdate": "04:00"
116+
},
117+
"MaaInfrast": {
118+
"Facility": "Mfg > Trade > Power > Control > Reception > Office > Dorm",
119+
"Drones": "Money",
120+
"Threshold": 0.3,
121+
"Notstationed": true,
122+
"Trust": true,
123+
"Replenish": false
124+
},
125+
"MaaCustomInfrast": {
126+
"Enable": false,
127+
"Filename": null
128+
}
129+
},
130+
"MaaVisit": {
131+
"Scheduler": {
132+
"Enable": false,
133+
"NextRun": "2020-01-01 04:00:00",
134+
"Command": "MaaVisit",
135+
"SuccessInterval": 60,
136+
"FailureInterval": 120,
137+
"ServerUpdate": "04:00"
138+
}
139+
},
140+
"MaaMall": {
141+
"Scheduler": {
142+
"Enable": false,
143+
"NextRun": "2020-01-01 04:00:00",
144+
"Command": "MaaMall",
145+
"SuccessInterval": 60,
146+
"FailureInterval": 120,
147+
"ServerUpdate": "04:00"
148+
},
149+
"MaaMall": {
150+
"Shopping": true,
151+
"BuyFirst": "招聘许可 > 龙门币",
152+
"BlackList": "碳 > 家具"
153+
}
154+
},
155+
"MaaAward": {
156+
"Scheduler": {
157+
"Enable": false,
158+
"NextRun": "2020-01-01 04:00:00",
159+
"Command": "MaaAward",
160+
"SuccessInterval": 60,
161+
"FailureInterval": 120,
162+
"ServerUpdate": "04:00, 16:00"
163+
}
164+
},
165+
"MaaRoguelike": {
166+
"Scheduler": {
167+
"Enable": false,
168+
"NextRun": "2020-01-01 04:00:00",
169+
"Command": "MaaRoguelike",
170+
"SuccessInterval": 60,
171+
"FailureInterval": 120,
172+
"ServerUpdate": "04:00"
173+
},
174+
"MaaRoguelike": {
175+
"Mode": 0,
176+
"StartsCount": 9999999,
177+
"InvestmentsCount": 9999999,
178+
"StopWhenInvestmentFull": false,
179+
"Squad": "指挥分队",
180+
"Roles": "取长补短",
181+
"CoreChar": null
182+
}
183+
},
184+
"MaaCopilot": {
185+
"MaaCopilot": {
186+
"FileName": null,
187+
"Formation": false
188+
}
189+
}
190+
}

0 commit comments

Comments
 (0)