diff --git a/auto/run_business/buy.py b/auto/run_business/buy.py index 065de5e..4a74cce 100644 --- a/auto/run_business/buy.py +++ b/auto/run_business/buy.py @@ -246,7 +246,6 @@ def click_bargain_button(num=0): logger.info("降价失败") return False - def click_buy_button(): """ 说明: @@ -257,7 +256,7 @@ def click_buy_button(): input_tap((1056, 647)) time.sleep(1) image = screenshot() - bgr = get_bgr(image, (1177, 459), 5) + bgr = get_bgr(image, (1177, 459), offset=5) logger.debug(f"购买物品界面颜色检查: {bgr}") if bgr != [2, 133, 253] and bgr != [251, 253, 253]: return True diff --git a/auto/run_business/sell.py b/auto/run_business/sell.py index 3b4b730..a31c6fa 100644 --- a/auto/run_business/sell.py +++ b/auto/run_business/sell.py @@ -93,7 +93,7 @@ def click_sell_button(): input_tap((1056, 647)) time.sleep(1) image = screenshot() - bgr = get_bgr(image, (1175, 470), 5) + bgr = get_bgr(image, (1175, 470), offset=5) logger.debug(f"出售物品界面颜色检查: {bgr}") if bgr == [227, 131, 82]: logger.info("检测到包含本地商品") diff --git a/core/module/bgr.py b/core/module/bgr.py index a909d4a..555a5e4 100644 --- a/core/module/bgr.py +++ b/core/module/bgr.py @@ -37,10 +37,10 @@ def __init__(self, b: int, g: int, r: int, offset: int = 5): self.offset = offset def __str__(self): - return f"B: {self.b}, G: {self.g}, R: {self.r}" + return f"B: {self.b}, G: {self.g}, R: {self.r}, O: {self.offset}" def __repr__(self): - return f"BGR({self.b}, {self.g}, {self.r})" + return f"BGR({self.b}, {self.g}, {self.r}, O: {self.offset})" def __eq__(self, other: Union["BGR", Tuple[int, int, int], List[int]]): """