runhey 3 лет назад
Родитель
Сommit
eae2947aff

BIN
tasks/ActivityShikigami/as/as_shi.png


+ 32 - 0
tasks/ActivityShikigami/as/click.json

@@ -0,0 +1,32 @@
+[
+  {
+    "itemName": "random_left",
+    "roiFront": "21,23,290,599",
+    "roiBack": "21,23,290,599",
+    "description": "description"
+  },
+  {
+    "itemName": "random_right",
+    "roiFront": "969,55,296,638",
+    "roiBack": "969,55,296,638",
+    "description": "description"
+  },
+  {
+    "itemName": "random_top",
+    "roiFront": "85,46,1159,101",
+    "roiBack": "85,46,1159,101",
+    "description": "description"
+  },
+  {
+    "itemName": "random_bottom",
+    "roiFront": "182,539,1063,100",
+    "roiBack": "182,539,1063,100",
+    "description": "description"
+  },
+  {
+    "itemName": "random_all",
+    "roiFront": "42,94,1207,543",
+    "roiBack": "42,94,1207,543",
+    "description": "description"
+  }
+]

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

@@ -2,7 +2,7 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "1014.3333333333333,206.66666666666652,49,39",
+    "roiFront": "434,268,49,39",
     "roiBack": "85,170,1029,142",
     "method": "Template matching",
     "threshold": 0.7,

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

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1096,26,116,28",
-    "roiBack": "1092,23,121,33",
+    "roiFront": "1180,682,80,25",
+    "roiBack": "1180,682,80,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 15 - 2
tasks/ActivityShikigami/assets.py

@@ -10,9 +10,22 @@ from module.atom.list import RuleList
 class ActivityShikigamiAssets: 
 
 
+	# Click Rule Assets
+	# description 
+	C_RANDOM_LEFT = RuleClick(roi_front=(21,23,290,599), roi_back=(21,23,290,599), name="random_left")
+	# description 
+	C_RANDOM_RIGHT = RuleClick(roi_front=(969,55,296,638), roi_back=(969,55,296,638), name="random_right")
+	# description 
+	C_RANDOM_TOP = RuleClick(roi_front=(85,46,1159,101), roi_back=(85,46,1159,101), name="random_top")
+	# description 
+	C_RANDOM_BOTTOM = RuleClick(roi_front=(182,539,1063,100), roi_back=(182,539,1063,100), name="random_bottom")
+	# description 
+	C_RANDOM_ALL = RuleClick(roi_front=(42,94,1207,543), roi_back=(42,94,1207,543), name="random_all")
+
+
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1014.3333333333333,206.66666666666652,49,39), roi_back=(85,170,1029,142), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(434,268,49,39), roi_back=(85,170,1029,142), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(13,18,44,44), roi_back=(13,18,49,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
@@ -41,7 +54,7 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1096,26,116,28), area=(1092,23,121,33), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1180,682,80,25), area=(1180,682,80,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(707,24,106,34), area=(707,24,106,34), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 

+ 34 - 0
tasks/ActivityShikigami/script_task.py

@@ -1,6 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+import random
 from datetime import datetime, timedelta, time
 
 from tasks.base_task import BaseTask
@@ -179,6 +180,39 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                     self.appear_then_click(self.I_SWITCH, interval=2)
 
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        # 重写
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        logger.info("Start battle process")
+        self.C_RANDOM_LEFT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_RIGHT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_TOP.name = "BATTLE_RANDOM"
+        self.C_RANDOM_BOTTOM.name = "BATTLE_RANDOM"
+        while 1:
+            self.screenshot()
+            # 如果出现了 “获得奖励”
+            reward_click = random.choice([self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM])
+            if self.appear_then_click(self.I_UI_REWARD, action=reward_click, interval=1.3):
+                continue
+            # 如果出现了 “鼓”
+            if self.appear(self.I_WIN):
+                logger.info("Win")
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_WIN):
+                        break
+                    if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
+                        continue
+                return True
+            # 失败 -> 正常人不会失败
+            if self.appear(self.I_FALSE):
+                logger.warning('False battle')
+                self.ui_click_until_disappear(self.I_FALSE)
+                return False
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
 
 
 if __name__ == '__main__':

+ 13 - 0
tasks/Component/BaseActivity/config_activity.py

@@ -48,3 +48,16 @@ class GeneralClimb(ConfigBase):
                     return time(hour=0, minute=30, second=0)
         return value
 
+    @validator('ap_game_max', pre=True, always=True)
+    def reset_game_max(cls, value):
+        def_value = 999
+        if isinstance(value, str):
+            try:
+                return int(value)
+            except ValueError:
+                logger.warning('Invalid ap_game_max value. Expected format: int')
+                return def_value
+        elif isinstance(value, int):
+            return def_value
+
+