1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-23 02:53:44 +08:00

Merge branch 'LmeSzinc:master' into dev-minigame-for-pr

This commit is contained in:
Tipsy Fisher
2023-09-15 09:55:03 +08:00
committed by GitHub
27 changed files with 561 additions and 37 deletions

View File

@@ -1594,6 +1594,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -1654,10 +1655,10 @@
"event_20200227_cn"
],
"display": "hide",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",
@@ -1915,6 +1916,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -1975,10 +1977,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",
@@ -2351,6 +2353,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -2411,10 +2414,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",
@@ -3700,6 +3703,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -3760,10 +3764,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",
@@ -4153,6 +4157,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -4213,10 +4218,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",
@@ -4606,6 +4611,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -4666,10 +4672,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",
@@ -5059,6 +5065,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -5119,10 +5126,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",
@@ -5502,6 +5509,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20230914_cn",
"event_20220915_cn",
"event_20220414_cn",
"event_20230817_cn",
@@ -5562,10 +5570,10 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20220915_cn",
"cn": "event_20230817_cn",
"en": "event_20230817_cn",
"jp": "event_20230817_cn"
"cn": "event_20230914_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
},
"Mode": {
"type": "select",

View File

@@ -110,7 +110,7 @@ class ManualConfig:
# but ridiculous that options that must be selected are skipped too
# such as compulsory confirm before abyssal, interaction of siren scanning devices and logging devices
# Don't click SKIP at the situation above
STORY_ALLOW_SKIP = False
STORY_ALLOW_SKIP = True
"""
module.map.fleet

View File

@@ -646,6 +646,7 @@
"name": "Event Name",
"help": "Automatically selects to the latest event",
"campaign_main": "campaign_main",
"event_20230914_cn": "Effulgence Before Eclipse",
"event_20220915_cn": "Violet Tempest Blooming Lycoris",
"coalition_20230323": "Frostfall",
"event_20220414_cn": "Aurora Noctis Rerun",

View File

@@ -646,6 +646,7 @@
"name": "Campaign.Event.name",
"help": "Campaign.Event.help",
"campaign_main": "campaign_main",
"event_20230914_cn": "須臾望月抄",
"event_20220915_cn": "赫の涙月 菫の暁風",
"coalition_20230323": "星霜海嵐",
"event_20220414_cn": "極夜照らす幻光(復刻)",

View File

@@ -646,6 +646,7 @@
"name": "活动名称",
"help": "自动选择至最新的活动",
"campaign_main": "主线图",
"event_20230914_cn": "须臾望月抄",
"event_20220915_cn": "紫绛槿岚",
"coalition_20230323": "极地风暴",
"event_20220414_cn": "复刻永夜幻光",

View File

@@ -646,6 +646,7 @@
"name": "活動名稱",
"help": "自動選擇至最新的活動圖",
"campaign_main": "主線圖",
"event_20230914_cn": "Effulgence Before Eclipse",
"event_20220915_cn": "紫絳槿嵐",
"coalition_20230323": "極地風暴",
"event_20220414_cn": "復刻-永夜幻光",