fix:blacklist命名错误

This commit is contained in:
Elaina 2024-10-16 20:51:51 +08:00
parent 7258885edf
commit ef471333c8
3 changed files with 10 additions and 10 deletions

View file

@ -30,8 +30,8 @@ class SSSSolver(SceneGraphSolver):
self.drops = self.copilot["drops"]
self.stages = {}
self.deadline = datetime.now() + duration if duration else None
self.black_list = (
self.copilot["black_list"] if "black_list" in self.copilot else []
self.blacklist = (
self.copilot["blacklist"] if "blacklist" in self.copilot else []
)
self.change_stages()
super().run()
@ -72,7 +72,7 @@ class SSSSolver(SceneGraphSolver):
self.stages[stage]["retry_times"],
self.groups,
deadline=self.deadline,
black_list=self.black_list,
blacklist=self.blacklist,
):
return
self.tap_element("sss/settlement_commission")

View file

@ -16,10 +16,10 @@ agent = ["无需增调干员", "先锋", "近卫", "重装", "术士", "狙击",
class SSSDROPSolver(SceneGraphSolver):
def run(self, drops: list, black_list: list = []) -> bool:
def run(self, drops: list, blacklist: list = []) -> bool:
self.drops = drops
self.choose = False
self.black_list = set(black_list)
self.blacklist = set(blacklist)
self.transelate_name()
super().run()
@ -70,7 +70,7 @@ class SSSDROPSolver(SceneGraphSolver):
logger.info(match_opers.keys())
res = {}
for name, scope in match_opers.items():
if name and name not in self.black_list:
if name and name not in self.blacklist:
res[translate[agent_list[name]["profession"]]] = self.get_pos(
ss(1.5, 1.5, scope)
)

View file

@ -34,7 +34,7 @@ class SSSFightSolver(SceneGraphSolver):
groups: list = [],
recog_with_stop: bool = False,
deadline: datetime = None,
black_list: list = [],
blacklist: list = [],
):
"""
Args:
@ -48,7 +48,7 @@ class SSSFightSolver(SceneGraphSolver):
groups: 干员组列表
recog_with_stop: 在识别可部署干员时点击暂停
deadline: 截止时间
black_list: 增调干员黑名单
blacklist: 增调干员黑名单
"""
logger.info(f"Start: 自动保全战斗:{level_name}")
logger.info("地图坐标计算:https://github.com/yuanyan3060/Arknights-Tile-Pos")
@ -64,7 +64,7 @@ class SSSFightSolver(SceneGraphSolver):
self.groups = groups # 干员组
self.deadline = deadline # 截止时间
self.recog_with_stop = recog_with_stop # 是否在识别可部署干员时暂停
self.black_list = black_list # 增调干员黑名单
self.blacklist = blacklist # 增调干员黑名单
self.success = False
super().run()
return self.success
@ -641,7 +641,7 @@ class SSSFightSolver(SceneGraphSolver):
Scene.SSS_DROP_IN_FIGHT,
]:
self.sleep(2)
SSSDROPSolver().run(self.drops, self.black_list)
SSSDROPSolver().run(self.drops, self.blacklist)
elif scene == Scene.SSS_ACTION:
self.tap_element("sss/action")
elif scene == Scene.SSS_ACCOMPLISHED: