Skip to content

Commit dcc094e

Browse files
sync[bot]sync[bot]
committed
Merge remote-tracking branch 'upstream/master'
2 parents fda0dcf + d8b296a commit dcc094e

4 files changed

Lines changed: 10 additions & 25 deletions

File tree

assets/shop/merit/Z24 .png renamed to assets/shop/merit/Z24.png

File renamed without changes.

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,3 +297,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
297297
| 20260514 | event 20221222 cn | Parallel Superimposition | - | - | - | 復刻定向折疊 |
298298
| 20260520 | event 20260520 cn | Alliance Before the Hagiobull | 圣印前的同盟 | Alliance Before the Hagiobull | 聖印前の同盟 | - |
299299
| 20260528 | event 20220818 cn | Operation Convergence | - | - | - | 復刻遠匯點作戰 |
300+
| 20260605 | event 20260520 cn | Alliance Before the Hagiobull | - | - | - | 聖印前的同盟 |

‎module/config/argument/args.json‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,7 +1656,6 @@
16561656
"type": "select",
16571657
"value": "campaign_main",
16581658
"option": [
1659-
"event_20220818_cn",
16601659
"event_20260520_cn"
16611660
],
16621661
"option_cn": [
@@ -1669,10 +1668,9 @@
16691668
"event_20260520_cn"
16701669
],
16711670
"option_tw": [
1672-
"event_20220818_cn"
1671+
"event_20260520_cn"
16731672
],
16741673
"option_bold": [
1675-
"event_20220818_cn",
16761674
"event_20260520_cn"
16771675
]
16781676
},
@@ -1978,7 +1976,6 @@
19781976
"type": "select",
19791977
"value": "campaign_main",
19801978
"option": [
1981-
"event_20220818_cn",
19821979
"event_20260520_cn"
19831980
],
19841981
"option_cn": [
@@ -1991,10 +1988,9 @@
19911988
"event_20260520_cn"
19921989
],
19931990
"option_tw": [
1994-
"event_20220818_cn"
1991+
"event_20260520_cn"
19951992
],
19961993
"option_bold": [
1997-
"event_20220818_cn",
19981994
"event_20260520_cn"
19991995
]
20001996
},
@@ -2375,7 +2371,6 @@
23752371
"type": "select",
23762372
"value": "campaign_main",
23772373
"option": [
2378-
"event_20220818_cn",
23792374
"event_20260520_cn"
23802375
],
23812376
"option_cn": [
@@ -2388,10 +2383,9 @@
23882383
"event_20260520_cn"
23892384
],
23902385
"option_tw": [
2391-
"event_20220818_cn"
2386+
"event_20260520_cn"
23922387
],
23932388
"option_bold": [
2394-
"event_20220818_cn",
23952389
"event_20260520_cn"
23962390
]
23972391
},
@@ -4112,7 +4106,6 @@
41124106
"type": "select",
41134107
"value": "campaign_main",
41144108
"option": [
4115-
"event_20220818_cn",
41164109
"event_20260520_cn"
41174110
],
41184111
"option_cn": [
@@ -4125,10 +4118,9 @@
41254118
"event_20260520_cn"
41264119
],
41274120
"option_tw": [
4128-
"event_20220818_cn"
4121+
"event_20260520_cn"
41294122
],
41304123
"option_bold": [
4131-
"event_20220818_cn",
41324124
"event_20260520_cn"
41334125
]
41344126
},
@@ -4526,7 +4518,6 @@
45264518
"type": "select",
45274519
"value": "campaign_main",
45284520
"option": [
4529-
"event_20220818_cn",
45304521
"event_20260520_cn"
45314522
],
45324523
"option_cn": [
@@ -4539,10 +4530,9 @@
45394530
"event_20260520_cn"
45404531
],
45414532
"option_tw": [
4542-
"event_20220818_cn"
4533+
"event_20260520_cn"
45434534
],
45444535
"option_bold": [
4545-
"event_20220818_cn",
45464536
"event_20260520_cn"
45474537
]
45484538
},
@@ -4940,7 +4930,6 @@
49404930
"type": "select",
49414931
"value": "campaign_main",
49424932
"option": [
4943-
"event_20220818_cn",
49444933
"event_20260520_cn"
49454934
],
49464935
"option_cn": [
@@ -4953,10 +4942,9 @@
49534942
"event_20260520_cn"
49544943
],
49554944
"option_tw": [
4956-
"event_20220818_cn"
4945+
"event_20260520_cn"
49574946
],
49584947
"option_bold": [
4959-
"event_20220818_cn",
49604948
"event_20260520_cn"
49614949
]
49624950
},
@@ -5354,7 +5342,6 @@
53545342
"type": "select",
53555343
"value": "campaign_main",
53565344
"option": [
5357-
"event_20220818_cn",
53585345
"event_20260520_cn"
53595346
],
53605347
"option_cn": [
@@ -5367,10 +5354,9 @@
53675354
"event_20260520_cn"
53685355
],
53695356
"option_tw": [
5370-
"event_20220818_cn"
5357+
"event_20260520_cn"
53715358
],
53725359
"option_bold": [
5373-
"event_20220818_cn",
53745360
"event_20260520_cn"
53755361
]
53765362
},
@@ -5758,7 +5744,6 @@
57585744
"type": "select",
57595745
"value": "campaign_main",
57605746
"option": [
5761-
"event_20220818_cn",
57625747
"event_20260520_cn"
57635748
],
57645749
"option_cn": [
@@ -5771,10 +5756,9 @@
57715756
"event_20260520_cn"
57725757
],
57735758
"option_tw": [
5774-
"event_20220818_cn"
5759+
"event_20260520_cn"
57755760
],
57765761
"option_bold": [
5777-
"event_20220818_cn",
57785762
"event_20260520_cn"
57795763
]
57805764
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@
770770
"event_20260226_cn": "春滿客棧Online",
771771
"event_20260326_cn": "漫遊者招募計劃",
772772
"event_20260417_cn": "假日航線閃耀海濱",
773-
"event_20260520_cn": "Alliance Before the Hagiobull",
773+
"event_20260520_cn": "聖印前的同盟",
774774
"raid_20200624": "特別演習埃塞克斯級(復刻)",
775775
"raid_20210708": "復刻穿越彼方的水線",
776776
"raid_20220127": "演習神秘事件調查",

0 commit comments

Comments
 (0)