sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	module/device/method/pool.py
This commit is contained in:
LmeSzinc
2025-05-18 03:15:41 +08:00
parent 96475813a9 e7fed79ad1
commit 79d72c4fa0
39 changed files with 414 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1717,13 +1717,13 @@
],
"display": "hide",
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",
@@ -2061,13 +2061,13 @@
"event_20250424_cn"
],
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",
@@ -2520,13 +2520,13 @@
"event_20250424_cn"
],
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",
@@ -4119,13 +4119,13 @@
"event_20250424_cn"
],
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",
@@ -4595,13 +4595,13 @@
"event_20250424_cn"
],
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",
@@ -5071,13 +5071,13 @@
"event_20250424_cn"
],
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",
@@ -5547,13 +5547,13 @@
"event_20250424_cn"
],
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",
@@ -6013,13 +6013,13 @@
"event_20250424_cn"
],
"option_bold": [
"event_20241024_cn",
"event_20240912_cn",
"event_20250424_cn"
],
"cn": "event_20250424_cn",
"en": "event_20250424_cn",
"jp": "event_20250424_cn",
"tw": "event_20241024_cn"
"tw": "event_20240912_cn"
},
"Mode": {
"type": "select",