Просмотр исходного кода

fix(ActivityShikigami): "ap mode"

ryland 11 месяцев назад
Родитель
Сommit
8b0a95b559

+ 2 - 2
tasks/ActivityShikigami/assets.py

@@ -153,9 +153,9 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(727,18,105,28), area=(716,11,122,41), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(749,18,73,29), area=(749,18,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(534,18,70,28), area=(534,18,70,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_PASS = RuleOcr(roi=(959,18,57,28), area=(959,18,57,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 

+ 6 - 6
tasks/ActivityShikigami/fire/ocr.json

@@ -1,17 +1,17 @@
 [
-   {
+  {
     "itemName": "remain_ap",
-    "roiFront": "727,18,105,28",
-    "roiBack": "716,11,122,41",
+    "roiFront": "749,18,73,29",
+    "roiBack": "749,18,73,29",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
     "description": "体力的数量检测"
   },
   {
-    "itemName": "remain_ap_activity",
-    "roiFront": "534,18,70,28",
-    "roiBack": "534,18,70,28",
+    "itemName": "remain_pass",
+    "roiFront": "959,18,57,28",
+    "roiBack": "959,18,57,28",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 4 - 5
tasks/ActivityShikigami/script_task.py

@@ -263,12 +263,11 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             self.screenshot()
             self.put_status()
             # --------------------------------------------------------------
-            if self.appear_then_click(self.I_CHECK_BATTLE_MAIN, interval=4):
-                continue
             if not ocr_limit_timer.reached():
                 continue
             ocr_limit_timer.reset()
             if not self.ocr_appear(self.O_FIRE):
+                self.appear_then_click(self.I_CHECK_BATTLE_MAIN, interval=4)
                 continue
             #  --------------------------------------------------------------
             self.lock_team(self.conf.general_battle)
@@ -417,8 +416,8 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         self.screenshot()
         remain_times = 0
         if self.climb_type == 'pass':
-            remain_times = self.O_REMAIN_AP_ACTIVITY2.ocr_digit(
-                _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_AP_ACTIVITY2))
+            remain_times = self.O_REMAIN_PASS.ocr_digit(
+                _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_PASS))
         if self.climb_type == 'ap':
             remain_times = self.O_REMAIN_AP.ocr_digit(
                 _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_AP))
@@ -467,6 +466,6 @@ if __name__ == '__main__':
     d = Device(c)
     t = ScriptTask(c, d)
 
-    t._run_pass()
+    t.run()