Explorar o código

feat(ActivityShikigami): Update

ryland hai 1 ano
pai
achega
9ac32ca704

BIN=BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN=BIN
tasks/ActivityShikigami/as/as_battle.png


BIN=BIN
tasks/ActivityShikigami/as/as_fire.png


BIN=BIN
tasks/ActivityShikigami/as/as_shi.png


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

@@ -20,10 +20,10 @@
   {
   {
     "itemName": "battle",
     "itemName": "battle",
     "imageName": "as_battle.png",
     "imageName": "as_battle.png",
-    "roiFront": "375,285,35,135",
-    "roiBack": "300,200,153,315",
+    "roiFront": "199,292,35,135",
+    "roiBack": "144,205,153,315",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "进入爬塔"
     "description": "进入爬塔"
   },
   },
   {
   {
@@ -56,10 +56,10 @@
   {
   {
     "itemName": "fire",
     "itemName": "fire",
     "imageName": "as_fire.png",
     "imageName": "as_fire.png",
-    "roiFront": "1135,581,84,78",
+    "roiFront": "1140,583,84,78",
     "roiBack": "1099,522,150,174",
     "roiBack": "1099,522,150,174",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "点击战斗"
     "description": "点击战斗"
   },
   },
   {
   {

+ 9 - 0
tasks/ActivityShikigami/as/ocr.json

@@ -25,5 +25,14 @@
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "还有多少次购买体力的机会"
     "description": "还有多少次购买体力的机会"
+  },
+  {
+    "itemName": "remain_ap_activity2",
+    "roiFront": "775,26,35,29",
+    "roiBack": "775,26,35,29",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "活动票数(没有百分比)"
   }
   }
 ]
 ]

+ 4 - 2
tasks/ActivityShikigami/assets.py

@@ -49,7 +49,7 @@ class ActivityShikigamiAssets:
 	# 左上角返回 
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(23,27,44,44), roi_back=(23,27,44,44), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	I_BACK_GREEN = RuleImage(roi_front=(23,27,44,44), roi_back=(23,27,44,44), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(375,285,35,135), roi_back=(300,200,153,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(199,292,35,135), roi_back=(144,205,153,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(327,627,145,28), roi_back=(256,462,301,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	I_DRUM = RuleImage(roi_front=(327,627,145,28), roi_back=(256,462,301,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
 	# 上锁图标 
@@ -57,7 +57,7 @@ class ActivityShikigamiAssets:
 	# 还未上锁图片 
 	# 还未上锁图片 
 	I_UNLOCK = RuleImage(roi_front=(823,654,28,28), roi_back=(776,610,112,87), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	I_UNLOCK = RuleImage(roi_front=(823,654,28,28), roi_back=(776,610,112,87), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1135,581,84,78), roi_back=(1099,522,150,174), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1140,583,84,78), roi_back=(1099,522,150,174), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
 	# 体力按钮 
 	I_AP = RuleImage(roi_front=(1138,668,23,24), roi_back=(1088,638,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	I_AP = RuleImage(roi_front=(1138,668,23,24), roi_back=(1088,638,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
 	# 活动体力 
@@ -79,5 +79,7 @@ class ActivityShikigamiAssets:
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(713,25,95,30), area=(713,25,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(713,25,95,30), area=(713,25,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
+	# 活动票数(没有百分比) 
+	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(775,26,35,29), area=(775,26,35,29), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
 
 
 
 

+ 28 - 23
tasks/ActivityShikigami/script_task.py

@@ -45,33 +45,33 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.ui_goto(page_main)
 
 
-        self.open_buff()
-        self.soul(is_open=True)
-        self.close_buff()
+        # self.open_buff()
+        # self.soul(is_open=True)
+        # self.close_buff()
 
 
         self.home_main()
         self.home_main()
 
 
         # 选择是游戏的体力还是活动的体力
         # 选择是游戏的体力还是活动的体力
         current_ap = config.general_climb.ap_mode
         current_ap = config.general_climb.ap_mode
-        #self.switch(current_ap)
+        self.switch(current_ap)
 
 
         # 设定是否锁定阵容
         # 设定是否锁定阵容
-        # if config.general_battle.lock_team_enable:
-        #     logger.info("Lock team")
-        #     while 1:
-        #         self.screenshot()
-        #         if self.appear_then_click(self.I_UNLOCK, interval=1):
-        #             continue
-        #         if self.appear(self.I_LOCK):
-        #             break
-        # else:
-        #     logger.info("Unlock team")
-        #     while 1:
-        #         self.screenshot()
-        #         if self.appear_then_click(self.I_LOCK, interval=1):
-        #             continue
-        #         if self.appear(self.I_UNLOCK):
-        #             break
+        if config.general_battle.lock_team_enable:
+            logger.info("Lock team")
+            while 1:
+                self.screenshot()
+                if self.appear_then_click(self.I_UNLOCK, interval=1):
+                    continue
+                if self.appear(self.I_LOCK):
+                    break
+        else:
+            logger.info("Unlock team")
+            while 1:
+                self.screenshot()
+                if self.appear_then_click(self.I_LOCK, interval=1):
+                    continue
+                if self.appear(self.I_UNLOCK):
+                    break
 
 
         # 流程应该是 在页面处:
         # 流程应该是 在页面处:
         # 1. 判定计数是否超了,时间是否超了
         # 1. 判定计数是否超了,时间是否超了
@@ -176,11 +176,16 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         """
         """
         self.screenshot()
         self.screenshot()
         if current_ap == ApMode.AP_ACTIVITY:
         if current_ap == ApMode.AP_ACTIVITY:
-            cu, res, total = self.O_REMAIN_AP_ACTIVITY.ocr(image=self.device.image)
-            if cu == 0 and cu + res == total:
-                logger.warning("Activity ap not enough")
+            res: int = self.O_REMAIN_AP_ACTIVITY2.ocr_digit(self.device.image)
+            if res <= 0:
+                logger.warning(f'Activity ap {res} not enough')
                 return False
                 return False
             return True
             return True
+            # cu, res, total = self.O_REMAIN_AP_ACTIVITY.ocr(image=self.device.image)
+            # if cu == 0 and cu + res == total:
+            #     logger.warning("Activity ap not enough")
+            #     return False
+            # return True
 
 
         elif current_ap == ApMode.AP_GAME:
         elif current_ap == ApMode.AP_GAME:
             cu, res, total = self.O_REMAIN_AP.ocr(image=self.device.image)
             cu, res, total = self.O_REMAIN_AP.ocr(image=self.device.image)

+ 3 - 3
tasks/Component/BaseActivity/config_activity.py

@@ -65,6 +65,6 @@ class GeneralClimb(ConfigBase):
             return def_value
             return def_value
         return def_value
         return def_value
 
 
-    @field_validator('ap_mode', mode='after')
-    def check_mode(cls, value):
-        return ApMode.AP_GAME
+    # @field_validator('ap_mode', mode='after')
+    # def check_mode(cls, value):
+    #     return ApMode.AP_GAME