1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00

Merge branch 'master' into dev-minigame-for-pr

# Conflicts:
#	module/ui/assets.py
This commit is contained in:
yypsybs
2023-09-11 10:29:52 +08:00
47 changed files with 1272 additions and 66 deletions

View File

@@ -3289,6 +3289,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"war_archives_20201229_cn",
"war_archives_20220414_cn",
"war_archives_20220210_cn",
"war_archives_20211028_cn",
@@ -3312,10 +3313,10 @@
"war_archives_20191031_en",
"war_archives_20181020_en"
],
"cn": "war_archives_20220414_cn",
"en": "war_archives_20220414_cn",
"jp": "war_archives_20220414_cn",
"tw": "war_archives_20220414_cn"
"cn": "war_archives_20201229_cn",
"en": "war_archives_20201229_cn",
"jp": "war_archives_20201229_cn",
"tw": "war_archives_20201229_cn"
},
"Mode": {
"type": "select",