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

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2024-09-20 15:20:29 +00:00
parent 3956e950b4 1ffdcf038d
commit 76f64e7343
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1768,13 +1768,13 @@
],
"display": "hide",
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -2194,13 +2194,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -2656,13 +2656,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -4100,13 +4100,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -4579,13 +4579,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -5058,13 +5058,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -5537,13 +5537,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",
@@ -6006,13 +6006,13 @@
"event_20240912_cn"
],
"option_bold": [
"event_20220324_cn",
"event_20230914_cn",
"event_20240912_cn"
],
"cn": "event_20240912_cn",
"en": "event_20240912_cn",
"jp": "event_20240912_cn",
"tw": "event_20220324_cn"
"tw": "event_20230914_cn"
},
"Mode": {
"type": "select",

2
module/config/i18n/zh-TW.json
View File

@@ -726,7 +726,7 @@
"event_20230525_cn": "空相交會點",
"event_20230803_cn": "奏響鳶尾之歌",
"event_20230817_cn": "愚者的天平",
"event_20230914_cn": "Effulgence Before Eclipse",
"event_20230914_cn": "須臾望月抄",
"event_20231026_cn": "飓風與青春之泉",
"event_20231123_cn": "蒼閃忍法帖",
"event_20231221_cn": "Light-Chasing Sea of Stars",

1
module/minigame/minigame.py
View File

@@ -59,6 +59,7 @@ class MinigameRun(UI):
if self.deal_specific_popup():
return True
if self.handle_popup_confirm('TICKETS_FULL'):
self.interval_reset(COIN_POPUP, interval=3)
return True
# coins more than 31, deal popup
if self.appear_then_click(COIN_POPUP, offset=(5, 5), interval=3):

2
module/retire/assets.py
View File

@@ -59,7 +59,7 @@ TEMPLATE_FLEET_6 = Template(file={'cn': './assets/cn/retire/TEMPLATE_FLEET_6.png
TEMPLATE_FOOTE = Template(file={'cn': './assets/cn/retire/TEMPLATE_FOOTE.png', 'en': './assets/en/retire/TEMPLATE_FOOTE.png', 'jp': './assets/jp/retire/TEMPLATE_FOOTE.png', 'tw': './assets/tw/retire/TEMPLATE_FOOTE.png'})
TEMPLATE_HERMES = Template(file={'cn': './assets/cn/retire/TEMPLATE_HERMES.png', 'en': './assets/en/retire/TEMPLATE_HERMES.png', 'jp': './assets/jp/retire/TEMPLATE_HERMES.png', 'tw': './assets/tw/retire/TEMPLATE_HERMES.png'})
TEMPLATE_IN_BATTLE = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_BATTLE.png', 'en': './assets/en/retire/TEMPLATE_IN_BATTLE.png', 'jp': './assets/jp/retire/TEMPLATE_IN_BATTLE.png', 'tw': './assets/tw/retire/TEMPLATE_IN_BATTLE.png'})
TEMPLATE_IN_COMMISSION = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_COMMISSION.png', 'en': './assets/en/retire/TEMPLATE_IN_COMMISSION.png', 'jp': './assets/jp/retire/TEMPLATE_IN_COMMISSION.png', 'tw': './assets/tw/retire/TEMPLATE_IN_COMMISSION.png'})
TEMPLATE_IN_COMMISSION = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_COMMISSION.png', 'en': './assets/en/retire/TEMPLATE_IN_COMMISSION.png', 'jp': './assets/jp/retire/TEMPLATE_IN_COMMISSION.gif', 'tw': './assets/tw/retire/TEMPLATE_IN_COMMISSION.png'})
TEMPLATE_IN_EVENT_FLEET = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'en': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'jp': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'tw': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png'})
TEMPLATE_IN_HARD = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_HARD.png', 'en': './assets/cn/retire/TEMPLATE_IN_HARD.png', 'jp': './assets/cn/retire/TEMPLATE_IN_HARD.png', 'tw': './assets/cn/retire/TEMPLATE_IN_HARD.png'})
TEMPLATE_LANGLEY = Template(file={'cn': './assets/cn/retire/TEMPLATE_LANGLEY.png', 'en': './assets/en/retire/TEMPLATE_LANGLEY.png', 'jp': './assets/jp/retire/TEMPLATE_LANGLEY.png', 'tw': './assets/tw/retire/TEMPLATE_LANGLEY.png'})