1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:59:24 +08:00

Merge remote-tracking branch 'LmeSzinc/master' into dev

# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/ui/ui.py
This commit is contained in:
0O0o0oOoO00
2025-06-28 23:01:31 +08:00
74 changed files with 583 additions and 446 deletions

View File

@@ -166,6 +166,10 @@
"name": "War Archives",
"help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search"
},
"CoalitionSp": {
"name": "Little Academy SP",
"help": ""
},
"EventA": {
"name": "Event Daily A",
"help": ""
@@ -190,10 +194,6 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "Little Academy SP",
"help": ""
},
"Commission": {
"name": "Commission",
"help": ""
@@ -1029,6 +1029,7 @@
"campaign_main": "campaign_main",
"coalition_20230323": "Frostfall",
"coalition_20240627": "Welcome to Little Academy",
"coalition_20250626": "The Neon City Investigator",
"event_20200227_cn": "Northern Overture",
"event_20200312_cn": "The Solomon Ranger Rerun",
"event_20200326_cn": "Microlayer Medley",
@@ -1084,7 +1085,7 @@
"event_20221124_cn": "The Alchemist and the Archipelago of Secrets",
"event_20221222_cn": "Parallel Superimposition Rerun",
"event_20230223_cn": "Revelations of Dust Rerun",
"event_20230525_cn": "Confluence of Nothingness",
"event_20230525_cn": "Confluence of Nothingness Rerun",
"event_20230803_cn": "Anthem of Remembrance",
"event_20230817_cn": "The Fools Scales",
"event_20230914_cn": "Effulgence Before Eclipse",
@@ -2267,9 +2268,9 @@
"Mode": {
"name": "Mode",
"help": "SP needs to use event daily SP to run",
"tc1": "tc1",
"tc2": "tc2",
"tc3": "tc3",
"easy": "easy",
"normal": "normal",
"hard": "hard",
"sp": "sp",
"ex": "EX"
},