Skip to content

Commit 9ec6101

Browse files
committed
fix(RichMan): Handle bulk purchase failures in special shop
1 parent c426b98 commit 9ec6101

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

‎tasks/Component/Buy/buy.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def buy_one(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
7777
return True
7878

7979
def buy_more(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
80-
number: int = None):
80+
number: int = None) -> bool:
8181
"""
8282
购买多个物品
8383
:param start_click:
@@ -93,7 +93,7 @@ def buy_more(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
9393
if try_click_count >= 5:
9494
logger.warning(f'Buy_more failed, try_click_count: {try_click_count}')
9595
logger.warning('Close the purchase')
96-
return
96+
return False
9797

9898
if isinstance(start_click, RuleImage):
9999
if self.appear_then_click(start_click, interval=1):
@@ -162,6 +162,7 @@ def buy_more(self, start_click: Union[RuleImage, RuleOcr, RuleClick],
162162

163163
if self.click(self.C_BUY_MORE, interval=2):
164164
continue
165+
return True
165166

166167
def buy_check_money(self, target: RuleOcr, minimum: int):
167168
"""

‎tasks/RichMan/mall/special.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ def _special_low(self, buy_number: int = 10):
137137
buy_res_number = buy_number
138138
if buy_cycles_number:
139139
for i in range(buy_cycles_number):
140-
self.buy_more(self.I_SP_BUY_LOW)
140+
if not self.buy_more(self.I_SP_BUY_LOW):
141+
return
141142
time.sleep(0.5)
142143
if buy_res_number:
143144
self.buy_more(self.I_SP_BUY_LOW, buy_res_number)

0 commit comments

Comments
 (0)