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

chore: Manual update resources

Browse Source
This commit is contained in:
Constrat
2025-05-01 12:19:43 +02:00
parent 9b96afd448
commit ae7a360db2
13 changed files with 179 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
resource/battle_data.json
View File

@@ -389,6 +389,22 @@
"rangeId": ["3-6", "3-1", "3-1"],
"rarity": 6
},
"char_1041_angel2": {
"name": "新约能天使",
"name_en": "新约能天使",
"name_en_unavailable": true,
"name_jp": "新约能天使",
"name_jp_unavailable": true,
"name_kr": "新约能天使",
"name_kr_unavailable": true,
"name_tw": "新约能天使",
"name_tw_unavailable": true,
"position": "RANGED",
"profession": "SPECIAL",
"rangeId": ["3-1", "3-3", "3-3"],
"rarity": 7,
"tokens": []
},
"char_106_franka": {
"name": "芙兰卡",
"name_en": "Franka",
@@ -3572,6 +3588,66 @@
"rangeId": ["y-1", "y-2", "y-2"],
"rarity": 6
},
"char_4187_graceb": {
"name": "聆音",
"name_en": "聆音",
"name_en_unavailable": true,
"name_jp": "聆音",
"name_jp_unavailable": true,
"name_kr": "聆音",
"name_kr_unavailable": true,
"name_tw": "聆音",
"name_tw_unavailable": true,
"position": "MELEE",
"profession": "WARRIOR",
"rangeId": ["1-1", "1-1", "1-1"],
"rarity": 6
},
"char_4188_confes": {
"name": "CONFESS-47",
"name_en": "CONFESS-47",
"name_en_unavailable": true,
"name_jp": "CONFESS-47",
"name_jp_unavailable": true,
"name_kr": "CONFESS-47",
"name_kr_unavailable": true,
"name_tw": "CONFESS-47",
"name_tw_unavailable": true,
"position": "MELEE",
"profession": "PIONEER",
"rangeId": ["1-1", "1-1", "1-1"],
"rarity": 1
},
"char_4193_lemuen": {
"name": "蕾缪安",
"name_en": "蕾缪安",
"name_en_unavailable": true,
"name_jp": "蕾缪安",
"name_jp_unavailable": true,
"name_kr": "蕾缪安",
"name_kr_unavailable": true,
"name_tw": "蕾缪安",
"name_tw_unavailable": true,
"position": "RANGED",
"profession": "SNIPER",
"rangeId": ["3-3", "3-9", "3-9"],
"rarity": 7
},
"char_4194_rmixer": {
"name": "信仰搅拌机",
"name_en": "信仰搅拌机",
"name_en_unavailable": true,
"name_jp": "信仰搅拌机",
"name_jp_unavailable": true,
"name_kr": "信仰搅拌机",
"name_kr_unavailable": true,
"name_tw": "信仰搅拌机",
"name_tw_unavailable": true,
"position": "MELEE",
"profession": "TANK",
"rangeId": ["2-2", "2-2", "2-2"],
"rarity": 7
},
"char_420_flamtl": {
"name": "焰尾",
"name_en": "Flametail",

48
resource/infrast.json
View File

@@ -662,8 +662,11 @@
"template": "Bskill_dorm_single&one22.png"
},
"bskill_dorm_single1": {
"desc": ["进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.55（同种效果取最高）"],
"name": ["善解人意"],
"desc": [
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.55（同种效果取最高）",
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.55（同种效果取最高）"
],
"name": ["善解人意", "天生乐天派"],
"template": "Bskill_dorm_single1.png"
},
"bskill_dorm_single2": {
@@ -676,11 +679,12 @@
},
"bskill_dorm_single3": {
"desc": [
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.7（同种效果取最高）",
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.7（同种效果取最高）",
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.7（同种效果取最高）",
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.7（同种效果取最高）"
],
"name": ["维多利亚文学", "天启", "心理疏导"],
"name": ["维多利亚文学", "天启", "心理疏导", "恩典颂歌"],
"template": "Bskill_dorm_single3.png"
},
"bskill_dorm_single4": {
@@ -695,6 +699,13 @@
"name": ["毒剂师之友"],
"template": "Bskill_dorm_single_indigo.png"
},
"bskill_dorm_single_laterano": {
"desc": [
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.55（同种效果取最高），如果目标是拉特兰干员，则恢复效果额外+0.45"
],
"name": ["圣城趣事通"],
"template": "Bskill_dorm_single_laterano.png"
},
"bskill_dorm_single_sami": {
"desc": [
"进驻宿舍时，使该宿舍内除自身以外心情未满的某个干员每小时恢复+0.55（同种效果取最高），如果目标是萨米干员，则恢复效果额外+0.45"
@@ -1948,12 +1959,13 @@
"进驻发电站时，无人机充能速度+10%",
"进驻发电站时，无人机充能速度+10%",
"进驻发电站时，无人机充能速度+10%",
"进驻发电站时，无人机充能速度+10%",
"进驻发电站时，无人机充能速度+10%"
],
"efficient": {
"all": 10
},
"name": ["光能充能·α", "电磁充能·α", "备用能源", "热能充能·α", "挽歌充能·α", "灵河充能·α"],
"name": ["光能充能·α", "电磁充能·α", "备用能源", "热能充能·α", "挽歌充能·α", "灵河充能·α", "充能中"],
"template": "Bskill_pow_spd1.png"
},
"bskill_pow_spd2": {
@@ -2042,6 +2054,11 @@
"desc": ["进驻发电站时，每间宿舍每级为充能速度额外+0.5%"],
"name": ["灵河共鸣"],
"template": "Bskill_power_rec_spd&dorm&lv.png"
},
"bskill_power_rec_spd_ext&faction": {
"desc": ["进驻发电站时，如果其他拉特兰干员进驻在发电站，则无人机充能速度+5%"],
"name": ["维护中"],
"template": "Bskill_power_rec_spd_ext&faction.png"
}
},
"skillsGroup": []
@@ -2300,12 +2317,13 @@
"desc": [
"进驻会客室时，线索搜集速度提升15%",
"进驻会客室时，线索搜集速度提升20%",
"进驻会客室时，线索搜集速度提升20%"
"进驻会客室时，线索搜集速度提升20%",
"进驻会客室时，线索搜集速度提升15%"
],
"efficient": {
"all": 20
},
"name": ["化影", "线索搜集·β", "好奇心"],
"name": ["化影", "线索搜集·β", "好奇心", "泡茶高手"],
"template": "Bskill_meet_spd2.png"
},
"bskill_meet_spd3": {
@@ -2315,12 +2333,13 @@
"进驻会客室时，线索搜集速度提升25%",
"进驻会客室时，线索搜集速度提升25%",
"进驻会客室时，线索搜集速度提升25%",
"进驻会客室时，线索搜集速度提升20%",
"进驻会客室时，线索搜集速度提升20%"
],
"efficient": {
"all": 25
},
"name": ["追踪者", "警司", "占卜", "星象学", "领袖外交", "线索搜集·β"],
"name": ["追踪者", "警司", "占卜", "星象学", "领袖外交", "线索搜集·β", "社交达人"],
"template": "Bskill_meet_spd3.png"
},
"bskill_meet_spd4": {
@@ -2360,6 +2379,11 @@
"name": ["广交义友"],
"template": "Bskill_meet_spd_clue.png"
},
"bskill_meet_spd_confes1": {
"desc": ["进驻会客室时，如果菲亚梅塔进驻在宿舍，则线索搜集速度额外提升10%"],
"name": ["不泯童心"],
"template": "Bskill_meet_spd_confes1.png"
},
"bskill_meet_spd_hast1": {
"desc": ["进驻会客室时，线索搜集速度提升20%，此后每小时提升2%，最终达到30%"],
"efficient": {
@@ -2494,11 +2518,21 @@
"name": ["物流规划·β"],
"template": "Bskill_tra_flow_gs2.png"
},
"bskill_tra_laterano1": {
"desc": ["进驻贸易站时，同个贸易站中每有1名拉特兰干员，当前贸易站订单获取效率+15%"],
"name": ["同城加急单"],
"template": "Bskill_tra_laterano1.png"
},
"bskill_tra_law": {
"desc": ["进驻贸易站时，如果下笔赤金订单交付数小于4，则视为违约订单"],
"name": ["合同法"],
"template": "Bskill_tra_law.png"
},
"bskill_tra_lemuen1": {
"desc": ["进驻贸易站时，订单获取效率+20%；当与能天使在同一个贸易站时，订单获取效率额外+25%"],
"name": ["相伴"],
"template": "Bskill_tra_lemuen1.png"
},
"bskill_tra_limit&cost": {
"desc": ["进驻贸易站时，订单上限+5，心情每小时消耗-0.25"],
"name": ["谈判"],

24
resource/item_index.json
View File

@@ -1127,6 +1127,14 @@
"sortId": 10009,
"usage": "新型招聘合约所约定的一种时限货币，累积一定数量后可在指定时期内招聘指定干员。"
},
"LMTGS_COIN_6101": {
"classifyType": "NORMAL",
"description": "与猎头公司长久且稳定的合作关系带来的回报，可有效控制支出。不过，但愿不是每次都需要用到这个手段。",
"icon": "LMTGS_COIN_6101.png",
"name": "寻访数据契约",
"sortId": 10027,
"usage": "新型招聘合约所约定的一种时限货币，累积一定数量后可在指定时期内招聘指定干员。"
},
"LMTGS_COIN_903": {
"classifyType": "NORMAL",
"description": "与猎头公司长久且稳定的合作关系带来的回报，可有效控制支出。不过，但愿不是每次都需要用到这个手段。",
@@ -1935,6 +1943,14 @@
"sortId": -10000,
"usage": "在黑林中找到的破损源石灯。纳斯尔纱城内的匮乏缓解后，居民们自发组织起来，拿出手头仅有的物资，回收这些战争时期的遗存。"
},
"act42side_token_pacifier": {
"classifyType": "NONE",
"description": "一枚沾满口水渍的奶嘴，已经长出了小小的光环。丢了它的孩子此刻正不安地啼哭，为迷途的奶嘴指引方向，它终将回到孩子身边。",
"icon": "act42side_token_pacifier.png",
"name": "蒙恩的奶嘴",
"sortId": -10000,
"usage": "育婴圣堂的启圣工作进行得如火如荼，生灵与死物一齐长出了光环。初获光环的奶嘴在育婴圣堂内迷茫地游荡，导致无数婴儿夜不能寐。若你能劝它们回归职守，焦头烂额的保育员们一定很愿意以礼相谢。"
},
"act4bossrush_milestone_point": {
"classifyType": "NONE",
"description": "模拟中的对错并不重要，它们只是种辅助，帮助你在实战中做出正确的选择。",
@@ -2559,6 +2575,14 @@
"sortId": 60115,
"usage": "装有狂欢节上可能用到的各种物资补给，包含多种随机材料。"
},
"randomMaterial_act42side": {
"classifyType": "CONSUME",
"description": "潘格尼尼的铳械工坊从来没有所谓“废料”，铳械定制过程中产生的余料，会被学徒梵里妮精心加工成小小的工艺品，作为赠品送给客户。",
"icon": "randomMaterial_act42side.png",
"name": "铳械工坊赠品盒",
"sortId": 60116,
"usage": "装有铳械工坊送来的各种物资补给，包含多种随机材料。"
},
"randomMaterial_leith2": {
"classifyType": "CONSUME",
"description": "“尽管内里如心声般各不相似，它们也足以成为你探寻真相的助力。跟随尚未忘却的回响，你终会抓住那个答案。”",

18
resource/recruitment.json
View File

@@ -36,6 +36,12 @@
"rarity": 1,
"tags": ["支援机械", "元素", "远程位", "辅助干员"]
},
{
"id": "char_4188_confes",
"name": "CONFESS-47",
"rarity": 1,
"tags": ["支援机械", "控场", "近战位", "先锋干员"]
},
{
"id": "char_502_nblade",
"name": "夜刀",
@@ -702,6 +708,12 @@
"rarity": 5,
"tags": ["输出", "远程位", "资深干员", "术师干员"]
},
{
"id": "char_455_nothin",
"name": "乌有",
"rarity": 5,
"tags": ["快速复活", "输出", "近战位", "资深干员", "特种干员"]
},
{
"id": "char_103_angel",
"name": "能天使",
@@ -875,6 +887,12 @@
"name": "空弦",
"rarity": 6,
"tags": ["输出", "远程位", "高级资深干员", "狙击干员"]
},
{
"id": "char_362_saga",
"name": "嵯峨",
"rarity": 6,
"tags": ["费用回复", "输出", "近战位", "高级资深干员", "先锋干员"]
}
],
"tags": {

BIN
resource/template/infrast/Bskill_meet_spd_confes1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
resource/template/infrast/Bskill_power_rec_spd_ext&faction.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
resource/template/infrast/Bskill_tra_laterano1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
resource/template/infrast/Bskill_tra_lemuen1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
resource/template/items/LMTGS_COIN_6101.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
resource/template/items/act42side_token_pacifier.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
resource/template/items/randomMaterial_act42side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

8
resource/version.json
View File

@@ -1,11 +1,11 @@
{
"activity": {
"name": "争锋频道：青草城",
"time": 1745674200
"name": "众生行记",
"time": 1746072000
},
"gacha": {
"pool": "如死亦终",
"time": 1745222400
"pool": "布道自由",
"time": 1746072000
},
"last_updated": "2025-04-30 20:06:49.664"
}

32
tools/ResourceUpdater/main.cpp
View File

@@ -203,11 +203,11 @@ bool run_parallel_tasks(
}
std::cout << "------- Update version info for Official -------" << '\n';
if (!update_version_info(official_data_dir / "gamedata" / "excel", resource_dir)) {
std::cerr << "update_version_info failed" << '\n';
std::cerr << "update_version_info failed for Official" << '\n';
error_occurred.store(true);
}
else {
std::cout << ">Done version Official" << '\n';
std::cout << ">Done version for Official" << '\n';
}
std::vector<std::thread> version_threads;
@@ -217,7 +217,7 @@ bool run_parallel_tasks(
if (error_occurred.load()) {
return;
}
std::cout << "------- Update version info " << out << " -------" << '\n';
std::cout << "------- Update version info for " << out << " -------" << '\n';
if (!update_version_info(
overseas_data_dir / in / "gamedata" / "excel",
resource_dir / "global" / out / "resource")) {
@@ -225,7 +225,7 @@ bool run_parallel_tasks(
error_occurred.store(true);
}
else {
std::cout << ">Done version " << out << '\n';
std::cout << ">Done version for " << out << '\n';
}
});
}
@@ -240,16 +240,16 @@ bool run_parallel_tasks(
if (error_occurred.load()) {
return;
}
std::cout << "------- OCR replace " << out << " -------" << '\n';
std::cout << "------- OCR replace for " << out << " -------" << '\n';
if (!ocr_replace_overseas(
overseas_data_dir / in / "gamedata" / "excel",
resource_dir / "global" / out / "resource" / "tasks",
official_data_dir / "gamedata" / "excel")) {
std::cerr << "ocr_replace_overseas failed " << out << '\n';
std::cerr << "ocr_replace_overseas failed for " << out << '\n';
error_occurred.store(true);
}
else {
std::cout << ">Done OCR replace " << out << '\n';
std::cout << ">Done OCR replace for " << out << '\n';
}
}
});
@@ -263,11 +263,11 @@ bool run_parallel_tasks(
official_data_dir / "gamedata" / "excel",
resource_dir / "recruitment.json",
true)) {
std::cerr << "Update recruitment data failed" << '\n';
std::cerr << "Update recruitment data failed for Official" << '\n';
error_occurred.store(true);
}
else {
std::cout << ">Done recruitment Official" << '\n';
std::cout << ">Done recruitment for Official" << '\n';
}
std::vector<std::thread> recruitment_threads;
@@ -282,11 +282,11 @@ bool run_parallel_tasks(
overseas_data_dir / in / "gamedata" / "excel",
resource_dir / "global" / out / "resource" / "recruitment.json",
false)) {
std::cerr << "update_recruitment_data failed " << out << '\n';
std::cerr << "update_recruitment_data failed for " << out << '\n';
error_occurred.store(true);
}
else {
std::cout << ">Done recruitment " << out << '\n';
std::cout << ">Done recruitment for " << out << '\n';
}
});
}
@@ -302,11 +302,11 @@ bool run_parallel_tasks(
}
std::cout << "------- Update items data for Official -------" << '\n';
if (!update_items_data(official_data_dir, resource_dir, true)) {
std::cerr << "Update items data failed" << '\n';
std::cerr << "Update items data failed for Official" << '\n';
error_occurred.store(true);
}
else {
std::cout << ">Done items Official" << '\n';
std::cout << ">Done items for Official" << '\n';
}
std::vector<std::thread> items_threads;
@@ -316,16 +316,16 @@ bool run_parallel_tasks(
if (error_occurred.load()) {
return;
}
std::cout << "------- Update items data " << out << " -------" << '\n';
std::cout << "------- Update items data for " << out << " -------" << '\n';
if (!update_items_data(
overseas_data_dir / in / "gamedata" / "excel",
resource_dir / "global" / out / "resource",
false)) {
std::cerr << "update_items_data failed " << out << '\n';
std::cerr << "update_items_data failed for " << out << '\n';
error_occurred.store(true);
}
else {
std::cout << ">Done items " << out << '\n';
std::cout << ">Done items for " << out << '\n';
}
});
}