Skip to content

Commit 1345a21

Browse files
sync[bot]sync[bot]
committed
Merge remote-tracking branch 'upstream/master'
2 parents 9dd7982 + ffded5b commit 1345a21

3 files changed

Lines changed: 26 additions & 17 deletions

File tree

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
294294
| 20260417 | event 20250424 cn | Toward Tulipa’s Seas Rerun | 复刻扬起郁金之旗 | Toward Tulipa’s Seas Rerun | チュリッパの海へ（復刻） | - |
295295
| 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | - | - | - | 假日航線閃耀海濱 |
296296
| 20260417 | event 20201126 cn | Vacation Lane Rerun | - | - | - | 復刻假日航線 |
297+
| 20260514 | event 20221222 cn | Parallel Superimposition | - | - | - | 復刻定向折疊 |

‎module/config/argument/args.json‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,6 +1657,7 @@
16571657
"value": "campaign_main",
16581658
"option": [
16591659
"event_20201126_cn",
1660+
"event_20221222_cn",
16601661
"event_20250424_cn",
16611662
"event_20260417_cn"
16621663
],
@@ -1676,11 +1677,11 @@
16761677
"event_20260417_cn"
16771678
],
16781679
"option_tw": [
1679-
"event_20201126_cn",
1680-
"event_20260417_cn"
1680+
"event_20221222_cn"
16811681
],
16821682
"option_bold": [
16831683
"event_20201126_cn",
1684+
"event_20221222_cn",
16841685
"event_20250424_cn",
16851686
"event_20260417_cn"
16861687
]
@@ -1988,6 +1989,7 @@
19881989
"value": "campaign_main",
19891990
"option": [
19901991
"event_20201126_cn",
1992+
"event_20221222_cn",
19911993
"event_20250424_cn",
19921994
"event_20260417_cn"
19931995
],
@@ -2007,11 +2009,11 @@
20072009
"event_20260417_cn"
20082010
],
20092011
"option_tw": [
2010-
"event_20201126_cn",
2011-
"event_20260417_cn"
2012+
"event_20221222_cn"
20122013
],
20132014
"option_bold": [
20142015
"event_20201126_cn",
2016+
"event_20221222_cn",
20152017
"event_20250424_cn",
20162018
"event_20260417_cn"
20172019
]
@@ -2394,6 +2396,7 @@
23942396
"value": "campaign_main",
23952397
"option": [
23962398
"event_20201126_cn",
2399+
"event_20221222_cn",
23972400
"event_20250424_cn",
23982401
"event_20260417_cn"
23992402
],
@@ -2413,11 +2416,11 @@
24132416
"event_20260417_cn"
24142417
],
24152418
"option_tw": [
2416-
"event_20201126_cn",
2417-
"event_20260417_cn"
2419+
"event_20221222_cn"
24182420
],
24192421
"option_bold": [
24202422
"event_20201126_cn",
2423+
"event_20221222_cn",
24212424
"event_20250424_cn",
24222425
"event_20260417_cn"
24232426
]
@@ -4140,6 +4143,7 @@
41404143
"value": "campaign_main",
41414144
"option": [
41424145
"event_20201126_cn",
4146+
"event_20221222_cn",
41434147
"event_20250424_cn",
41444148
"event_20260417_cn"
41454149
],
@@ -4159,11 +4163,11 @@
41594163
"event_20260417_cn"
41604164
],
41614165
"option_tw": [
4162-
"event_20201126_cn",
4163-
"event_20260417_cn"
4166+
"event_20221222_cn"
41644167
],
41654168
"option_bold": [
41664169
"event_20201126_cn",
4170+
"event_20221222_cn",
41674171
"event_20250424_cn",
41684172
"event_20260417_cn"
41694173
]
@@ -4563,6 +4567,7 @@
45634567
"value": "campaign_main",
45644568
"option": [
45654569
"event_20201126_cn",
4570+
"event_20221222_cn",
45664571
"event_20250424_cn",
45674572
"event_20260417_cn"
45684573
],
@@ -4582,11 +4587,11 @@
45824587
"event_20260417_cn"
45834588
],
45844589
"option_tw": [
4585-
"event_20201126_cn",
4586-
"event_20260417_cn"
4590+
"event_20221222_cn"
45874591
],
45884592
"option_bold": [
45894593
"event_20201126_cn",
4594+
"event_20221222_cn",
45904595
"event_20250424_cn",
45914596
"event_20260417_cn"
45924597
]
@@ -4986,6 +4991,7 @@
49864991
"value": "campaign_main",
49874992
"option": [
49884993
"event_20201126_cn",
4994+
"event_20221222_cn",
49894995
"event_20250424_cn",
49904996
"event_20260417_cn"
49914997
],
@@ -5005,11 +5011,11 @@
50055011
"event_20260417_cn"
50065012
],
50075013
"option_tw": [
5008-
"event_20201126_cn",
5009-
"event_20260417_cn"
5014+
"event_20221222_cn"
50105015
],
50115016
"option_bold": [
50125017
"event_20201126_cn",
5018+
"event_20221222_cn",
50135019
"event_20250424_cn",
50145020
"event_20260417_cn"
50155021
]
@@ -5409,6 +5415,7 @@
54095415
"value": "campaign_main",
54105416
"option": [
54115417
"event_20201126_cn",
5418+
"event_20221222_cn",
54125419
"event_20250424_cn",
54135420
"event_20260417_cn"
54145421
],
@@ -5428,11 +5435,11 @@
54285435
"event_20260417_cn"
54295436
],
54305437
"option_tw": [
5431-
"event_20201126_cn",
5432-
"event_20260417_cn"
5438+
"event_20221222_cn"
54335439
],
54345440
"option_bold": [
54355441
"event_20201126_cn",
5442+
"event_20221222_cn",
54365443
"event_20250424_cn",
54375444
"event_20260417_cn"
54385445
]
@@ -5822,6 +5829,7 @@
58225829
"value": "campaign_main",
58235830
"option": [
58245831
"event_20201126_cn",
5832+
"event_20221222_cn",
58255833
"event_20250424_cn",
58265834
"event_20260417_cn"
58275835
],
@@ -5841,11 +5849,11 @@
58415849
"event_20260417_cn"
58425850
],
58435851
"option_tw": [
5844-
"event_20201126_cn",
5845-
"event_20260417_cn"
5852+
"event_20221222_cn"
58465853
],
58475854
"option_bold": [
58485855
"event_20201126_cn",
5856+
"event_20221222_cn",
58495857
"event_20250424_cn",
58505858
"event_20260417_cn"
58515859
]

‎module/config/i18n/zh-TW.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@
740740
"event_20220818_cn": "遠匯點作戰",
741741
"event_20220915_cn": "復刻紫絳槿嵐",
742742
"event_20221124_cn": "復刻鍊金術士與秘密遺跡群島",
743-
"event_20221222_cn": "定向折疊",
743+
"event_20221222_cn": "復刻定向折疊",
744744
"event_20230223_cn": "湮燼塵墟",
745745
"event_20230525_cn": "空相交會點",
746746
"event_20230803_cn": "奏響鳶尾之歌",

0 commit comments

Comments
 (0)