fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: format

Browse Source
This commit is contained in:
zzyyyl
2022-10-04 22:06:14 +08:00
parent 266c634cb2
commit e3650517d2
3 changed files with 95 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resource/infrast.json
View File

@@ -377,8 +377,7 @@
"template": "Bskill_ctrl_ussg.png"
}
},
"skillsGroup": [
]
"skillsGroup": []
},
"Dorm": {
"skills": {
@@ -1954,8 +1953,7 @@
"template": "Bskill_hire_spd_memento.png"
}
},
"skillsGroup": [
]
"skillsGroup": []
},
"Power": {
"maxNumOfOpers": 1,
@@ -2073,8 +2071,7 @@
"template": "Bskill_pow_spd3.png"
}
},
"skillsGroup": [
]
"skillsGroup": []
},
"Reception": {
"Doc": "会客室",
@@ -2382,8 +2379,7 @@
"template": "Bskill_meet_ursus2.png"
}
},
"skillsGroup": [
]
"skillsGroup": []
},
"Trade": {
"maxNumOfOpers": 3,
@@ -2996,8 +2992,7 @@
]
}
],
"optional": [
]
"optional": []
},
{
"allowExternal": false,

178
resource/roguelike_recruit.json
View File

@@ -147,37 +147,37 @@
}
],
"Pioneer": [
{
"name": "郁金香",
"skill": 1,
"recruit_priority": 1000,
"promote_priority": 500
},
{
"name": "郁金香",
"skill": 1,
"recruit_priority": 1000,
"promote_priority": 500
},
{
"name": "风笛",
"skill": 2,
"recruit_priority": 600,
"promote_priority": 500
},
{
"name": "推进之王",
"skill": 2,
"recruit_priority": 600,
"promote_priority": 500
},
{
"name": "嵯峨",
"skill": 2,
"skill_usage": 1,
"recruit_priority": 600,
"promote_priority": 500
},
{
"name": "焰尾",
"skill": 2,
"recruit_priority": 600,
"promote_priority": 500
},
{
"name": "推进之王",
"skill": 2,
"recruit_priority": 600,
"promote_priority": 500
},
{
"name": "嵯峨",
"skill": 2,
"skill_usage": 1,
"recruit_priority": 600,
"promote_priority": 500
},
{
"name": "焰尾",
"skill": 2,
"recruit_priority": 600,
"promote_priority": 500
},
{
"name": "芬",
"skill": 1,
@@ -187,7 +187,7 @@
{
"name": "桃金娘",
"skill": 1,
"skill_usage": 1,
"skill_usage": 1,
"recruit_priority": 190,
"promote_priority": 550
},
@@ -211,18 +211,18 @@
"recruit_priority": 800,
"promote_priority": 650
},
{
"name": "瑕光",
"skill": 1,
"recruit_priority": 200,
"promote_priority": 100
},
{
"name": "临光",
"skill": 1,
"recruit_priority": 400,
"promote_priority": 1
},
{
"name": "瑕光",
"skill": 1,
"recruit_priority": 200,
"promote_priority": 100
},
{
"name": "临光",
"skill": 1,
"recruit_priority": 400,
"promote_priority": 1
},
{
"name": "斑点",
"skill": 1,
@@ -321,12 +321,12 @@
}
],
"Caster": [
{
"name": "Pith",
"skill": 1,
"recruit_priority": 1000,
"promote_priority": 600
},
{
"name": "Pith",
"skill": 1,
"recruit_priority": 1000,
"promote_priority": 600
},
{
"name": "澄闪",
"skill": 3,
@@ -340,51 +340,51 @@
"recruit_priority": 600,
"promote_priority": 600
},
{
"name": "异客",
"skill": 3,
"alternate_skill": 2,
"recruit_priority": 500,
"promote_priority": 550
},
{
"name": "刻俄柏",
"skill": 2,
"recruit_priority": 500,
"promote_priority": 550
},
{
"name": "夕",
"skill": 3,
"alternate_skill": 1,
"recruit_priority": 450,
"promote_priority": 500
},
{
"name": "莫斯提马",
"skill": 3,
"alternate_skill": 1,
"recruit_priority": 440,
"promote_priority": 490
},
{
"name": "伊芙利特",
"skill": 2,
"recruit_priority": 450,
"promote_priority": 500
},
{
"name": "黑键",
"skill": 2,
"recruit_priority": 440,
"promote_priority": 490
},
{
"name": "卡涅利安",
"skill": 2,
"recruit_priority": 440,
"promote_priority": 490
},
{
"name": "异客",
"skill": 3,
"alternate_skill": 2,
"recruit_priority": 500,
"promote_priority": 550
},
{
"name": "刻俄柏",
"skill": 2,
"recruit_priority": 500,
"promote_priority": 550
},
{
"name": "夕",
"skill": 3,
"alternate_skill": 1,
"recruit_priority": 450,
"promote_priority": 500
},
{
"name": "莫斯提马",
"skill": 3,
"alternate_skill": 1,
"recruit_priority": 440,
"promote_priority": 490
},
{
"name": "伊芙利特",
"skill": 2,
"recruit_priority": 450,
"promote_priority": 500
},
{
"name": "黑键",
"skill": 2,
"recruit_priority": 440,
"promote_priority": 490
},
{
"name": "卡涅利安",
"skill": 2,
"recruit_priority": 440,
"promote_priority": 490
},
{
"name": "阿米娅",
"skill": 1,

2
src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp
View File

@@ -546,7 +546,7 @@ bool asst::RoguelikeBattleTaskPlugin::cancel_oper_selection()
std::vector<asst::Point> asst::RoguelikeBattleTaskPlugin::available_locations(BattleRole role)
{
LogTraceFunction;
auto buildable_type = Loc::All;
switch (role) {
case BattleRole::Medic: