LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:49:26 +08:00
Code Activity

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

Browse Source 
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
This commit is contained in:
0O0o0oOoO00
2026-02-28 12:16:14 +08:00
parent d797b30488 2a2901d218
commit 76b6435ee6
30 changed files with 1251 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
module/config/argument/args.json
View File

@@ -3521,10 +3521,12 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"display": "hide",
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -3594,6 +3596,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -3666,6 +3669,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -4314,9 +4318,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -4386,6 +4392,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -4458,6 +4465,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -5055,9 +5063,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -5127,6 +5137,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -5199,6 +5210,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -5796,9 +5808,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -5868,6 +5882,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -5940,6 +5955,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -6537,9 +6553,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -6609,6 +6627,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -6681,6 +6700,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -7278,9 +7298,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -7350,6 +7372,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -7422,6 +7445,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -8019,9 +8043,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -8091,6 +8117,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -8163,6 +8190,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -10671,9 +10699,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -10743,6 +10773,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -10815,6 +10846,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -11429,9 +11461,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -11501,6 +11535,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -11573,6 +11608,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -12187,9 +12223,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -12259,6 +12297,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -12331,6 +12370,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -12945,9 +12985,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -13017,6 +13059,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -13089,6 +13132,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -13693,9 +13737,11 @@
"event_20250912_cn",
"event_20251023_cn",
"event_20251218_cn",
"event_20260226_cn",
"event_general_cn"
],
"option_cn": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -13765,6 +13811,7 @@
"event_general_cn"
],
"option_en": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -13837,6 +13884,7 @@
"event_20200227_cn"
],
"option_jp": [
"event_20260226_cn",
"event_20231221_cn",
"event_20251218_cn",
"event_20230914_cn",
@@ -16270,7 +16318,8 @@
"option": [
2,
3,
4
4,
5
]
},
"ShipIndex": {
@@ -16305,7 +16354,8 @@
2,
3,
4,
5
5,
6
]
},
"ShipIndex": {