diff --git a/assets/jp/base/popup/AP_EXCEED.BUTTON.png b/assets/jp/base/popup/AP_EXCEED.BUTTON.png index ff27aae..67e4bad 100644 Binary files a/assets/jp/base/popup/AP_EXCEED.BUTTON.png and b/assets/jp/base/popup/AP_EXCEED.BUTTON.png differ diff --git a/assets/jp/base/popup/AP_EXCEED.png b/assets/jp/base/popup/AP_EXCEED.png index 662c298..43693c7 100644 Binary files a/assets/jp/base/popup/AP_EXCEED.png and b/assets/jp/base/popup/AP_EXCEED.png differ diff --git a/assets/jp/base/popup/INSUFFICIENT_INVENTORY.BUTTON.png b/assets/jp/base/popup/INSUFFICIENT_INVENTORY.BUTTON.png new file mode 100644 index 0000000..ff27aae Binary files /dev/null and b/assets/jp/base/popup/INSUFFICIENT_INVENTORY.BUTTON.png differ diff --git a/assets/jp/base/popup/INSUFFICIENT_INVENTORY.png b/assets/jp/base/popup/INSUFFICIENT_INVENTORY.png new file mode 100644 index 0000000..662c298 Binary files /dev/null and b/assets/jp/base/popup/INSUFFICIENT_INVENTORY.png differ diff --git a/tasks/base/assets/assets_base_popup.py b/tasks/base/assets/assets_base_popup.py index 9c308b3..6c9bc43 100644 --- a/tasks/base/assets/assets_base_popup.py +++ b/tasks/base/assets/assets_base_popup.py @@ -24,10 +24,10 @@ 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), + area=(611, 147, 669, 177), + search=(591, 127, 689, 197), + color=(143, 156, 170), + button=(539, 470, 743, 533), ), en=Button( file='./assets/en/base/popup/AP_EXCEED.png', @@ -124,7 +124,13 @@ GET_REWARD_SKIP = ButtonWrapper( ) INSUFFICIENT_INVENTORY = ButtonWrapper( name='INSUFFICIENT_INVENTORY', - jp=None, + jp=Button( + file='./assets/jp/base/popup/INSUFFICIENT_INVENTORY.png', + area=(610, 124, 669, 153), + search=(590, 104, 689, 173), + color=(139, 153, 168), + button=(535, 494, 746, 565), + ), en=Button( file='./assets/en/base/popup/INSUFFICIENT_INVENTORY.png', area=(578, 117, 703, 152), diff --git a/tasks/base/popup.py b/tasks/base/popup.py index 1807798..2559c91 100644 --- a/tasks/base/popup.py +++ b/tasks/base/popup.py @@ -94,6 +94,12 @@ class PopupHandler(ModuleBase): return False + def handle_insufficient_inventory(self, interval=5) -> bool: + if self.appear_then_click(INSUFFICIENT_INVENTORY, 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 diff --git a/tasks/base/ui.py b/tasks/base/ui.py index 2d28fa7..b89219b 100644 --- a/tasks/base/ui.py +++ b/tasks/base/ui.py @@ -345,6 +345,8 @@ class UI(MainPage): return True if self.handle_ap_exceed(): return True + if self.handle_insufficient_inventory(): + return True if self.handle_item_expired(): return True