mirror of
https://github.com/sui-feng-cb/AzurLaneAutoScript1.git
synced 2026-07-13 02:54:25 +08:00
Fix: drop support for new UI for submarine call timing
This commit is contained in:
@@ -6,12 +6,12 @@ from module.logger import logger
|
||||
|
||||
# BOSS detection areas
|
||||
# Classic UI: BOSS avatar frame right border
|
||||
BOSS_AVATAR_FRAME_RIGHT = (301, 13, 303, 89)
|
||||
BOSS_AVATAR_FRAME_RIGHT = (301, 15, 302, 80)
|
||||
BOSS_AVATAR_FRAME_COLOR = (24, 28, 24)
|
||||
# New UI: BOSS HP bar bottom border, middle-left portion
|
||||
# Color targets deep blue themes; need adjustment for other color schemes
|
||||
BOSS_HP_BAR_BORDER = (420, 48, 620, 50)
|
||||
BOSS_HP_BAR_COLOR = (31, 39, 61)
|
||||
# BOSS_HP_BAR_BORDER = (420, 48, 620, 50)
|
||||
# BOSS_HP_BAR_COLOR = (31, 39, 61)
|
||||
|
||||
|
||||
class SubmarineCall(ModuleBase):
|
||||
@@ -31,12 +31,12 @@ class SubmarineCall(ModuleBase):
|
||||
Detect whether BOSS has appeared by checking stable BOSS UI elements.
|
||||
"""
|
||||
# New UI: BOSS HP bar bottom border
|
||||
avg = get_color(self.device.image, BOSS_HP_BAR_BORDER)
|
||||
if color_similar(avg, BOSS_HP_BAR_COLOR, threshold=40):
|
||||
return True
|
||||
# avg = get_color(self.device.image, BOSS_HP_BAR_BORDER)
|
||||
# if color_similar(avg, BOSS_HP_BAR_COLOR, threshold=40):
|
||||
# return True
|
||||
# Classic UI: BOSS avatar frame right border
|
||||
frame = crop(self.device.image, BOSS_AVATAR_FRAME_RIGHT, copy=False)
|
||||
if image_color_count(frame, color=BOSS_AVATAR_FRAME_COLOR, count=55):
|
||||
if image_color_count(frame, color=BOSS_AVATAR_FRAME_COLOR, threshold=200, count=50):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
@@ -1059,14 +1059,14 @@
|
||||
},
|
||||
"CallMode": {
|
||||
"name": "Call Submarine",
|
||||
"help": "Attempt to call submarines by clicking the call button during combat",
|
||||
"help": "Only supports Classic UI. Attempts to call submarines by clicking the call button during combat",
|
||||
"do_not_use": "Don't Use",
|
||||
"boss_only": "BOSS Only",
|
||||
"every_combat": "Every Combat"
|
||||
},
|
||||
"Timing": {
|
||||
"name": "BOSS Battle Call Timing (Experimental)",
|
||||
"help": "Note: 'Wait For BOSS' currently only supports: Classic UI, and new UI with solid deep blue HP bar borders! Using unsupported UIs will prevent submarines from being called!",
|
||||
"name": "BOSS Battle Call Timing",
|
||||
"help": "",
|
||||
"default": "Default (call immediately after entering combat)",
|
||||
"wait_for_boss": "Wait For BOSS"
|
||||
},
|
||||
|
||||
@@ -1059,14 +1059,14 @@
|
||||
},
|
||||
"CallMode": {
|
||||
"name": "潜水艦出撃設定",
|
||||
"help": "戦闘中にボタンをクリックして潜水艦の召喚を試みます",
|
||||
"help": "クラシックUIのみ対応。戦闘中にボタンをクリックして潜水艦の召喚を試みます",
|
||||
"do_not_use": "使用しない",
|
||||
"boss_only": "BOSS戦のみ",
|
||||
"every_combat": "毎戦"
|
||||
},
|
||||
"Timing": {
|
||||
"name": "BOSS戦召喚タイミング(テスト中)",
|
||||
"help": "注意:'BOSS出現待機'現在のみ:クラシックUI、HPバー枠が深青一色の新型UIのみサポート!認識できないUIを使用すると潜水艦が出撃しません!",
|
||||
"name": "BOSS戦召喚タイミング",
|
||||
"help": "",
|
||||
"default": "デフォルト(戦闘開始直後に召喚を試みる)",
|
||||
"wait_for_boss": "BOSS出現待機"
|
||||
},
|
||||
|
||||
@@ -1059,14 +1059,14 @@
|
||||
},
|
||||
"CallMode": {
|
||||
"name": "潜艇出击方案",
|
||||
"help": "在战斗内通过点击按钮以尝试召唤潜艇",
|
||||
"help": "仅支持经典UI,在战斗内通过点击潜艇按钮尝试召唤",
|
||||
"do_not_use": "不使用",
|
||||
"boss_only": "仅BOSS战",
|
||||
"every_combat": "每场战斗"
|
||||
},
|
||||
"Timing": {
|
||||
"name": "BOSS战召唤时机(测试中)",
|
||||
"help": "注意:'等待BOSS出现'当前仅支持:经典UI、血条边框为深蓝纯色的新型UI!若使用无法识别的UI将导致潜艇不出击!",
|
||||
"name": "BOSS战召唤时机",
|
||||
"help": "仅支持经典UI",
|
||||
"default": "默认(进战立即尝试召唤)",
|
||||
"wait_for_boss": "等待boss出现"
|
||||
},
|
||||
|
||||
@@ -1059,14 +1059,14 @@
|
||||
},
|
||||
"CallMode": {
|
||||
"name": "潛艇出擊方案",
|
||||
"help": "在戰鬥內透過點擊按鈕以嘗試召喚潛艇",
|
||||
"help": "僅支援經典UI,在戰鬥內透過點擊按鈕以嘗試召喚潛艇",
|
||||
"do_not_use": "不使用",
|
||||
"boss_only": "僅BOSS戰",
|
||||
"every_combat": "每場戰鬥"
|
||||
},
|
||||
"Timing": {
|
||||
"name": "BOSS戰召喚時機(測試中)",
|
||||
"help": "注意:'等待BOSS出現'目前僅支援:經典UI、血條邊框為深藍純色的新型UI!若使用無法識別的UI將導致潛艇不出擊!",
|
||||
"name": "BOSS戰召喚時機",
|
||||
"help": "",
|
||||
"default": "預設(進戰立即嘗試召喚)",
|
||||
"wait_for_boss": "等待BOSS出現"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user