Skip to content

Commit d8b296a

Browse files
LmeSzincLmeSzinc
authored
Merge pull request LmeSzinc#5707 from LmeSzinc/dev
Bug fix
2 parents 8803c90 + f42efdd commit d8b296a

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
@@ -1642,7 +1642,6 @@
16421642
"type": "select",
16431643
"value": "campaign_main",
16441644
"option": [
1645-
"event_20220818_cn",
16461645
"event_20260520_cn"
16471646
],
16481647
"option_cn": [
@@ -1655,10 +1654,9 @@
16551654
"event_20260520_cn"
16561655
],
16571656
"option_tw": [
1658-
"event_20220818_cn"
1657+
"event_20260520_cn"
16591658
],
16601659
"option_bold": [
1661-
"event_20220818_cn",
16621660
"event_20260520_cn"
16631661
]
16641662
},
@@ -1924,7 +1922,6 @@
19241922
"type": "select",
19251923
"value": "campaign_main",
19261924
"option": [
1927-
"event_20220818_cn",
19281925
"event_20260520_cn"
19291926
],
19301927
"option_cn": [
@@ -1937,10 +1934,9 @@
19371934
"event_20260520_cn"
19381935
],
19391936
"option_tw": [
1940-
"event_20220818_cn"
1937+
"event_20260520_cn"
19411938
],
19421939
"option_bold": [
1943-
"event_20220818_cn",
19441940
"event_20260520_cn"
19451941
]
19461942
},
@@ -2321,7 +2317,6 @@
23212317
"type": "select",
23222318
"value": "campaign_main",
23232319
"option": [
2324-
"event_20220818_cn",
23252320
"event_20260520_cn"
23262321
],
23272322
"option_cn": [
@@ -2334,10 +2329,9 @@
23342329
"event_20260520_cn"
23352330
],
23362331
"option_tw": [
2337-
"event_20220818_cn"
2332+
"event_20260520_cn"
23382333
],
23392334
"option_bold": [
2340-
"event_20220818_cn",
23412335
"event_20260520_cn"
23422336
]
23432337
},
@@ -4058,7 +4052,6 @@
40584052
"type": "select",
40594053
"value": "campaign_main",
40604054
"option": [
4061-
"event_20220818_cn",
40624055
"event_20260520_cn"
40634056
],
40644057
"option_cn": [
@@ -4071,10 +4064,9 @@
40714064
"event_20260520_cn"
40724065
],
40734066
"option_tw": [
4074-
"event_20220818_cn"
4067+
"event_20260520_cn"
40754068
],
40764069
"option_bold": [
4077-
"event_20220818_cn",
40784070
"event_20260520_cn"
40794071
]
40804072
},
@@ -4472,7 +4464,6 @@
44724464
"type": "select",
44734465
"value": "campaign_main",
44744466
"option": [
4475-
"event_20220818_cn",
44764467
"event_20260520_cn"
44774468
],
44784469
"option_cn": [
@@ -4485,10 +4476,9 @@
44854476
"event_20260520_cn"
44864477
],
44874478
"option_tw": [
4488-
"event_20220818_cn"
4479+
"event_20260520_cn"
44894480
],
44904481
"option_bold": [
4491-
"event_20220818_cn",
44924482
"event_20260520_cn"
44934483
]
44944484
},
@@ -4886,7 +4876,6 @@
48864876
"type": "select",
48874877
"value": "campaign_main",
48884878
"option": [
4889-
"event_20220818_cn",
48904879
"event_20260520_cn"
48914880
],
48924881
"option_cn": [
@@ -4899,10 +4888,9 @@
48994888
"event_20260520_cn"
49004889
],
49014890
"option_tw": [
4902-
"event_20220818_cn"
4891+
"event_20260520_cn"
49034892
],
49044893
"option_bold": [
4905-
"event_20220818_cn",
49064894
"event_20260520_cn"
49074895
]
49084896
},
@@ -5300,7 +5288,6 @@
53005288
"type": "select",
53015289
"value": "campaign_main",
53025290
"option": [
5303-
"event_20220818_cn",
53045291
"event_20260520_cn"
53055292
],
53065293
"option_cn": [
@@ -5313,10 +5300,9 @@
53135300
"event_20260520_cn"
53145301
],
53155302
"option_tw": [
5316-
"event_20220818_cn"
5303+
"event_20260520_cn"
53175304
],
53185305
"option_bold": [
5319-
"event_20220818_cn",
53205306
"event_20260520_cn"
53215307
]
53225308
},
@@ -5704,7 +5690,6 @@
57045690
"type": "select",
57055691
"value": "campaign_main",
57065692
"option": [
5707-
"event_20220818_cn",
57085693
"event_20260520_cn"
57095694
],
57105695
"option_cn": [
@@ -5717,10 +5702,9 @@
57175702
"event_20260520_cn"
57185703
],
57195704
"option_tw": [
5720-
"event_20220818_cn"
5705+
"event_20260520_cn"
57215706
],
57225707
"option_bold": [
5723-
"event_20220818_cn",
57245708
"event_20260520_cn"
57255709
]
57265710
},

‎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)