Merge branch 'hotfix/2.0.1' into main

ArkMowers · Feb 25, 2022 · 9be4ba2 · 9be4ba2
2 parents b3e3940 + 2635a6b
commit 9be4ba2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/arknights_mower/__init__.py b/arknights_mower/__init__.py
@@ -15,4 +15,4 @@
 __cli__ = not (__pyinstall__ and not sys.argv[1:])
 
 __system__ = platform.system().lower()
-__version__ = '2.0.0'
+__version__ = '2.0.1'
diff --git a/arknights_mower/data/scene.py b/arknights_mower/data/scene.py
@@ -46,6 +46,7 @@
     [701, 'SHOP_OTHERS', '商店除了信用兑换处以外的界面'],
     [702, 'SHOP_CREDIT', '信用兑换处'],
     [703, 'SHOP_CREDIT_CONFIRM', '兑换确认'],
+    [704, 'SHOP_ASSIST', '助战使用次数'],
     [801, 'RECRUIT_MAIN', '公招主界面'],
     [802, 'RECRUIT_TAGS', '挑选标签时'],
     [803, 'RECRUIT_AGENT', '开包干员展示'],

diff --git a/arknights_mower/resources/shop_assist.png b/arknights_mower/resources/shop_assist.png
diff --git a/arknights_mower/solvers/shop.py b/arknights_mower/solvers/shop.py
@@ -44,6 +44,8 @@ def transition(self) -> bool:
                 self.tap_element('shop_cart')
             else:
                 return True
+        elif self.scene() == Scene.SHOP_ASSIST:
+            self.back()
         elif self.scene() == Scene.MATERIEL:
             self.tap_element('materiel_ico')
         elif self.scene() == Scene.LOADING:

diff --git a/arknights_mower/utils/recognize.py b/arknights_mower/utils/recognize.py
@@ -139,6 +139,8 @@ def get_scene(self) -> int:
             self.scene = Scene.SHOP_OTHERS
         elif self.find('shop_cart') is not None:
             self.scene = Scene.SHOP_CREDIT_CONFIRM
+        elif self.find('shop_assist') is not None:
+            self.scene = Scene.SHOP_ASSIST
         elif self.find('login_awake') is not None:
             self.scene = Scene.LOGIN_QUICKLY
         elif self.find('login_account') is not None: