Azure 1 год назад
Родитель
Сommit
4620872c46

+ 12 - 0
tasks/Dokan/assets.py

@@ -33,6 +33,12 @@ class DokanAssets:
 	C_DOKAN_BATTLE_QUIT_AREA = RuleClick(roi_front=(10,36,50,14), roi_back=(10,36,50,14), name="dokan_battle_quit_area")
 
 
+	# List Rule Assets
+	# 前往按钮列表
+	L_GOTO_CHEERING = RuleList(folder="./tasks/Dokan/res", direction="vertical", mode="ocr", roi_back=(950,172,54,324), size=(53, 62), 
+					 array=["前往"])
+
+
 	# Image Rule Assets
 	# 阴阳寮->神社的按钮 
 	I_RYOU_SHENSHE = RuleImage(roi_front=(850,660,100,60), roi_back=(850,660,100,60), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_shenshe.png")
@@ -150,6 +156,10 @@ class DokanAssets:
 	I_RYOU_DOKAN_DOKAN_QUIT = RuleImage(roi_front=(0,2,80,80), roi_back=(0,2,80,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_dokan_quit.png")
 	# 道馆攻破后夺得资金界面 
 	I_RYOU_DOKAN_SPOILS_OF_DOKAN = RuleImage(roi_front=(480,400,400,100), roi_back=(480,400,400,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_spoils_of_dokan.png")
+	# 助威可点击 
+	I_RYOU_DOKAN_CHEERING = RuleImage(roi_front=(65,601,71,33), roi_back=(44,568,112,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cheering.png")
+	# 助威灰色不可点击 
+	I_RYOU_DOKAN_CHEERING_GRAY = RuleImage(roi_front=(65,601,71,33), roi_back=(44,568,112,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cheering_gray.png")
 
 
 	# List Rule Assets
@@ -171,6 +181,8 @@ class DokanAssets:
 	O_DOKAN_RIGHTPAD_BOUNTY = RuleOcr(roi=(0,0,0,0), area=(0,0,0,0), mode="Single", method="Default", keyword="", name="dokan_rightpad_bounty")
 	# 查找道馆时,中间卡片上防守人数 
 	O_DOKAN_CENTER_PEOPLE_NUMBER = RuleOcr(roi=(0,0,0,0), area=(0,0,0,0), mode="Full", method="Default", keyword="", name="dokan_center_people_number")
+	# 道馆失败CD 
+	O_DOKEN_FAIL_CD = RuleOcr(roi=(1066,499,193,31), area=(1061,490,207,47), mode="Full", method="Default", keyword="", name="doken_fail_cd")
 
 
 	# Swipe Rule Assets

+ 13 - 0
tasks/Dokan/res/goto_list.json

@@ -0,0 +1,13 @@
+{
+  "name": "goto_cheering",
+  "direction": "vertical",
+  "type": "ocr",
+  "roiBack": "950,172,54,324",
+  "description": "前往按钮列表",
+  "list": [
+    {
+      "itemName": "前往",
+      "roiFront": "950,234,53,62"
+    }
+  ]
+}

+ 20 - 2
tasks/Dokan/res/image.json

@@ -516,9 +516,27 @@
     "itemName": "ryou_dokan_spoils_of_dokan",
     "imageName": "res_ryou_dokan_spoils_of_dokan.png",
     "roiFront": "480,400,400,100",
-    "roiBack":  "480,400,400,100",
+    "roiBack": "480,400,400,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "道馆攻破后夺得资金界面"
+  },
+  {
+    "itemName": "ryou_dokan_cheering",
+    "imageName": "res_ryou_dokan_cheering.png",
+    "roiFront": "65,601,71,33",
+    "roiBack": "44,568,112,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "助威可点击"
+  },
+  {
+    "itemName": "ryou_dokan_cheering_gray",
+    "imageName": "res_ryou_dokan_cheering_gray.png",
+    "roiFront": "65,601,71,33",
+    "roiBack": "44,568,112,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "助威灰色不可点击"
   }
-]
+]

+ 9 - 1
tasks/Dokan/res/ocr.json

@@ -44,7 +44,6 @@
     "keyword": "",
     "description": "查找道馆时,右侧边栏中的赏金"
   },
-
   {
     "itemName": "dokan_center_people_number",
     "roiFront": "0,0,0,0",
@@ -53,5 +52,14 @@
     "method": "Default",
     "keyword": "",
     "description": "查找道馆时,中间卡片上防守人数"
+  },
+  {
+    "itemName": "doken_fail_cd",
+    "roiFront": "1066,499,193,31",
+    "roiBack": "1061,490,207,47",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "道馆失败CD"
   }
 ]

+ 32 - 2
tasks/Dokan/script_task.py

@@ -32,7 +32,7 @@ from tasks.Dokan.dokan_scene import DokanScene, DokanSceneDetector
 from tasks.Dokan.ex_green_mark import ExtendGreenMark
 from tasks.Dokan.utils import detect_safe_area2
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_shikigami_records, page_guild, page_main
+from tasks.GameUi.page import page_shikigami_records, page_guild, page_main, random_click
 from tasks.Hyakkiyakou.utils.fast_device import FastDevice
 
 
@@ -770,8 +770,38 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
         return res_list
 
     def start_cheering(self):
-        # TODO 待实现
         logger.info("start cheering")
+        cd_text = self.O_DOKEN_FAIL_CD.detect_text(self.device.image)
+        match = re.search(r'\d+', cd_text)
+        remain_seconds = int(match.group()) if match else None
+        if not remain_seconds:
+            logger.info(f'No remain seconds, exit cheering, cd_text[{cd_text}]')
+            return
+        cheering_timer = Timer(remain_seconds).start()
+        while not cheering_timer.reached():
+            self.screenshot()
+            # 出现观战标志点击观战
+            if self.appear_then_click(self.I_RYOU_DOKAN_CD, interval=0.8):
+                continue
+            # 寻找前往按钮并点击
+            if self.list_appear_click(self.L_GOTO_CHEERING):
+                break
+            # 没有找到前往(全军覆没or没人上)则随机点击其他位置关闭弹窗
+            self.click(random_click(), interval=0.8)
+        logger.info('Enter battle to cheer')
+        while not cheering_timer.reached():
+            self.screenshot()
+            # 道馆成员战斗成功或失败或馆主战结束出现排名, 交给上层处理
+            if self.appear(self.I_RYOU_DOKAN_WIN, interval=1) or self.appear(self.I_FALSE) or self.appear(self.I_RYOU_DOKAN_TOPPA_RANK):
+                return
+            # 灰色助威
+            if self.is_in_battle(False) and self.appear(self.I_RYOU_DOKAN_CHEERING_GRAY, interval=1):
+                continue
+            # 亮色助威
+            if self.is_in_battle(False) and self.appear_then_click(self.I_RYOU_DOKAN_CHEERING, interval=1.5):
+                continue
+        # 助威时间到了且道馆还未结束, 则退出观战交给上层重新挑战
+        self.exit_battle()
         return
 
     def update_remain_attack_count(self) -> int: