|
|
@@ -155,6 +155,11 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
|
|
|
# 更改循环顺序
|
|
|
while 1:
|
|
|
self.screenshot()
|
|
|
+ #看到弹窗点掉,不然会卡死
|
|
|
+ if self.appear(self.I_FRESH_ENSURE):
|
|
|
+ logger.info("Pop-up detected: Refresh Confirmation. Clicking Confirm.")
|
|
|
+ self.appear_then_click(self.I_FRESH_ENSURE, interval=1.5)
|
|
|
+ continue
|
|
|
# 检查票数
|
|
|
if not self.check_ticket(con.raid_config.number_base):
|
|
|
break
|
|
|
@@ -175,6 +180,11 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
|
|
|
break
|
|
|
else:
|
|
|
logger.info('No one can attack, break')
|
|
|
+ # 检查是否有“刷新确认”弹窗挡路
|
|
|
+ if self.appear(self.I_FRESH_ENSURE):
|
|
|
+ logger.info("Closing obstructing refresh dialog (Click Ensure)...")
|
|
|
+ # 点击“确定”来完成刷新(或者你可以改成点取消)
|
|
|
+ self.appear_then_click(self.I_FRESH_ENSURE, interval=2)
|
|
|
success = False
|
|
|
break
|
|
|
# 判断是不是左上角第一个
|
|
|
@@ -469,16 +479,50 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
|
|
|
:param order: 第几个
|
|
|
:return:
|
|
|
"""
|
|
|
+ retry_clean = 0
|
|
|
+ while not self.appear(self.I_RR_PERSON):
|
|
|
+ if retry_clean > 20:
|
|
|
+ logger.warning("Stuck too long, try force quit or random click")
|
|
|
+
|
|
|
+ logger.info("Title not found! Checking for popups or rewards...")
|
|
|
+
|
|
|
+ # 如果看到了“刷新确认”弹窗 (I_FRESH_ENSURE 是右边的确定)
|
|
|
+ if self.appear(self.I_FRESH_ENSURE):
|
|
|
+ logger.info("Refresh popup detected! Clicking CANCEL (Red Button).")
|
|
|
+ # 点击“取消”按钮的坐标 (基于1280x720分辨率)
|
|
|
+ self.device.click(x=530, y=460)
|
|
|
+ time.sleep(1.5)
|
|
|
+ self.screenshot()
|
|
|
+ continue
|
|
|
+
|
|
|
+ # 点击屏幕正上方 (640, 50),而不是右下角,避免误触"刷新"按钮
|
|
|
+ logger.info("Clicking safe area to clear rewards...")
|
|
|
+ self.device.click(x=640, y=50)
|
|
|
+ time.sleep(1.5)
|
|
|
+ self.screenshot()
|
|
|
+ retry_clean += 1
|
|
|
+
|
|
|
click = self.partition[order - 1]
|
|
|
- self.wait_until_appear(self.I_RR_PERSON)
|
|
|
+
|
|
|
+ # 进攻循环
|
|
|
while 1:
|
|
|
self.screenshot()
|
|
|
+
|
|
|
+ # 双重保险:如果在进攻阶段又弹出了窗口,也把它关掉
|
|
|
+ if self.appear(self.I_FRESH_ENSURE):
|
|
|
+ logger.info("Refresh popup blocking attack! Clicking CANCEL.")
|
|
|
+ self.device.click(x=530, y=460) # 点取消
|
|
|
+ time.sleep(1.0)
|
|
|
+ continue
|
|
|
+
|
|
|
if not self.appear(self.I_RR_PERSON, threshold=0.8):
|
|
|
break
|
|
|
+
|
|
|
if self.appear_then_click(self.I_FIRE, interval=1):
|
|
|
continue
|
|
|
if self.click(click, interval=1.8):
|
|
|
continue
|
|
|
+
|
|
|
logger.info(f'Click fire {order} success')
|
|
|
|
|
|
@cached_property
|