Skip to content

Commit 7e7adc1

Browse files
sync[bot]sync[bot]
committed
Merge remote-tracking branch 'upstream/master'
2 parents 673aeb2 + 12df3ef commit 7e7adc1

19 files changed

Lines changed: 63 additions & 39 deletions

File tree

‎assets/cn/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png‎

12.4 KB
Loading

‎assets/en/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png‎

12.4 KB
Loading

‎assets/jp/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png‎

12.4 KB
Loading

‎assets/tw/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png‎

12.4 KB
Loading

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,3 +274,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
274274
| 20251211 | event 20251023 cn | Tempesta and Islas de Libertád | - | - | - | 颶風與自由群島 |
275275
| 20251218 | event 20251218 cn | A Note Through the Firmament | 响彻于天穹之音 | A Note Through the Firmament | 天穹に響く音謡 | - |
276276
| 20251231 | event 20251218 cn | A Note Through the Firmament | - | - | - | 響徹於天穹之音 |
277+
| 20260115 | event 20231221 cn | Light-Chasing Sea of Stars Rerun | 复刻星海逐光 | Light-Chasing Sea of Stars Rerun | 光追う星の海（復刻） | - |

‎campaign/event_20231026_cn/t2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Config(ConfigBase):
5858
MAP_HAS_MYSTERY = False
5959
# ===== End of generated config =====
6060

61-
MAP_SIREN_HAS_BOSS_ICON = True
61+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
6262
MAP_SWIPE_MULTIPLY = (1.223, 1.246)
6363
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.183, 1.205)
6464
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.149, 1.169)

‎campaign/event_20231026_cn/t5.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Config(ConfigBase):
6666
MAP_HAS_MYSTERY = False
6767
# ===== End of generated config =====
6868

69-
MAP_SIREN_HAS_BOSS_ICON = True
69+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
7070
MAP_SWIPE_MULTIPLY = (0.991, 1.009)
7171
MAP_SWIPE_MULTIPLY_MINITOUCH = (0.958, 0.976)
7272
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.930, 0.947)

‎campaign/war_archives_20231026_cn/t2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Config(ConfigBase):
5858
MAP_HAS_MYSTERY = False
5959
# ===== End of generated config =====
6060

61-
MAP_SIREN_HAS_BOSS_ICON = True
61+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
6262
MAP_SWIPE_MULTIPLY = (1.223, 1.246)
6363
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.183, 1.205)
6464
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.149, 1.169)

‎campaign/war_archives_20231026_cn/t5.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Config(ConfigBase):
6666
MAP_HAS_MYSTERY = False
6767
# ===== End of generated config =====
6868

69-
MAP_SIREN_HAS_BOSS_ICON = True
69+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
7070
MAP_SWIPE_MULTIPLY = (0.991, 1.009)
7171
MAP_SWIPE_MULTIPLY_MINITOUCH = (0.958, 0.976)
7272
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.930, 0.947)

