1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-24 12:09:59 +08:00

Upd: event 20201126 rerun

This commit is contained in:
2026-04-23 17:17:36 +08:00
25 changed files with 166 additions and 77 deletions

View File

@@ -1967,23 +1967,27 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"display": "hide",
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -2385,25 +2389,30 @@
"value": "12-4"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -2799,25 +2808,30 @@
"value": "12-4"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -3230,7 +3244,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"raid_20260212"
@@ -4606,25 +4620,30 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -5038,25 +5057,30 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -5470,25 +5494,30 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -5902,25 +5931,30 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -6324,25 +6358,30 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
]
@@ -6753,7 +6792,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"raid_20260212"
@@ -6995,7 +7034,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"coalition_20260122"

View File

@@ -28,8 +28,6 @@ Main3:
Event: campaign_main
GemsFarming:
Campaign:
Event:
value: campaign_main
Mode: normal
UseClearMode: true
UseFleetLock: true
@@ -57,14 +55,10 @@ GemsFarming:
Event:
Campaign:
Mode: normal
Event:
type: state
AmbushEvade: true
Event2:
Campaign:
Mode: normal
Event:
type: state
AmbushEvade: true
EventA:
Scheduler:
@@ -73,8 +67,6 @@ EventA:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -92,8 +84,6 @@ EventB:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -111,8 +101,6 @@ EventC:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -130,8 +118,6 @@ EventD:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -149,8 +135,6 @@ EventSp:
ServerUpdate: 00:00
Campaign:
Name: sp
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -166,8 +150,6 @@ EventSp:
Raid:
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
UseClearMode: true
UseFleetLock: true
@@ -212,8 +194,6 @@ RaidDaily:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
UseClearMode: true
UseFleetLock: true
@@ -245,8 +225,6 @@ Coalition:
FailureInterval: 30
ServerUpdate: 00:00
Campaign:
Event:
type: state
Name: dynamic
Event:
type: state
@@ -279,8 +257,6 @@ CoalitionSp:
ServerUpdate: 00:00
Campaign:
Name: sp
Event:
type: state
Mode: normal
UseClearMode: true
UseFleetLock: true

View File

@@ -657,17 +657,24 @@ class ConfigUpdater:
if not is_template:
for task in EVENTS + GEMS_FARMINGS + RAIDS + COALITIONS:
opts = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
if not deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') in opts:
if opts and not deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') in opts:
deep_set(new,
keys=f'{task}.Campaign.Event',
value=opts[0])
for task in ['GemsFarming']:
opts = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
if opts and deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') not in opts:
deep_set(new,
keys=f'{task}.Campaign.Event',
value=opts[0])
# War archive does not allow campaign_main
for task in WAR_ARCHIVES:
if deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') == 'campaign_main':
opts = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
if opts and deep_get(new, keys=f'{task}.Campaign.Event', default='campaign_main') == 'campaign_main':
deep_set(new,
keys=f'{task}.Campaign.Event',
value=deep_get(self.args, f'{task}.Campaign.Event.option_{server}')[0])
value=opts[0])
# Events does not allow default stage 12-4
def default_stage(t, stage):

View File

@@ -736,7 +736,7 @@
"event_20201002_en": "Counterattack Within the Fjord",
"event_20201012_cn": "Sundered Blue Rerun",
"event_20201029_cn": "Universe in Unison",
"event_20201126_cn": "Vacation Lane",
"event_20201126_cn": "Vacation Lane Rerun",
"event_20201229_cn": "Inverted Orthant Rerun",
"event_20210121_cn": "Empyreal Tragicomedy Rerun",
"event_20210225_cn": "Khorovod of Dawns Rime Rerun",

View File

@@ -736,7 +736,7 @@
"event_20201002_en": "Counterattack Within the Fjord",
"event_20201012_cn": "奔る彩帆の青(復刻)",
"event_20201029_cn": "激唱のユニバース",
"event_20201126_cn": "バケーションレーン",
"event_20201126_cn": "バケーションレーン(復刻)",
"event_20201229_cn": "虚畳なりし限象(復刻)",
"event_20210121_cn": "悲歎せし焔海の詩(復刻)",
"event_20210225_cn": "暁射す氷華の嵐(復刻)",

View File

@@ -736,7 +736,7 @@
"event_20201002_en": "Counterattack Within the Fjord",
"event_20201012_cn": "复刻划破海空之翼",
"event_20201029_cn": "激唱的UNIVERSE",
"event_20201126_cn": "假日航线",
"event_20201126_cn": "复刻假日航线",
"event_20201229_cn": "复刻负象限作战",
"event_20210121_cn": "复刻神圣的悲喜剧",
"event_20210225_cn": "复刻破晓冰华",