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

Fix: Resolve merge conflicts; migrate equip skin box price check to appropriate custom_check_item variant

Browse Source
This commit is contained in:
nEEtdo0d
2021-12-29 20:55:46 -05:00
parent 26c4dabc0a a1fef9f3b3
commit 87a4137859
22 changed files with 571 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,6 +576,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20211229_cn",
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
@@ -617,10 +618,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"tw": "event_20200603_cn",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn"
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
"jp": "event_20211229_cn",
"tw": "event_20200603_cn"
},
"Mode": {
"type": "disable",
@@ -2556,6 +2557,7 @@
"value": "campaign_main",
"option": [
"campaign_main",
"event_20211229_cn",
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
@@ -2597,10 +2599,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"tw": "event_20200603_cn",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn"
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
"jp": "event_20211229_cn",
"tw": "event_20200603_cn"
},
"Mode": {
"type": "disable",
@@ -4298,6 +4300,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20211229_cn",
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
@@ -4339,10 +4342,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"tw": "event_20200603_cn",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn"
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
"jp": "event_20211229_cn",
"tw": "event_20200603_cn"
},
"Mode": {
"type": "disable",
@@ -4695,6 +4698,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20211229_cn",
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
@@ -4736,10 +4740,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"tw": "event_20200603_cn",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn"
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
"jp": "event_20211229_cn",
"tw": "event_20200603_cn"
},
"Mode": {
"type": "disable",
@@ -5082,6 +5086,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20211229_cn",
"event_20200603_cn",
"event_20211125_cn",
"event_20211111_cn",
@@ -5123,10 +5128,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"tw": "event_20200603_cn",
"cn": "event_20211125_cn",
"en": "event_20211125_cn",
"jp": "event_20211125_cn"
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
"jp": "event_20211229_cn",
"tw": "event_20200603_cn"
},
"Mode": {
"type": "disable",