Merge pull request #1918 from LmeSzinc/bug_fix

Bug fix

module/dorm/dorm.py

@@ -53,6 +53,13 @@ class RewardDorm(UI):
         loves = TEMPLATE_DORM_LOVE.match_multi(image, name='DORM_LOVE')
         coins = TEMPLATE_DORM_COIN.match_multi(image, name='DORM_COIN')
         logger.info(f'Dorm loves: {len(loves)}, Dorm coins: {len(coins)}')
+        # Complicated dorm background
+        if len(loves) > 6:
+            logger.warning('Too many dorm loves, limited to 6')
+            loves = loves[:6]
+        if len(coins) > 6:
+            logger.warning('Too many dorm coins, limited to 6')
+            coins = coins[:6]
 
         count = 0
         for button in loves:

module/equipment/equipment_change.py

@@ -4,6 +4,7 @@ from module.base.utils import *
 from module.equipment.assets import *
 from module.equipment.equipment import Equipment
 from module.logger import logger
+from module.ui.assets import BACK_ARROW
 from module.ui.scroll import Scroll
 
 # Button of 5 equipments
@@ -141,6 +142,9 @@ class EquipmentChange(Equipment):
         for _ in range(0, 15):
             self._equipment_swipe()
 
+            if self.appear(EQUIP_CONFIRM, offset=(20, 20), interval=2):
+                self.device.click(BACK_ARROW)
+                continue
             res = cv2.matchTemplate(self.device.screenshot(), np.array(
                 self.equip_list[index]), cv2.TM_CCOEFF_NORMED)
             _, sim, _, point = cv2.minMaxLoc(res)