mirror of
https://github.com/W1NDes/M-AzurLaneAutoScript.git
synced 2026-05-14 07:08:04 +08:00
Merge branch 'dev' into viewport
This commit is contained in:
commit
06bb627753
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -155,6 +155,9 @@ Deploy:
|
||||
# '["alas"]' specified "alas" config
|
||||
# '["alas","alas2"]' specified "alas" "alas2" configs
|
||||
Run: null
|
||||
# To update app.asar
|
||||
# [In most cases] true
|
||||
AppAsarUpdate: true
|
||||
# SSL support
|
||||
# Only effective when both parameters below are set
|
||||
# --ssl-key. Path to SSL key file
|
||||
|
||||
@ -1969,27 +1969,22 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"display": "hide",
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -2502,26 +2497,21 @@
|
||||
"type": "state",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -2941,26 +2931,21 @@
|
||||
"type": "state",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -3339,7 +3324,6 @@
|
||||
"type": "select",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
@ -3352,10 +3336,9 @@
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20220526_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -5074,26 +5057,21 @@
|
||||
"type": "state",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -5493,26 +5471,21 @@
|
||||
"type": "state",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -5912,26 +5885,21 @@
|
||||
"type": "state",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -6331,26 +6299,21 @@
|
||||
"type": "state",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
@ -6750,26 +6713,21 @@
|
||||
"type": "state",
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_en": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_jp": [
|
||||
"event_20260226_cn"
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20260226_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20220526_cn",
|
||||
"event_20260226_cn"
|
||||
]
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user