Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
moesnow committed Dec 8, 2024
1 parent 5089dd6 commit 5341696
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion assets/config/screens.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"target_screen": "mail",
"actions_list": [
"auto.click_element('./assets/images/share/menu/mail.png', 'image', 0.8, crop=(0.95, 0.1, 0.05, 0.6))",
"auto.click_element('./assets/images/share/menu/mail_reward.png', 'image', 4000000, crop=(0.95, 0.1, 0.05, 0.6))"
"auto.click_element('./assets/images/share/menu/mail_reward.png', 'image', 3000000, crop=(0.95, 0.1, 0.05, 0.6))"
]
},
{
Expand Down
22 changes: 11 additions & 11 deletions tasks/reward/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ def __init__(self):
}

self.reward_mapping = {
"mail": ("./assets/images/share/menu/mail_reward.png", 4000000),
"assist": ("./assets/images/share/menu/assist_reward.png", 2000000),
"dispatch": ("./assets/images/share/menu/dispatch_reward.png", 2000000),
"quest": ("./assets/images/share/menu/quest_reward.png", 2000000),
"srpass": ("./assets/images/share/menu/pass_reward.png", 2000000),
"mail": ("./assets/images/share/menu/mail_reward.png", 3000000, (0.95, 0.1, 0.05, 0.6)),
"assist": ("./assets/images/share/menu/assist_reward.png", 2000000, self.crop),
"dispatch": ("./assets/images/share/menu/dispatch_reward.png", 2000000, self.crop),
"quest": ("./assets/images/share/menu/quest_reward.png", 2000000, self.crop),
"srpass": ("./assets/images/share/menu/pass_reward.png", 2000000, self.crop),
}

def check_and_collect_rewards(self):
log.hr("开始领取奖励", 0)

for reward_type, (image_path, confidence) in self.reward_mapping.items():
if self._find_reward(image_path, confidence):
for reward_type, (image_path, confidence, crop) in self.reward_mapping.items():
if self._find_reward(image_path, confidence, crop):
self.reward_instances[reward_type].start()
else:
reward_name = self._get_reward_name(reward_type)
Expand All @@ -51,8 +51,8 @@ def check_and_collect_specific_reward(self, reward_type):
log.hr(f"开始领取{reward_name}奖励", 0)

if reward_type in self.reward_mapping:
image_path, confidence = self.reward_mapping[reward_type]
if self._find_reward(image_path, confidence):
image_path, confidence, crop = self.reward_mapping[reward_type]
if self._find_reward(image_path, confidence, crop):
self.reward_instances[reward_type].start()
else:
log.info(f"未检测到{reward_name}奖励")
Expand All @@ -65,9 +65,9 @@ def _get_reward_name(self, reward_type):
instance = self.reward_instances.get(reward_type)
return instance.name if instance else "未知"

def _find_reward(self, image_path, confidence):
def _find_reward(self, image_path, confidence, crop):
screen.change_to('menu')
return auto.find_element(image_path, "image", confidence, crop=self.crop)
return auto.find_element(image_path, "image", confidence, crop=crop)


def start():
Expand Down

0 comments on commit 5341696

Please sign in to comment.