Merge branch 'master' into gems_farming

module/campaign/campaign_ocr.py

@@ -69,7 +69,7 @@ class CampaignOcr(ModuleBase):
         return name[0], name[1:]
 
     def campaign_match_multi(self, template, image, stage_image=None, name_offset=(75, 9), name_size=(60, 16),
-                             name_letter=(255, 255, 255), name_thresh=128):
+                             name_letter=(255, 255, 255), name_thresh=128, similarity=0.85):
         """
         Args:
             template (Template):
@@ -85,7 +85,7 @@ class CampaignOcr(ModuleBase):
         """
         digits = []
         stage_image = image if stage_image is None else stage_image
-        result = template.match_multi(stage_image, similarity=0.85, name='STAGE')
+        result = template.match_multi(stage_image, similarity=similarity, name='STAGE')
         name_area = (name_offset[0], name_offset[1], name_offset[0] + name_size[0], name_offset[1] + name_size[1])
         for button in result:
             button_name = button.crop(area=name_area, image=image)

module/campaign/gems_farming.py

@@ -176,15 +176,16 @@ class GemsFarming(CampaignRun, EquipmentChange):
             )
             self._trigger_lv32 = False
             super().run(name=name, folder=folder, total=total)
-            backup.recover()
 
             # End
             if self._trigger_lv32:
                 self.flagship_change()
                 self._trigger_lv32 = False
                 self.campaign.config.LV32_TRIGGERED = False
+                backup.recover()
                 continue
             else:
+                backup.recover()
                 break
        
     def vanguard_change_execute(self):

module/campaign/run.py

@@ -166,6 +166,8 @@ class CampaignRun(Reward):
         """
         if folder == 'event_20201126_cn' and name == 'vsp':
             name = 'sp'
+        if folder == 'event_20210723_cn' and name == 'vsp':
+            name = 'sp'
 
         return name, folder