yEs1do 1 год назад
Родитель
Сommit
5f4e6b7198

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


+ 16 - 16
tasks/ActivityShikigami/as/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "519,165,33,34",
-    "roiBack": "507,150,66,67",
+    "roiFront": "520,202,33,34",
+    "roiBack": "506,185,66,67",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "937,308,35,135",
-    "roiBack": "892,214,153,315",
+    "roiFront": "458,238,35,135",
+    "roiBack": "407,147,153,315",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入爬塔"
@@ -47,8 +47,8 @@
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
-    "roiFront": "732,613,25,28",
-    "roiBack": "707,592,76,80",
+    "roiFront": "801,662,25,28",
+    "roiBack": "774,639,76,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "上锁图标"
@@ -56,8 +56,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "730,613,28,28",
-    "roiBack": "704,595,78,74",
+    "roiFront": "799,661,28,28",
+    "roiBack": "774,645,78,74",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -65,8 +65,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1052,562,84,46",
-    "roiBack": "1021,521,150,160",
+    "roiFront": "1129,611,84,46",
+    "roiBack": "1097,552,150,160",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "点击战斗"
@@ -74,8 +74,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1065,612,23,24",
-    "roiBack": "1044,589,103,71",
+    "roiFront": "1091,557,23,24",
+    "roiBack": "1081,532,103,71",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"
@@ -83,8 +83,8 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1147,667,21,27",
-    "roiBack": "1095,654,84,54",
+    "roiFront": "1133,557,21,27",
+    "roiBack": "1108,542,84,54",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -92,8 +92,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1241,669,23,23",
-    "roiBack": "1207,652,69,56",
+    "roiFront": "1214,559,23,23",
+    "roiBack": "1204,541,69,56",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"

+ 16 - 16
tasks/ActivityShikigami/as/ocr.json

@@ -1,47 +1,47 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1102,26,57,26",
-    "roiBack": "1102,26,57,26",
-    "mode": "DigitCounter",
+    "imageName": "as_remain_ap.png",
+    "roiFront": "1101,17,68,29",
+    "roiBack": "1101,17,68,29",
     "method": "Default",
-    "keyword": "",
+    "threshold": 0,
     "description": "体力的数量检测"
   },
   {
     "itemName": "remain_ap_activity",
-    "roiFront": "715,18,95,28",
-    "roiBack": "715,18,95,28",
-    "mode": "DigitCounter",
+    "imageName": "as_remain_ap_activity.png",
+    "roiFront": "942.2,17.39999999999992,73.60000000000014,29.799999999999926",
+    "roiBack": "942.2,17.39999999999992,73.60000000000014,29.799999999999926",
     "method": "Default",
-    "keyword": "",
+    "threshold": 0,
     "description": "活动体力的剩余检测"
   },
   {
     "itemName": "remain_buy",
+    "imageName": "as_remain_buy.png",
     "roiFront": "808,531,39,42",
     "roiBack": "808,531,39,42",
-    "mode": "DigitCounter",
     "method": "Default",
-    "keyword": "",
+    "threshold": 0,
     "description": "还有多少次购买体力的机会"
   },
   {
     "itemName": "remain_ap_activity2",
-    "roiFront": "756,17,52,29",
-    "roiBack": "756,17,52,29",
-    "mode": "Digit",
+    "imageName": "as_remain_ap_activity2.png",
+    "roiFront": "936,18,77,29",
+    "roiBack": "936,18,77,29",
     "method": "Default",
-    "keyword": "",
+    "threshold": 0,
     "description": "活动票数(没有百分比)"
   },
   {
     "itemName": "entry_activity",
+    "imageName": "",
     "roiFront": "71,241,98,32",
     "roiBack": "71,241,98,32",
-    "mode": "Single",
     "method": "Default",
-    "keyword": "阵练演武",
+    "threshold": 0,
     "description": "Ocr-description"
   }
 ]

+ 4 - 3
tasks/ActivityShikigami/script_task.py

@@ -128,9 +128,10 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 logger.info("General battle success")
 
         self.main_home()
-        self.open_buff()
-        self.soul(is_open=False)
-        self.close_buff()
+        # 某些活动需要开启御魂加成
+        # self.open_buff()
+        # self.soul(is_open=False)
+        # self.close_buff()
         if config.general_climb.active_souls_clean:
             self.set_next_run(task='SoulsTidy', success=False, finish=False, target=datetime.now())
         self.set_next_run(task="ActivityShikigami", success=True)