From f91fc2c55d56c45e746eb53c009791bb333f3b4e Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Fri, 10 Nov 2023 21:12:17 +0800 Subject: [PATCH] feat(popup): add ap exceed and item expire handler --- assets/jp/base/popup/AP_EXCEED.BUTTON.png | Bin 0 -> 10633 bytes assets/jp/base/popup/AP_EXCEED.png | Bin 0 -> 6727 bytes assets/jp/base/popup/ITEM_EXPIRED.BUTTON.png | Bin 0 -> 10323 bytes assets/jp/base/popup/ITEM_EXPIRED.png | Bin 0 -> 6377 bytes tasks/base/assets/assets_base_popup.py | 20 +++++++++++++++++++ tasks/base/popup.py | 12 +++++++++++ tasks/base/ui.py | 4 ++++ 7 files changed, 36 insertions(+) create mode 100644 assets/jp/base/popup/AP_EXCEED.BUTTON.png create mode 100644 assets/jp/base/popup/AP_EXCEED.png create mode 100644 assets/jp/base/popup/ITEM_EXPIRED.BUTTON.png create mode 100644 assets/jp/base/popup/ITEM_EXPIRED.png diff --git a/assets/jp/base/popup/AP_EXCEED.BUTTON.png b/assets/jp/base/popup/AP_EXCEED.BUTTON.png new file mode 100644 index 0000000000000000000000000000000000000000..ff27aae0453d424dce5fdc95ee2a1f6ab54f411b GIT binary patch literal 10633 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 literal 0 HcmV?d00001 diff --git a/assets/jp/base/popup/AP_EXCEED.png b/assets/jp/base/popup/AP_EXCEED.png new file mode 100644 index 0000000000000000000000000000000000000000..662c298dd0f87d1076cd69d4b48fae7338baa31a GIT binary patch literal 6727 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 XqbU2@1rV_EK&_F1sebv@+xPw#dmtVQ literal 0 HcmV?d00001 diff --git a/assets/jp/base/popup/ITEM_EXPIRED.png b/assets/jp/base/popup/ITEM_EXPIRED.png new file mode 100644 index 0000000000000000000000000000000000000000..53841f997af342d26c4a9c862ebfe469bd0e9b83 GIT binary patch literal 6377 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 K8D{DqKmBh^pKz7{ literal 0 HcmV?d00001 diff --git a/tasks/base/assets/assets_base_popup.py b/tasks/base/assets/assets_base_popup.py index 5289ebc..8dfb836 100644 --- a/tasks/base/assets/assets_base_popup.py +++ b/tasks/base/assets/assets_base_popup.py @@ -13,6 +13,16 @@ AFFECTION_LEVEL_UP = ButtonWrapper( button=(882, 244, 1176, 476), ), ) +AP_EXCEED = ButtonWrapper( + name='AP_EXCEED', + jp=Button( + file='./assets/jp/base/popup/AP_EXCEED.png', + area=(610, 124, 669, 153), + search=(590, 104, 689, 173), + color=(139, 153, 168), + button=(535, 494, 746, 565), + ), +) DAILY_NEWS = ButtonWrapper( name='DAILY_NEWS', jp=Button( @@ -63,6 +73,16 @@ GET_REWARD_SKIP = ButtonWrapper( button=(1137, 34, 1243, 65), ), ) +ITEM_EXPIRED = ButtonWrapper( + name='ITEM_EXPIRED', + jp=Button( + file='./assets/jp/base/popup/ITEM_EXPIRED.png', + area=(612, 147, 668, 175), + search=(592, 127, 688, 195), + color=(131, 145, 162), + button=(537, 487, 742, 553), + ), +) NETWORK_RECONNECT = ButtonWrapper( name='NETWORK_RECONNECT', jp=Button( diff --git a/tasks/base/popup.py b/tasks/base/popup.py index aef828d..1807798 100644 --- a/tasks/base/popup.py +++ b/tasks/base/popup.py @@ -87,3 +87,15 @@ class PopupHandler(ModuleBase): return True return False + + def handle_ap_exceed(self, interval=5) -> bool: + if self.appear_then_click(AP_EXCEED, interval=interval): + return True + + return False + + def handle_item_expired(self, interval=5) -> bool: + if self.appear_then_click(ITEM_EXPIRED, interval=interval): + return True + + return False diff --git a/tasks/base/ui.py b/tasks/base/ui.py index 5ba0119..2d28fa7 100644 --- a/tasks/base/ui.py +++ b/tasks/base/ui.py @@ -343,6 +343,10 @@ class UI(MainPage): return True if self.handle_new_student(): return True + if self.handle_ap_exceed(): + return True + if self.handle_item_expired(): + return True return False