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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
SevCrane
2024-06-14 10:52:50 +08:00
parent f05b61ed8e 7b021b3e98
commit 5b9f5e80e2
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1721,13 +1721,13 @@
],
"display": "hide",
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",
@@ -2056,13 +2056,13 @@
"event_20240521_cn"
],
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",
@@ -2506,13 +2506,13 @@
"event_20240521_cn"
],
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",
@@ -4350,13 +4350,13 @@
"event_20240521_cn"
],
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",
@@ -4817,13 +4817,13 @@
"event_20240521_cn"
],
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",
@@ -5284,13 +5284,13 @@
"event_20240521_cn"
],
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",
@@ -5751,13 +5751,13 @@
"event_20240521_cn"
],
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",
@@ -6208,13 +6208,13 @@
"event_20240521_cn"
],
"option_bold": [
"event_20230525_cn",
"event_20201012_cn",
"event_20240521_cn"
],
"cn": "event_20240521_cn",
"en": "event_20240521_cn",
"jp": "event_20240521_cn",
"tw": "event_20230525_cn"
"tw": "event_20201012_cn"
},
"Mode": {
"type": "select",

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

@@ -681,7 +681,7 @@
"event_20200903_en": "復刻峽灣間的星辰",
"event_20200917_cn": "復刻-蝶海夢花",
"event_20201002_en": "Counterattack Within the Fjord",
"event_20201012_cn": "劃破海空之翼",
"event_20201012_cn": "復刻劃破海空之翼",
"event_20201029_cn": "激唱的UNIVERSE",
"event_20201126_cn": "假日航線",
"event_20201229_cn": "復刻-負象限作戰",

2
module/freebies/battle_pass.py
View File

@@ -23,7 +23,7 @@ class BattlePass(Combat, UI):
BATTLE_PASS_RED_DOT.load_offset(REWARD_GOTO_BATTLE_PASS)
# Not using self.appear() here, because it's transparent,
# color may be different depending on background.
r, _, _ = get_color(self.device.image, BATTLE_PASS_RED_DOT.area)
r, _, _ = get_color(self.device.image, BATTLE_PASS_RED_DOT.button)
if r > BATTLE_PASS_RED_DOT.color[0] - 40:
logger.info('Found battle pass red dot')
return True

2
module/shipyard/shipyard_reward.py
View File

@@ -188,7 +188,7 @@ class RewardShipyard(ShipyardUI, GeneralShop):
# due to both text and number being
# right-aligned together
# Retrieve information from page_reshmenu instead
self.ui_goto(page_reshmenu)
self.ui_ensure(page_reshmenu)
# OCR_SHOP_GOLD_COINS is slower than RESHMENU_CHECK
timeout = Timer(1, count=1).start()
skip_first_screenshot = True