mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 07:28:21 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -1926,7 +1926,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"display": "hide",
|
||||
"option_cn": [
|
||||
@@ -1939,11 +1939,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
@@ -2336,7 +2336,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20230803_cn"
|
||||
@@ -2348,11 +2348,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
@@ -2740,7 +2740,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20230803_cn"
|
||||
@@ -2752,11 +2752,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
@@ -4697,7 +4697,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20230803_cn"
|
||||
@@ -4709,11 +4709,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
@@ -5118,7 +5118,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20230803_cn"
|
||||
@@ -5130,11 +5130,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
@@ -5539,7 +5539,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20230803_cn"
|
||||
@@ -5551,11 +5551,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
@@ -5960,7 +5960,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20230803_cn"
|
||||
@@ -5972,11 +5972,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
@@ -6371,7 +6371,7 @@
|
||||
"value": "campaign_main",
|
||||
"option": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"event_20230803_cn"
|
||||
@@ -6383,11 +6383,11 @@
|
||||
"event_20230803_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20230803_cn",
|
||||
"event_20250912_cn"
|
||||
"event_20250227_cn"
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
|
||||
@@ -777,7 +777,7 @@
|
||||
"event_20241024_cn": "颶風與沉眠之海",
|
||||
"event_20241121_cn": "危險發明逼近中",
|
||||
"event_20241219_cn": "星光下的餘暉",
|
||||
"event_20250227_cn": "Paradiso of Shackled Light",
|
||||
"event_20250227_cn": "樊籠內的神光",
|
||||
"event_20250424_cn": "揚起鬱金之旗",
|
||||
"event_20250520_cn": "高塔上的薔薇",
|
||||
"event_20250724_cn": "鍊金術士與天際交會之塔",
|
||||
|
||||
@@ -106,6 +106,10 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
|
||||
name = name.replace('ジブフルタル', 'ジブラルタル')
|
||||
name = name.replace('タント', 'タラント').replace('タフント', 'タラント')
|
||||
name = name.replace('N海域', 'NA海域')
|
||||
# リバープル -> リバープール
|
||||
name = name.replace('リバプル', 'リバープール')
|
||||
name = name.replace('リバープル', 'リバープール')
|
||||
name = name.replace('リバプール', 'リバープール')
|
||||
return name
|
||||
|
||||
@Config.when(SERVER='tw')
|
||||
|
||||
@@ -611,6 +611,8 @@ class UI(InfoHandler):
|
||||
self.interval_reset(GET_SHIP)
|
||||
if button == DORMMENU_GOTO_DORM:
|
||||
self.interval_reset(GET_SHIP)
|
||||
if button == DORMMENU_GOTO_MEOWFFICER:
|
||||
self.interval_reset(GET_SHIP)
|
||||
for switch_button in page_main.links.values():
|
||||
if button == switch_button:
|
||||
self.interval_reset(GET_SHIP)
|
||||
|
||||
Reference in New Issue
Block a user