‎module/config/argument/args.json‎

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,22 +1648,24 @@
16481648
"type": "select",
16491649
"value": "campaign_main",
16501650
"option": [
1651+
"event_20231221_cn",
16511652
"event_20251218_cn"
16521653
],
16531654
"display": "hide",
16541655
"option_cn": [
1655-
"event_20251218_cn"
1656+
"event_20231221_cn"
16561657
],
16571658
"option_en": [
1658-
"event_20251218_cn"
1659+
"event_20231221_cn"
16591660
],
16601661
"option_jp": [
1661-
"event_20251218_cn"
1662+
"event_20231221_cn"
16621663
],
16631664
"option_tw": [
16641665
"event_20251218_cn"
16651666
],
16661667
"option_bold": [
1668+
"event_20231221_cn",
16671669
"event_20251218_cn"
16681670
]
16691671
},
@@ -1967,21 +1969,23 @@
19671969
"type": "state",
19681970
"value": "campaign_main",
19691971
"option": [
1972+
"event_20231221_cn",
19701973
"event_20251218_cn"
19711974
],
19721975
"option_cn": [
1973-
"event_20251218_cn"
1976+
"event_20231221_cn"
19741977
],
19751978
"option_en": [
1976-
"event_20251218_cn"
1979+
"event_20231221_cn"
19771980
],
19781981
"option_jp": [
1979-
"event_20251218_cn"
1982+
"event_20231221_cn"
19801983
],
19811984
"option_tw": [
19821985
"event_20251218_cn"
19831986
],
19841987
"option_bold": [
1988+
"event_20231221_cn",
19851989
"event_20251218_cn"
19861990
]
19871991
},
@@ -2360,21 +2364,23 @@
23602364
"type": "state",
23612365
"value": "campaign_main",
23622366
"option": [
2367+
"event_20231221_cn",
23632368
"event_20251218_cn"
23642369
],
23652370
"option_cn": [
2366-
"event_20251218_cn"
2371+
"event_20231221_cn"
23672372
],
23682373
"option_en": [
2369-
"event_20251218_cn"
2374+
"event_20231221_cn"
23702375
],
23712376
"option_jp": [
2372-
"event_20251218_cn"
2377+
"event_20231221_cn"
23732378
],
23742379
"option_tw": [
23752380
"event_20251218_cn"
23762381
],
23772382
"option_bold": [
2383+
"event_20231221_cn",
23782384
"event_20251218_cn"
23792385
]
23802386
},
@@ -4084,21 +4090,23 @@
40844090
"type": "state",
40854091
"value": "campaign_main",
40864092
"option": [
4093+
"event_20231221_cn",
40874094
"event_20251218_cn"
40884095
],
40894096
"option_cn": [
4090-
"event_20251218_cn"
4097+
"event_20231221_cn"
40914098
],
40924099
"option_en": [
4093-
"event_20251218_cn"
4100+
"event_20231221_cn"
40944101
],
40954102
"option_jp": [
4096-
"event_20251218_cn"
4103+
"event_20231221_cn"
40974104
],
40984105
"option_tw": [
40994106
"event_20251218_cn"
41004107
],
41014108
"option_bold": [
4109+
"event_20231221_cn",
41024110
"event_20251218_cn"
41034111
]
41044112
},
@@ -4494,21 +4502,23 @@
44944502
"type": "state",
44954503
"value": "campaign_main",
44964504
"option": [
4505+
"event_20231221_cn",
44974506
"event_20251218_cn"
44984507
],
44994508
"option_cn": [
4500-
"event_20251218_cn"
4509+
"event_20231221_cn"
45014510
],
45024511
"option_en": [
4503-
"event_20251218_cn"
4512+
"event_20231221_cn"
45044513
],
45054514
"option_jp": [
4506-
"event_20251218_cn"
4515+
"event_20231221_cn"
45074516
],
45084517
"option_tw": [
45094518
"event_20251218_cn"
45104519
],
45114520
"option_bold": [
4521+
"event_20231221_cn",
45124522
"event_20251218_cn"
45134523
]
45144524
},
@@ -4904,21 +4914,23 @@
49044914
"type": "state",
49054915
"value": "campaign_main",
49064916
"option": [
4917+
"event_20231221_cn",
49074918
"event_20251218_cn"
49084919
],
49094920
"option_cn": [
4910-
"event_20251218_cn"
4921+
"event_20231221_cn"
49114922
],
49124923
"option_en": [
4913-
"event_20251218_cn"
4924+
"event_20231221_cn"
49144925
],
49154926
"option_jp": [
4916-
"event_20251218_cn"
4927+
"event_20231221_cn"
49174928
],
49184929
"option_tw": [
49194930
"event_20251218_cn"
49204931
],
49214932
"option_bold": [
4933+
"event_20231221_cn",
49224934
"event_20251218_cn"
49234935
]
49244936
},
@@ -5314,21 +5326,23 @@
53145326
"type": "state",
53155327
"value": "campaign_main",
53165328
"option": [
5329+
"event_20231221_cn",
53175330
"event_20251218_cn"
53185331
],
53195332
"option_cn": [
5320-
"event_20251218_cn"
5333+
"event_20231221_cn"
53215334
],
53225335
"option_en": [
5323-
"event_20251218_cn"
5336+
"event_20231221_cn"
53245337
],
53255338
"option_jp": [
5326-
"event_20251218_cn"
5339+
"event_20231221_cn"
53275340
],
53285341
"option_tw": [
53295342
"event_20251218_cn"
53305343
],
53315344
"option_bold": [
5345+
"event_20231221_cn",
53325346
"event_20251218_cn"
53335347
]
53345348
},
@@ -5714,21 +5728,23 @@
57145728
"type": "state",
57155729
"value": "campaign_main",
57165730
"option": [
5731+
"event_20231221_cn",
57175732
"event_20251218_cn"
57185733
],
57195734
"option_cn": [
5720-
"event_20251218_cn"
5735+
"event_20231221_cn"
57215736
],
57225737
"option_en": [
5723-
"event_20251218_cn"
5738+
"event_20231221_cn"
57245739
],
57255740
"option_jp": [
5726-
"event_20251218_cn"
5741+
"event_20231221_cn"
57275742
],
57285743
"option_tw": [
57295744
"event_20251218_cn"
57305745
],
57315746
"option_bold": [
5747+
"event_20231221_cn",
57325748
"event_20251218_cn"
57335749
]
57345750
},
@@ -8278,7 +8294,8 @@
82788294
"noshiro",
82798295
"sirius",
82808296
"new_jersey",
8281-
"taihou"
8297+
"taihou",
8298+
"aegir"
82828299
]
82838300
}
82848301
},

0 commit comments

Comments
 (0)