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

Merge pull request #574 from ChengRanORZ/autodokan

feat(Dokan): 优化道馆模块
huangrunheng 1 год назад
Родитель
Сommit
21c2a4712c
47 измененных файлов с 1712 добавлено и 369 удалено
  1. 2 0
      tasks/Component/GeneralBattle/assets.py
  2. BIN
      tasks/Component/GeneralBattle/gb/gb_green_marker.png
  3. 9 0
      tasks/Component/GeneralBattle/gb/image.json
  4. 94 19
      tasks/Dokan/assets.py
  5. 137 4
      tasks/Dokan/config.py
  6. 141 0
      tasks/Dokan/dokan_scene.py
  7. 225 0
      tasks/Dokan/ex_green_mark.py
  8. 34 4
      tasks/Dokan/res/click.json
  9. 294 43
      tasks/Dokan/res/image.json
  10. 1 1
      tasks/Dokan/res/list.json
  11. 15 6
      tasks/Dokan/res/ocr.json
  12. BIN
      tasks/Dokan/res/res_dokan_boss_waiting.png
  13. BIN
      tasks/Dokan/res/res_ryou_dokan_abandoned_toppa.png
  14. BIN
      tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_abandoned.png
  15. BIN
      tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_continue.png
  16. BIN
      tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_ensure.png
  17. BIN
      tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_title.png
  18. BIN
      tasks/Dokan/res/res_ryou_dokan_activated.png
  19. BIN
      tasks/Dokan/res/res_ryou_dokan_battle_master_first.png
  20. BIN
      tasks/Dokan/res/res_ryou_dokan_battle_master_second.png
  21. BIN
      tasks/Dokan/res/res_ryou_dokan_center_challenge.png
  22. BIN
      tasks/Dokan/res/res_ryou_dokan_center_guanzhu_xiuxi.png
  23. BIN
      tasks/Dokan/res/res_ryou_dokan_center_point_people_number.png
  24. BIN
      tasks/Dokan/res/res_ryou_dokan_center_top.png
  25. BIN
      tasks/Dokan/res/res_ryou_dokan_challenge_ensure.png
  26. BIN
      tasks/Dokan/res/res_ryou_dokan_create_dokan.png
  27. BIN
      tasks/Dokan/res/res_ryou_dokan_create_dokan_ensure.png
  28. BIN
      tasks/Dokan/res/res_ryou_dokan_dokan_info_close.png
  29. BIN
      tasks/Dokan/res/res_ryou_dokan_dokan_quit.png
  30. BIN
      tasks/Dokan/res/res_ryou_dokan_failed_vote_battle_again.png
  31. BIN
      tasks/Dokan/res/res_ryou_dokan_failed_vote_keep_bounty.png
  32. BIN
      tasks/Dokan/res/res_ryou_dokan_finding_dokan.png
  33. BIN
      tasks/Dokan/res/res_ryou_dokan_found_dokan.png
  34. BIN
      tasks/Dokan/res/res_ryou_dokan_master_battle.png
  35. BIN
      tasks/Dokan/res/res_ryou_dokan_quit_battle_ensure.png
  36. BIN
      tasks/Dokan/res/res_ryou_dokan_refresh_ensure.png
  37. BIN
      tasks/Dokan/res/res_ryou_dokan_remain_attack_count_done.png
  38. BIN
      tasks/Dokan/res/res_ryou_dokan_remain_attack_count_one.png
  39. BIN
      tasks/Dokan/res/res_ryou_dokan_remain_attack_count_two.png
  40. BIN
      tasks/Dokan/res/res_ryou_dokan_remain_attack_count_zero.png
  41. BIN
      tasks/Dokan/res/res_ryou_dokan_rightpad_point_bounty.png
  42. BIN
      tasks/Dokan/res/res_ryou_dokan_shikigami.png
  43. BIN
      tasks/Dokan/res/res_ryou_dokan_today_attack_count.png
  44. BIN
      tasks/Dokan/res/res_ryou_dokan_toppa_rank.png
  45. BIN
      tasks/Dokan/res/scene_shenshe.png
  46. 9 0
      tasks/Dokan/res/swipe.json
  47. 751 292
      tasks/Dokan/script_task.py

+ 2 - 0
tasks/Component/GeneralBattle/assets.py

@@ -113,6 +113,8 @@ class GeneralBattleAssets:
 	I_PRESENT_LESS_THAN_5 = RuleImage(roi_front=(222,648,418,43), roi_back=(222,648,418,43), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_present_less_than_5.png")
 	# 封魔的金币 
 	I_DE_GOLD = RuleImage(roi_front=(61,52,30,25), roi_back=(45,33,65,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_de_gold.png")
+	# 绿标 
+	I_GREEN_MARKER = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_green_marker.png")
 
 
 	# Image Rule Assets

BIN
tasks/Component/GeneralBattle/gb/gb_green_marker.png


+ 9 - 0
tasks/Component/GeneralBattle/gb/image.json

@@ -214,5 +214,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "封魔的金币"
+  },
+  {
+    "itemName": "green_marker",
+    "imageName": "gb_green_marker.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "绿标"
   }
 ]

+ 94 - 19
tasks/Dokan/assets.py

@@ -12,28 +12,38 @@ class DokanAssets:
 
 	# Click Rule Assets
 	# 道馆随机点击安全区域 
-	C_DOKAN_RANDOM_CLICK_AREA = RuleClick(roi_front=(142,294,107,555), roi_back=(142,294,107,555), name="dokan_random_click_area")
+	C_DOKAN_RANDOM_CLICK_AREA = RuleClick(roi_front=(142,294,107,150), roi_back=(142,294,107,150), name="dokan_random_click_area")
 	# 道馆随机点击安全区域1:竂友突破信息 
-	C_DOKAN_RANDOM_CLICK_AREA1 = RuleClick(roi_front=(42,594,10,100), roi_back=(42,594,10,100), name="dokan_random_click_area1")
+	C_DOKAN_RANDOM_CLICK_AREA1 = RuleClick(roi_front=(42,594,10,30), roi_back=(42,594,10,30), name="dokan_random_click_area1")
 	# 道馆随机点击安全区域2:切换查看队伍模式。初步测试下来这个地方最安全,除了庭院、町中、逢魔外其他各场景都可用。 
 	C_DOKAN_RANDOM_CLICK_AREA2 = RuleClick(roi_front=(1122,360,10,40), roi_back=(1122,360,10,40), name="dokan_random_click_area2")
 	# 道馆随机点击安全区域3 
 	C_DOKAN_RANDOM_CLICK_AREA3 = RuleClick(roi_front=(333,44,107,20), roi_back=(333,44,107,20), name="dokan_random_click_area3")
+	# 道馆突破排名弹出时,点击此区域关闭 
+	C_DOKAN_TOPPA_RANK_CLOSE_AREA = RuleClick(roi_front=(1150,380,100,150), roi_back=(1150,380,100,150), name="dokan_toppa_rank_close_area")
 	# 准备战斗 
 	C_DOKAN_READY_FOR_BATTLE = RuleClick(roi_front=(42,94,1207,543), roi_back=(42,94,1207,543), name="dokan_ready_for_battle")
+	# 查找道馆时 点击此区域 隐藏道馆详情(显示防守人数,馆主等级等的卡片) 
+	C_DOKAN_CANCEL_SELECT_DOKAN = RuleClick(roi_front=(1070,610,30,90), roi_back=(1070,610,30,90), name="dokan_cancel_select_dokan")
+	# ruleanimate 用作检测选择道馆时,确定地图区域稳定无动作 
+	C_DOKAN_CANCEL_SELECT_DOKAN_CHECK_ANIMATE = RuleClick(roi_front=(600,330,80,60), roi_back=(600,330,80,60), name="dokan_cancel_select_dokan_check_animate")
+	# 查找道馆时 刷新道馆列表 
+	C_DOKAN_REFRESH = RuleClick(roi_front=(1140,630,40,30), roi_back=(1140,630,40,30), name="dokan_refresh")
+	# 道馆战斗时,左上角 退出按钮区域 
+	C_DOKAN_BATTLE_QUIT_AREA = RuleClick(roi_front=(10,36,50,14), roi_back=(10,36,50,14), name="dokan_battle_quit_area")
 
 
 	# Image Rule Assets
-	# 阴阳竂->神社 
-	I_RYOU_SHENSHE = RuleImage(roi_front=(476,173,62,24), roi_back=(476,173,62,24), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_shenshe.png")
+	# 阴阳寮->神社的按钮 
+	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")
 	# 神社->道馆 
-	I_RYOU_DOKAN = RuleImage(roi_front=(476,173,62,24), roi_back=(476,173,62,24), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan.png")
-	# []选择竂 
-	I_RYOU_DOKAN_RYOU_SELECT = RuleImage(roi_front=(567,15,144,42), roi_back=(567,15,144,42), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_ryou_select.png")
-	# 可选的竂列表 
-	I_RYOU_DOKAN_RYOU_LIST = RuleImage(roi_front=(567,15,144,42), roi_back=(567,15,144,42), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_ryou_list.png")
+	I_RYOU_DOKAN = RuleImage(roi_front=(465,160,100,50), roi_back=(465,160,100,50), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan.png")
+	# 阴阳寮卡通人界面,左侧已开启的活动 列表 
+	I_RYOU_DOKAN_ACTIVATED = RuleImage(roi_front=(0,150,200,400), roi_back=(0,150,200,400), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_activated.png")
 	# 是否已经成功进入道馆,上面中间的“道馆突破”文字 
 	I_RYOU_DOKAN_CHECK = RuleImage(roi_front=(567,15,144,42), roi_back=(567,15,144,42), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_check.png")
+	# 道馆内式神录 
+	I_RYOU_DOKAN_SHIKIGAMI = RuleImage(roi_front=(960,580,140,120), roi_back=(960,580,140,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_shikigami.png")
 	# 优先攻击选项 
 	I_RYOU_DOKAN_ATTACK_PRIORITY = RuleImage(roi_front=(666,672,58,25), roi_back=(666,672,58,25), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_priority.png")
 	# 优先攻击: 见习 
@@ -46,30 +56,56 @@ class DokanAssets:
 	I_RYOU_DOKAN_ATTACK_PRIORITY_3 = RuleImage(roi_front=(830,175,88,41), roi_back=(830,175,88,41), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_priority_3.png")
 	# 优先攻击: 黑脸 
 	I_RYOU_DOKAN_ATTACK_PRIORITY_4 = RuleImage(roi_front=(1072,178,94,39), roi_back=(1072,178,94,39), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_priority_4.png")
+	# 正在查找道馆,还未选择 
+	I_RYOU_DOKAN_FINDING_DOKAN = RuleImage(roi_front=(980,60,100,160), roi_back=(980,60,100,160), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_finding_dokan.png")
+	# 已选择道馆 
+	I_RYOU_DOKAN_FOUND_DOKAN = RuleImage(roi_front=(440,580,360,140), roi_back=(440,580,360,140), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_found_dokan.png")
 	# 状态:集结等待中。检查右下角的挑战是不是灰色的。FIXME 黄色和灰色的挑战截图总是傻傻分不清,先改用OCR 
 	I_RYOU_DOKAN_GATHERING = RuleImage(roi_front=(653,76,46,26), roi_back=(653,76,46,26), threshold=0.85, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_gathering.png")
 	# 状态:检查右下角有没有挑战?通常是失败了,并退出来到集结界面,可重新开始点击右下角挑战进入战斗 
-	I_RYOU_DOKAN_START_CHALLENGE = RuleImage(roi_front=(1132,572,89,43), roi_back=(1132,572,89,43), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_start_challenge.png")
+	I_RYOU_DOKAN_START_CHALLENGE = RuleImage(roi_front=(1100,550,180,80), roi_back=(1100,550,180,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_start_challenge.png")
 	# 状态:达到失败次数,CD中。挑战次数恢复倒数 
 	I_RYOU_DOKAN_CD1 = RuleImage(roi_front=(1068,500,146,27), roi_back=(1068,500,146,27), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cd1.png")
 	# 状态:达到失败次数,CD中。观战按钮 
 	I_RYOU_DOKAN_CD = RuleImage(roi_front=(1122,566,117,74), roi_back=(1122,566,117,74), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cd.png")
-	# 状态:进入战斗,待开始,右下角图标。TODO 欠截图。 
+	# 状态:进入战斗,待开始,右下角图标。 
 	I_RYOU_DOKAN_IN_FIELD = RuleImage(roi_front=(1128,536,100,100), roi_back=(1128,536,100,100), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_in_field.png")
 	# 馆主战等待中 
-	I_DOKAN_BOSS_WAITING = RuleImage(roi_front=(603,148,130,32), roi_back=(603,148,130,32), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_dokan_boss_waiting.png")
+	I_DOKAN_BOSS_WAITING = RuleImage(roi_front=(460,140,370,80), roi_back=(460,140,370,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_dokan_boss_waiting.png")
+	# 馆主战 等待 或 进行中时 在寮境中出现的馆主图标 
+	I_RYOU_DOKAN_MASTER_BATTLE = RuleImage(roi_front=(640,0,640,360), roi_back=(640,0,640,360), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_master_battle.png")
+	# 放弃突破 
+	I_DOKAN_ABANDONED_TOPPA = RuleImage(roi_front=(0,550,180,170), roi_back=(0,550,180,170), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_abandoned_toppa.png")
+	# 放弃突破 确认按钮 
+	I_DOKAN_ABANDONED_TOPPA_ENSURE = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_ensure.png")
+	# 放弃突破 
+	I_DOKAN_ABANDONED_TOPPA_TITLE = RuleImage(roi_front=(1020,160,260,80), roi_back=(1020,160,260,80), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_title.png")
 	# 状态:道馆胜利 
 	I_RYOU_DOKAN_WIN = RuleImage(roi_front=(628,60,45,33), roi_back=(628,60,45,33), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_win.png")
 	# 状态:进入战斗,待开始,右下角图标。 
 	I_RYOU_DOKAN_IN_FIELD2 = RuleImage(roi_front=(1131,562,88,48), roi_back=(1131,562,88,48), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_in_field2.png")
+	# 馆主战,第一阵容 
+	I_RYOU_DOKAN_BATTLE_MASTER_FIRST = RuleImage(roi_front=(1080,180,160,70), roi_back=(1080,180,160,70), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_battle_master_first.png")
+	# 馆主战,第二阵容 # TODO 截图 
+	I_RYOU_DOKAN_BATTLE_MASTER_SECOND = RuleImage(roi_front=(1080,180,160,70), roi_back=(1080,180,160,70), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_battle_master_second.png")
 	# 状态:战斗结算,可能是打完小朋友了,也可能是失败了。 
 	I_RYOU_DOKAN_BATTLE_OVER = RuleImage(roi_front=(571,503,106,49), roi_back=(571,503,106,49), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_battle_over.png")
 	# 状态:战斗中,左上角的加油图标 
 	I_RYOU_DOKAN_FIGHTING = RuleImage(roi_front=(232,36,42,19), roi_back=(232,36,42,19), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_fighting.png")
 	# 状态:道馆已经结束 
 	I_RYOU_DOKAN_FINISHED = RuleImage(roi_front=(658,649,91,27), roi_back=(658,649,91,27), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_finished.png")
-	# 状态:道馆挑战失败,投票NO 
-	I_RYOU_DOKAN_FAILED_VOTE_NO = RuleImage(roi_front=(567,15,144,42), roi_back=(567,15,144,42), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_failed_vote_no.png")
+	# 道馆失败/成功 出现的突破排名 弹窗 
+	I_RYOU_DOKAN_TOPPA_RANK = RuleImage(roi_front=(110,80,170,70), roi_back=(110,80,170,70), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_toppa_rank.png")
+	# 状态:道馆挑战失败,投票 保留赏金 
+	I_RYOU_DOKAN_FAILED_VOTE_KEEP_BOUNTY = RuleImage(roi_front=(1020,220,260,120), roi_back=(1020,220,260,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_failed_vote_keep_bounty.png")
+	# 状态:道馆挑战失败,投票 再战道馆 
+	I_RYOU_DOKAN_FAILED_VOTE_BATTLE_AGAIN = RuleImage(roi_front=(1020,220,260,120), roi_back=(1020,220,260,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_failed_vote_battle_again.png")
+	# 状态:道馆投票 放弃突破 
+	I_RYOU_DOKAN_ABANDONED_TOPPA_ABANDONED = RuleImage(roi_front=(1020,220,260,120), roi_back=(1020,220,260,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_abandoned.png")
+	# 状态:道馆投票 继续突破 
+	I_RYOU_DOKAN_ABANDONED_TOPPA_CONTINUE = RuleImage(roi_front=(1020,220,260,120), roi_back=(1020,220,260,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_continue.png")
+	# 道馆战斗界面 点击退出按钮后 弹出的确认按钮 
+	I_RYOU_DOKAN_QUIT_BATTLE_ENSURE = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_quit_battle_ensure.png")
 	# 道馆退出确认 
 	I_RYOU_DOKAN_EXIT_ENSURE = RuleImage(roi_front=(678,395,125,56), roi_back=(678,395,125,56), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_exit_ensure.png")
 	# 进入加油相关:道馆战报按钮 
@@ -78,13 +114,45 @@ class DokanAssets:
 	I_RYOU_DOKAN_CHEERING_ATTACKING_SAMA = RuleImage(roi_front=(948,182,56,295), roi_back=(948,182,56,295), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_cheering_attacking_sama.png")
 	# 场景检测:阴阳竂 
 	I_SCENE_RYOU = RuleImage(roi_front=(1161,674,75,31), roi_back=(1161,674,75,31), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/scene_ryou.png")
-	# 场景检测:阴阳竂 
-	I_SCENE_RYOU = RuleImage(roi_front=(1161,674,75,31), roi_back=(1161,674,75,31), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/scene_ryou.png")
+	# 场景检测:神社 
+	I_SCENE_SHENSHE = RuleImage(roi_front=(0,100,600,600), roi_back=(0,100,600,600), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/scene_shenshe.png")
+	# 道馆 地图界面 建立道馆按钮 
+	I_RYOU_DOKAN_CREATE_DOKAN = RuleImage(roi_front=(230,580,130,120), roi_back=(230,580,130,120), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_create_dokan.png")
+	# 道馆 地图界面 点击建立道馆按钮后弹窗中的 确认按钮 
+	I_RYOU_DOKAN_CREATE_DOKAN_ENSURE = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_create_dokan_ensure.png")
+	# 道馆信息 右上角关闭按钮 
+	I_RYOU_DOKAN_DOKAN_INFO_CLOSE = RuleImage(roi_front=(1150,80,100,90), roi_back=(1150,80,100,90), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_dokan_info_close.png")
+	# 寮境界面,道馆打完后 出现在底部的'今日可挑战机会'字样 
+	I_RYOU_DOKAN_TODAY_ATTACK_COUNT = RuleImage(roi_front=(500,630,250,50), roi_back=(500,630,250,50), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_today_attack_count.png")
+	# 今日道馆已挑战成功 
+	I_RYOU_DOKAN_REMAIN_ATTACK_COUNT_DONE = RuleImage(roi_front=(550,610,220,80), roi_back=(550,610,220,80), threshold=0.9, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_remain_attack_count_done.png")
+	# 今日可挑战次数:0次 
+	I_RYOU_DOKAN_REMAIN_ATTACK_COUNT_ZERO = RuleImage(roi_front=(650,610,110,80), roi_back=(650,610,110,80), threshold=0.9, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_remain_attack_count_zero.png")
+	# 今日可挑战次数:1次 
+	I_RYOU_DOKAN_REMAIN_ATTACK_COUNT_ONE = RuleImage(roi_front=(650,610,110,80), roi_back=(650,610,110,80), threshold=0.9, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_remain_attack_count_one.png")
+	# 今日可挑战次数:2次 
+	I_RYOU_DOKAN_REMAIN_ATTACK_COUNT_TWO = RuleImage(roi_front=(650,610,110,80), roi_back=(650,610,110,80), threshold=0.9, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_remain_attack_count_two.png")
+	# 查找道馆时,中间信息卡片 馆主等级-修习 
+	I_CENTER_GUANZHU_XIUXI = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_guanzhu_xiuxi.png")
+	# 查找道馆时,中间防守人数字样,为了定位该图下方的 防守人数数字 
+	I_CENTER_POINT_PEOPLE_NUMBER = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_point_people_number.png")
+	# 查找道馆时,挑战按钮 
+	I_CENTER_CHALLENGE = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_challenge.png")
+	# 查找道馆时,确认挑战按钮 
+	I_CHALLENGE_ENSURE = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_challenge_ensure.png")
+	# 查找道馆时,确认刷新道馆列表按钮 
+	I_REFRESH_ENSURE = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_refresh_ensure.png")
+	# 查找道馆时,右侧道馆赏金图标,为了定位该图右侧的 赏金金额 
+	I_RIGHTPAD_POINT_BOUNTY = RuleImage(roi_front=(1050,0,230,0), roi_back=(1050,0,230,50), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_rightpad_point_bounty.png")
+	# 寮境中上部的标志 
+	I_RYOU_DOKAN_CENTER_TOP = RuleImage(roi_front=(500,20,300,70), roi_back=(500,20,300,70), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_top.png")
+	# 左上角退出按钮- 
+	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")
 
 
 	# List Rule Assets
 	# 这个是当前活跃的竂活动列表界面 
-	L_RYOU_ACTIVITY_LIST = RuleList(folder="./tasks/Dokan/res", direction="vertical", mode="ocr", roi_back=(35,157,37,250), size=(42, 27), 
+	L_RYOU_ACTIVITY_LIST = RuleList(folder="./tasks/Dokan/res", direction="vertical", mode="ocr", roi_back=(20,150,170,400), size=(42, 27), 
 					 array=["道馆", "首领", "狭间"])
 
 
@@ -97,7 +165,14 @@ class DokanAssets:
 	O_DOKAN_ATTACKING = RuleOcr(roi=(1122,546,92,51), area=(1122,546,92,51), mode="Single", method="Default", keyword="剩余", name="dokan_attacking")
 	# 道馆里找文字:后挑战馆主 
 	O_DOKAN_BOSS_WAITING = RuleOcr(roi=(603,148,130,32), area=(603,148,130,32), mode="Single", method="Default", keyword="馆主", name="dokan_boss_waiting")
-	# 道馆里找文字:后关闭 
-	O_DOKAN_SUCCEEDED = RuleOcr(roi=(655,76,49,28), area=(655,76,49,28), mode="Full", method="Default", keyword="关闭", name="dokan_succeeded")
+	# 查找道馆时,右侧边栏中的赏金 
+	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")
+
+
+	# Swipe Rule Assets
+	# 道馆选择界面 右侧侧边栏 手指向上滑动 
+	S_DOKAN_LIST_UP = RuleSwipe(roi_front=(1100,420,30,21), roi_back=(1240,240,30,21), mode="default", name="dokan_list_up")
 
 

+ 137 - 4
tasks/Dokan/config.py

@@ -3,15 +3,118 @@
 # @author   jackyhwei
 # @note     draft version without full test
 # github    https://github.com/roarhill/oas
+import re
+from datetime import datetime
+from enum import Enum
 
 from pydantic import BaseModel, Field
-from enum import Enum
+
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
-from tasks.Component.config_base import ConfigBase, Time
+from tasks.Component.config_base import ConfigBase
 from tasks.Component.config_scheduler import Scheduler
 
 
+class AttackDokanMasterType(str, Enum):
+    """
+        NOTE: 如果第一个道馆没有放弃突破,那么没有第二次选择道馆的机会
+            目前如果设置打一次馆主,如果打不过(失败),会一直等待->挑战循环
+            导致失去放弃突破的机会->无法进行第二次道馆
+    """
+    # 不打馆主                                  0
+    ATTACK_ZERO_ZERO = "ATTACK_ZERO_ZERO"
+    # 第二次攻击时攻击馆主一次                     1
+    ATTACK_ZERO_ONE = "ATTACK_ZERO_ONE"
+    # 第一次攻击时不攻击馆主,第二次攻击时攻击馆主一次     2
+    ATTACK_ZERO_TWO = "ATTACK_ZERO_TWO"
+    #                                           3
+    ATTACK_ONE_ZERO = "ATTACK_ONE_ZERO"
+    # 第一次攻击时攻击馆主一次,第二次攻击时攻击馆主一次 4
+    ATTACK_ONE_ONE = "ATTACK_ONE_ONE"
+    # 第一次攻击时攻击馆主一次,第二次攻击时攻击馆主二次 5
+    ATTACK_ONE_TWO = "ATTACK_ONE_TWO"
+    # 第一次攻击时攻击馆主二次, 没有第二次了          8
+    ATTACK_TWO_TWO = "ATTACK_TWO_TWO"
+
+    def __int__(self):
+        match self.value:
+            case "ATTACK_ZERO_ZERO":
+                return 0
+            case "ATTACK_ZERO_ONE":
+                return 1
+            case "ATTACK_ZERO_TWO":
+                return 2
+            case "ATTACK_ONE_ZERO":
+                return 3
+            case "ATTACK_ONE_ONE":
+                return 4
+            case "ATTACK_ONE_TWO":
+                return 5
+            case "ATTACK_TWO_TWO":
+                return 8
+            case _:
+                return 8
+
+
+class AttackAccountConfig(BaseModel):
+    # 当天可攻击次数,用以记录当天运行历史,用作状态恢复,不用配置
+    remain_attack_count: int = Field(default=2)
+    # remain_attack_count 值记录的时间,不用配置
+    attack_date: str = Field(default='2023-01-01', description='attack_date_help')
+    # 每日最大攻击次数(1-2,默认2次),建议:僵尸寮配置2,其他寮配置1
+    daily_attack_count: int = Field(default=2, description='daily_attack_count_help')
+    # 攻击馆主配置,格式:ATTACK_X_Y          X:  第一个道馆,只打馆主一阵/两阵都打
+    #                                    Y:  第二个道馆,只打馆主一阵/两阵都打
+    # 建议普通寮配置ATTACK_TWO_TWO,僵尸寮看自己喜好
+    attack_dokan_master: AttackDokanMasterType = Field(default=AttackDokanMasterType.ATTACK_TWO_TWO,
+                                                       description='attack_dokan_master_help')
+
+    def init_attack_count(self, callback=None):
+        today = datetime.now().strftime("%Y-%m-%d")
+        if today != self.attack_date:
+            self.attack_date = today
+            self.remain_attack_count = 2
+        if not callback:
+            return
+        callback()
+
+    def attack_dokan_master_count(self) -> int:
+        """
+        根据当前配置,获取此次道馆突破,需要攻击馆主的次数
+        @return: 当前突破,可攻击馆主的次数
+        @rtype:
+        """
+        if self.attack_dokan_master == AttackDokanMasterType.ATTACK_ZERO_ZERO:
+            return 0
+        if self.attack_dokan_master == AttackDokanMasterType.ATTACK_TWO_TWO:
+            return 2
+        # 只攻击一次
+        # 或者
+        # 还有一次选择寮的机会,即,在打第一个寮的过程中
+        if self.daily_attack_count == 1 or self.remain_attack_count >= 1:
+            return int(self.attack_dokan_master) // 3
+        # 攻击两次 且 在打第二个寮的过程中
+        return int(self.attack_dokan_master) % 3
+
+    def set_attack_count(self, count=2, callback=None):
+        if count < 0:
+            return
+        self.attack_date = datetime.now().strftime("%Y-%m-%d")
+        self.remain_attack_count = count
+        if not callback:
+            return
+        callback()
+
+    def del_attack_count(self, count, callback=None):
+        today = datetime.now().strftime("%Y-%m-%d")
+        if today != self.attack_date:
+            self.attack_date = today
+            self.remain_attack_count = 2
+        self.remain_attack_count -= count
+        if not callback:
+            return
+        callback()
+
 
 class DokanConfig(BaseModel):
     # # 寮管理开启道馆
@@ -29,10 +132,40 @@ class DokanConfig(BaseModel):
     random_delay: bool = Field(default=False, description='random_delay_help')
 
     # 防封:使用固定的随机区域进行随机点击,若为False将自动识别当前画面中的最大纯色区域作为随机点击区域
-    anti_detect_click_fixed_random_area: bool = Field(default=False, description='anti_detect_click_fixed_random_area_help')
+    anti_detect_click_fixed_random_area: bool = Field(default=False,
+                                                      description='anti_detect_click_fixed_random_area_help')
+
+    # 只在周一到周四开启道馆
+    monday_to_thursday: bool = Field(default=True, description='monday_to_thursday_help')
+
+    # 是否尝试开启道馆,在道馆未开启时,尝试查找合适道馆并开启,需要有权限
+    try_start_dokan: bool = Field(default=False, description='try_start_dokan')
+
+    # 道馆系数,赏金/人数 根据喜好配置
+    find_dokan_score: float = Field(default=4.6, description='dokan_score_help')
+
+    # 单次查找道馆时,最大刷新次数.超过此次数后,若还未找到符合要求的,会随机选择一个道馆
+    find_dokan_refresh_count: int = Field(default=7, description='find_dokan_refresh_count_help')
+
+    # 是否切换阵容(速攻阵容/挂机阵容)
+    switch_preset_enable: bool = Field(default=False, description='switch_preset_enable_help')
+
+    # 速攻阵容 格式:n,n
+    preset_group_1: str = Field(default="", description='preset_group_help')
+    # 挂机阵容
+    preset_group_2: str = Field(default="", description='preset_group_help')
+
+    def parse_preset_group(self, value: str):
+        re_str = r"([1-7])\,([1-5])"
+        tmp = re.match(re_str, value)
+        if not tmp:
+            return None, None
+        return int(tmp.group(1)), int(tmp.group(2))
+
 
 class Dokan(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     dokan_config: DokanConfig = Field(default_factory=DokanConfig)
     general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
-    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    attack_count_config: AttackAccountConfig = Field(default_factory=AttackAccountConfig)

+ 141 - 0
tasks/Dokan/dokan_scene.py

@@ -0,0 +1,141 @@
+from enum import Enum
+
+from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
+from tasks.Dokan.assets import DokanAssets
+from tasks.base_task import BaseTask
+
+
+class DokanScene(Enum):
+    # 未知界面
+    RYOU_DOKAN_SCENE_UNKNOWN = 0
+    # 进入道馆,集结中
+    RYOU_DOKAN_SCENE_GATHERING = 1
+    # 进入战场,等待用户点击开始战斗
+    RYOU_DOKAN_SCENE_IN_FIELD = 2
+    # 通常是失败了,并退出来到集结界面,可重新开始点击右下角挑战进入战斗
+    RYOU_DOKAN_SCENE_START_CHALLENGE = 3
+    # 失败次数超过上限,CD中
+    RYOU_DOKAN_SCENE_CD = 4
+    # 战斗进行中
+    RYOU_DOKAN_SCENE_FIGHTING = 5
+    # 馆主战第一阵容
+    RYOU_DOKAN_SCENE_BATTLE_MASTER_FIRST = 6
+    # 馆主战第二阵容
+    RYOU_DOKAN_SCENE_BATTLE_MASTER_SECOND = 7
+    # 加油进行中
+    RYOU_DOKAN_SCENE_CHEERING = 8
+    # 道馆是否投降投票
+    RYOU_DOKAN_SCENE_ABANDON_VOTE = 9
+    # 道馆投降后 投票再战还是保留赏金
+    RYOU_DOKAN_SCENE_FAILED_VOTE = 10
+    # 阴阳竂
+    RYOU_DOKAN_RYOU = 11
+    # 战斗结算,可能是打完小朋友了,也可能是失败了。
+    RYOU_DOKAN_SCENE_BATTLE_OVER = 12
+    # 等待BOSS战
+    RYOU_DOKAN_SCENE_BOSS_WAITING = 13
+    # 馆主战中,处于寮境
+    RYOU_DOKAN_SCENE_MASTER_BATTLING = 14
+    # 弹出窗口,道馆打完后,出现的排名
+    RYOU_DOKAN_SCENE_TOPPA_RANK = 15
+
+    # 阴阳寮神社界面
+    RYOU_DOKAN_SHENSHE = 16
+
+    # 正在查找道馆,处于地图界面
+    RYOU_DOKAN_SCENE_FINDING_DOKAN = 97
+    # 已选择道馆,处于地图界面
+    RYOU_DOKAN_SCENE_FOUND_DOKAN = 98
+    # 道馆结束
+    RYOU_DOKAN_SCENE_FINISHED = 99
+
+    def __str__(self):
+        return self.name.title()
+
+
+class DokanSceneDetector(DokanAssets, BaseTask, GeneralBattleAssets):
+    def get_current_scene(self, reuse_screenshot: bool = True) -> tuple[bool, DokanScene]:
+        """
+        检测当前场景
+        @type reuse_screenshot: object
+        @return 从道馆地图开始,及其后面的所有道馆界面,都返回True
+                一般界面,如庭院,式神录等 都返回False
+        """
+        if not reuse_screenshot:
+            self.screenshot()
+        # logger.info(f"get_current_scene={reuse_screenshot}")
+        # 场景检测:阴阳竂
+        if self.appear(self.I_SCENE_RYOU, threshold=0.8):
+            return False, DokanScene.RYOU_DOKAN_RYOU
+        # 场景检测:神社
+        if self.appear(self.I_SCENE_SHENSHE, threshold=0.8):
+            return False, DokanScene.RYOU_DOKAN_SHENSHE
+        # 状态, 判断是否正在查找道馆
+        if self.appear(self.I_RYOU_DOKAN_FINDING_DOKAN):
+            return True, DokanScene.RYOU_DOKAN_SCENE_FINDING_DOKAN
+        # 状态, 判断是否已查找到道馆
+        if self.appear(self.I_RYOU_DOKAN_FOUND_DOKAN):
+            return True, DokanScene.RYOU_DOKAN_SCENE_FOUND_DOKAN
+
+        # 状态:判断是否集结中
+        if self.appear(self.I_RYOU_DOKAN_GATHERING, threshold=0.95):
+            return True, DokanScene.RYOU_DOKAN_SCENE_GATHERING
+
+        # 状态:是否在等待馆主战
+        if self.appear(self.I_DOKAN_BOSS_WAITING):
+            return True, DokanScene.RYOU_DOKAN_SCENE_BOSS_WAITING
+        # 状态: 馆主战开始,且可以挑战
+        if self.appear(self.I_RYOU_DOKAN_MASTER_BATTLE) and self.appear(self.I_RYOU_DOKAN_START_CHALLENGE):
+            return True, DokanScene.RYOU_DOKAN_SCENE_MASTER_BATTLING
+
+        # 馆主战斗中,未开始战斗状态
+        if self.appear(self.I_RYOU_DOKAN_BATTLE_MASTER_FIRST) and \
+                self.appear(self.I_PREPARE_HIGHLIGHT):
+            return True, DokanScene.RYOU_DOKAN_SCENE_BATTLE_MASTER_FIRST
+        if self.appear(self.I_RYOU_DOKAN_BATTLE_MASTER_SECOND) and \
+                self.appear(self.I_PREPARE_HIGHLIGHT):
+            return True, DokanScene.RYOU_DOKAN_SCENE_BATTLE_MASTER_SECOND
+
+        # 状态:达到失败次数,CD中
+        if self.appear(self.I_RYOU_DOKAN_CD):
+            return True, DokanScene.RYOU_DOKAN_SCENE_CD
+
+        # 状态:检查右下角有没有挑战?通常是失败了,并退出来到集结界面,可重新开始点击右下角挑战进入战斗
+        if self.appear(self.I_RYOU_DOKAN_START_CHALLENGE):
+            return True, DokanScene.RYOU_DOKAN_SCENE_START_CHALLENGE
+
+        # 状态:进入战斗,待开始
+        if self.appear(self.I_RYOU_DOKAN_IN_FIELD):
+            return True, DokanScene.RYOU_DOKAN_SCENE_IN_FIELD
+        # 状态:战斗结算,可能是打完小朋友了,也可能是失败了。
+        if self.appear(self.I_RYOU_DOKAN_BATTLE_OVER) or self.appear(GeneralBattleAssets.I_WIN) \
+                or self.appear(GeneralBattleAssets.I_FALSE):
+            return True, DokanScene.RYOU_DOKAN_SCENE_BATTLE_OVER
+
+        # # 状态:加油中,左下角有鼓
+        # if self.appear_then_click(self.I_RYOU_DOKAN_CHEERING, threshold=0.8) or self.appear(
+        #         self.I_RYOU_DOKAN_CHEERING_GRAY, threshold=0.8):
+        #     return True, DokanScene.RYOU_DOKAN_SCENE_CHEERING
+        # # 状态:战斗中,左上角的加油图标
+        # if self.appear(self.I_RYOU_DOKAN_FIGHTING, threshold=0.8):
+        #     return True, DokanScene.RYOU_DOKAN_SCENE_FIGHTING
+        # if self.appear(self.I_RYOU_DOKAN_FAILED_VOTE_NO):
+        #     return True, DokanScene.RYOU_DOKAN_SCENE_FAILED_VOTE_NO
+
+        # 打完道馆后,弹出的排名界面
+        if self.appear(self.I_RYOU_DOKAN_TOPPA_RANK):
+            return True, DokanScene.RYOU_DOKAN_SCENE_TOPPA_RANK
+        # 放弃突破投票,右侧俩 按钮:放弃/继续
+        if self.appear(self.I_RYOU_DOKAN_ABANDONED_TOPPA_CONTINUE):
+            return True, DokanScene.RYOU_DOKAN_SCENE_ABANDON_VOTE
+        # 放弃后投票,右侧俩按钮: 保留赏金/再战道馆
+        if self.appear(self.I_RYOU_DOKAN_FAILED_VOTE_KEEP_BOUNTY):
+            return True, DokanScene.RYOU_DOKAN_SCENE_FAILED_VOTE
+
+        # 状态:道馆已经结束 在寮境,底部有 "今日可挑战机会" 字样
+        if (self.appear(self.I_RYOU_DOKAN_CENTER_TOP) and
+                (self.appear(self.I_RYOU_DOKAN_TODAY_ATTACK_COUNT)
+                 or self.appear(self.I_RYOU_DOKAN_REMAIN_ATTACK_COUNT_DONE))):
+            return True, DokanScene.RYOU_DOKAN_SCENE_FINISHED
+
+        return False, DokanScene.RYOU_DOKAN_SCENE_UNKNOWN

+ 225 - 0
tasks/Dokan/ex_green_mark.py

@@ -0,0 +1,225 @@
+import threading
+import cv2
+import numpy as np
+
+from module.base.timer import Timer
+from module.logger import logger
+from tasks.Component.GeneralBattle.config_general_battle import GreenMarkType
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+
+
+def green_marker_detector(func):
+    def wrapper(self, *args, **kwargs):
+        event = threading.Event()
+
+        def detect_green_marker(image):
+            hsv_image = cv2.cvtColor(image, cv2.COLOR_RGB2HSV)
+            lower_green = np.array([67, 115, 110])
+            upper_green = np.array([80, 255, 232])
+            mask = cv2.inRange(hsv_image, lower_green, upper_green)
+            result = cv2.bitwise_and(image, image, mask=mask)
+            res = self.I_GREEN_MARKER.match(result)
+            return res
+
+        def emit_exists():
+            logger.info("Green marker detected!")
+            unpack_screenshot()
+            event.set()
+
+        def screenshot_and_detect():
+            self.just_screenshot()
+            exists = detect_green_marker(self.device.image)
+            if exists:
+                emit_exists()
+            return self.device.image
+
+        def pack_screenshot():
+            self.just_screenshot = self.screenshot
+            self.screenshot = screenshot_and_detect
+
+        def unpack_screenshot():
+            self.screenshot = self.just_screenshot
+
+        def thread_run(self, detect_time=3, cb=None, cbargs=None):
+            logger.info("detect thread running...")
+            t = Timer(detect_time)
+            t.start()
+            while event.wait(detect_time):
+                logger.info("detect thread quit")
+                return
+            unpack_screenshot()
+            if cb:
+                logger.info(f"didn't detect green mark ,start running callback with arg:{cbargs}")
+                try:
+                    cb(**cbargs)
+                except Exception as e:
+                    logger.error(f"callback error:{e}")
+
+        # wrapper
+        callback = kwargs.get('callback', None)
+        cbargs = kwargs.get('cbargs', None)
+        detect_time = kwargs.get('detect_time', 3.0)
+
+        if callback:
+            logger.info("Green marker detector running...")
+            pack_screenshot()
+        # green mark 函数的参数列表
+        kwarg_key = ['enable', 'mark_mode']
+        func_kwargs = {key: kwargs[key] for key in kwarg_key if key in kwargs}
+        if not event.is_set():
+            func(self, *args, **func_kwargs)
+
+        if callback:
+            thread = threading.Thread(target=thread_run, args=(self, detect_time, callback, cbargs), daemon=True)
+            thread.start()
+        return
+
+    return wrapper
+
+
+class ExtendGreenMark(GeneralBattle):
+
+    def __init__(self, config, device):
+        super().__init__(config, device)
+        self.super_green_mark = self.green_mark
+
+    @green_marker_detector
+    def ex_green_mark(self, enable=True, mark_mode=GreenMarkType.GREEN_MAIN):
+        if not enable:
+            return
+        return self.super_green_mark(enable=enable, mark_mode=mark_mode)
+
+    def ex_green_mark_3_retry(self, enable=True, mark_mode=GreenMarkType.GREEN_MAIN):
+        if not enable:
+            return
+        return self.ex_green_mark(enable=enable, mark_mode=mark_mode, detect_time=3, callback=self.super_green_mark,
+                                  cbargs={'enable': enable, 'mark_mode': mark_mode})
+
+    def green_mark_without_check(self, enable=True, mark_mode=GreenMarkType.GREEN_MAIN):
+        if not enable:
+            return
+        logger.info("Green is enable")
+        x, y = None, None
+        match mark_mode:
+            case GreenMarkType.GREEN_LEFT1:
+                x, y = self.C_GREEN_LEFT_1.coord()
+                logger.info("Green left 1")
+            case GreenMarkType.GREEN_LEFT2:
+                x, y = self.C_GREEN_LEFT_2.coord()
+                logger.info("Green left 2")
+            case GreenMarkType.GREEN_LEFT3:
+                x, y = self.C_GREEN_LEFT_3.coord()
+                logger.info("Green left 3")
+            case GreenMarkType.GREEN_LEFT4:
+                x, y = self.C_GREEN_LEFT_4.coord()
+                logger.info("Green left 4")
+            case GreenMarkType.GREEN_LEFT5:
+                x, y = self.C_GREEN_LEFT_5.coord()
+                logger.info("Green left 5")
+            case GreenMarkType.GREEN_MAIN:
+                x, y = self.C_GREEN_MAIN.coord()
+                logger.info("Green main")
+
+        # 点击绿标
+        self.device.click(x, y)
+
+    def custom_callback(self, enable=True, mark_mode=GreenMarkType.GREEN_MAIN):
+
+        return self.green_mark_without_check(enable, mark_mode)
+
+
+def change_green_mark(obj):
+    obj.old_green_mark = obj.green_mark
+    obj.green_mark = obj.ex_green_mark_3_retry
+
+
+if __name__ == '__main__':
+    # 读取图片,然后转换为HSV格式 ,使用cv2 matchtemplate 比较
+    import cv2
+    import numpy as np
+
+
+    def detect_green_marker_with_template(image_path, template_path):
+        # 读取图片
+        image = cv2.imread(image_path)
+        if image is None:
+            logger.error(f"Failed to read image from {image_path}")
+            return None
+
+        # 读取模板图片
+        template = cv2.imread(template_path)
+        if template is None:
+            logger.error(f"Failed to read template from {template_path}")
+            return None
+
+        # 转换为HSV格式
+        image = cv2.cvtColor(image, cv2.COLOR_BGR2HLS)
+        template = cv2.cvtColor(template, cv2.COLOR_BGR2HLS)
+        #
+        # image_h, image_s, image_v = cv2.split(image)
+        # template_h, template_s, template_v = cv2.split(template)
+        # image_s_norm = cv2.normalize(image_s, None, 0, 255, cv2.NORM_MINMAX)
+        # image_v_norm = cv2.normalize(image_v, None, 0, 255, cv2.NORM_MINMAX)
+        # template_s_norm = cv2.normalize(template_s, None, 0, 255, cv2.NORM_MINMAX)
+        # template_v_norm = cv2.normalize(template_v, None, 0, 255, cv2.NORM_MINMAX)
+
+        # clahe = cv2.createCLAHE(clipLimit=3.0, tileGridSize=(8, 8))
+        # image = clahe.apply(image_v)
+        # template = clahe.apply(template_v)
+
+        # 合并增强后的 HSV 通道
+        # image_enhanced_hsv = cv2.merge([image_h, image_s, image_v])
+        # template_enhanced_hsv = cv2.merge([template_h, template_s, template_v])
+
+        # 合并归一化后的 HSV 通道
+        # image = cv2.merge([image_h, image_s_norm, image_v_norm])
+        # template = cv2.merge([template_h, template_s_norm, template_v_norm])
+
+        # 使用matchTemplate进行比较
+        result = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
+        min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(result)
+
+
+
+
+
+        # 获取匹配结果的位置和相似度
+        top_left = max_loc
+        h, w = template.shape[:2]
+        bottom_right = (top_left[0] + w, top_left[1] + h)
+
+        # 绘制矩形框标记匹配区域(可选)
+        cv2.rectangle(image, top_left, bottom_right, (0, 255, 0), 2)
+
+        # 返回匹配结果
+        return {
+            "position": top_left,
+            "similarity": max_val,
+            "image": image
+        }
+
+
+    # 示例调用
+    result = detect_green_marker_with_template("E:\\111.png", "E:\\same.png")
+    if result:
+        logger.info(f"Match found at position: {result['position']} with similarity: {result['similarity']}")
+    else:
+        logger.info("No match found.")
+
+    result = detect_green_marker_with_template("E:\\111.png", "E:\\diff.png")
+    if result:
+        logger.info(f"Match found at position: {result['position']} with similarity: {result['similarity']}")
+    else:
+        logger.info("No match found.")
+
+    result = detect_green_marker_with_template("E:\\222.png", "E:\\gb_prepare_highlight.png")
+    if result:
+        logger.info(f"Match found at position: {result['position']} with similarity: {result['similarity']}")
+    else:
+        logger.info("No match found.")
+
+    result = detect_green_marker_with_template("E:\\222.png", "E:\\gb_prepare_dark.png")
+    if result:
+        logger.info(f"Match found at position: {result['position']} with similarity: {result['similarity']}")
+    else:
+        logger.info("No match found.")

+ 34 - 4
tasks/Dokan/res/click.json

@@ -1,14 +1,14 @@
 [
   {
     "itemName": "dokan_random_click_area",
-    "roiFront": "142,294,107,555",
-    "roiBack": "142,294,107,555",
+    "roiFront": "142,294,107,150",
+    "roiBack": "142,294,107,150",
     "description": "道馆随机点击安全区域"
   },
   {
     "itemName": "dokan_random_click_area1",
-    "roiFront": "42,594,10,100",
-    "roiBack": "42,594,10,100",
+    "roiFront": "42,594,10,30",
+    "roiBack": "42,594,10,30",
     "description": "道馆随机点击安全区域1:竂友突破信息"
   },
   {
@@ -23,10 +23,40 @@
     "roiBack": "333,44,107,20",
     "description": "道馆随机点击安全区域3"
   },
+  {
+    "itemName": "dokan_toppa_rank_close_area",
+    "roiFront": "1150,380,100,150",
+    "roiBack": "1150,380,100,150",
+    "description": "道馆突破排名弹出时,点击此区域关闭"
+  },
   {
     "itemName": "dokan_ready_for_battle",
     "roiFront": "42,94,1207,543",
     "roiBack": "42,94,1207,543",
     "description": "准备战斗"
+  },
+  {
+    "itemName": "dokan_cancel_select_dokan",
+    "roiFront": "1070,610,30,90",
+    "roiBack": "1070,610,30,90",
+    "description": "查找道馆时 点击此区域 隐藏道馆详情(显示防守人数,馆主等级等的卡片)"
+  },
+  {
+    "itemName": "dokan_cancel_select_dokan_check_animate",
+    "roiFront": "600,330,80,60",
+    "roiBack": "600,330,80,60",
+    "description": "ruleanimate 用作检测选择道馆时,确定地图区域稳定无动作"
+  },
+  {
+    "itemName": "dokan_refresh",
+    "roiFront": "1140,630,40,30",
+    "roiBack": "1140,630,40,30",
+    "description": "查找道馆时 刷新道馆列表"
+  },
+  {
+    "itemName": "dokan_battle_quit_area",
+    "roiFront": "10,36,50,14",
+    "roiBack": "10,36,50,14",
+    "description": "道馆战斗时,左上角 退出按钮区域"
   }
 ]

+ 294 - 43
tasks/Dokan/res/image.json

@@ -2,47 +2,47 @@
   {
     "itemName": "ryou_shenshe",
     "imageName": "res_ryou_shenshe.png",
-    "roiFront": "476,173,62,24",
-    "roiBack": "476,173,62,24",
+    "roiFront": "850,660,100,60",
+    "roiBack": "850,660,100,60",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "阴阳竂->神社"
+    "description": "阴阳寮->神社的按钮"
   },
   {
     "itemName": "ryou_dokan",
     "imageName": "res_ryou_dokan.png",
-    "roiFront": "476,173,62,24",
-    "roiBack": "476,173,62,24",
+    "roiFront": "465,160,100,50",
+    "roiBack": "465,160,100,50",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "神社->道馆"
   },
   {
-    "itemName": "ryou_dokan_ryou_select",
-    "imageName": "res_ryou_dokan_ryou_select.png",
-    "roiFront": "567,15,144,42",
-    "roiBack": "567,15,144,42",
+    "itemName": "ryou_dokan_activated",
+    "imageName": "res_ryou_dokan_activated.png",
+    "roiFront": "0,150,200,400",
+    "roiBack": "0,150,200,400",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "[]选择竂"
+    "description": "阴阳寮卡通人界面,左侧已开启的活动 列表"
   },
   {
-    "itemName": "ryou_dokan_ryou_list",
-    "imageName": "res_ryou_dokan_ryou_list.png",
+    "itemName": "ryou_dokan_check",
+    "imageName": "res_ryou_dokan_check.png",
     "roiFront": "567,15,144,42",
     "roiBack": "567,15,144,42",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "可选的竂列表"
+    "description": "是否已经成功进入道馆,上面中间的“道馆突破”文字"
   },
   {
-    "itemName": "ryou_dokan_check",
-    "imageName": "res_ryou_dokan_check.png",
-    "roiFront": "567,15,144,42",
-    "roiBack": "567,15,144,42",
+    "itemName": "ryou_dokan_shikigami",
+    "imageName": "res_ryou_dokan_shikigami.png",
+    "roiFront": "960,580,140,120",
+    "roiBack": "960,580,140,120",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "是否已经成功进入道馆,上面中间的“道馆突破”文字"
+    "description": "道馆内式神录"
   },
   {
     "itemName": "ryou_dokan_attack_priority",
@@ -98,8 +98,24 @@
     "threshold": 0.8,
     "description": "优先攻击: 黑脸"
   },
-
-
+  {
+    "itemName": "ryou_dokan_finding_dokan",
+    "imageName": "res_ryou_dokan_finding_dokan.png",
+    "roiFront": "980,60,100,160",
+    "roiBack": "980,60,100,160",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "正在查找道馆,还未选择"
+  },
+  {
+    "itemName": "ryou_dokan_found_dokan",
+    "imageName": "res_ryou_dokan_found_dokan.png",
+    "roiFront": "440,580,360,140",
+    "roiBack": "440,580,360,140",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已选择道馆"
+  },
   {
     "itemName": "ryou_dokan_gathering",
     "imageName": "res_ryou_dokan_gathering.png",
@@ -112,8 +128,8 @@
   {
     "itemName": "ryou_dokan_start_challenge",
     "imageName": "res_ryou_dokan_start_challenge.png",
-    "roiFront": "1132,572,89,43",
-    "roiBack": "1132,572,89,43",
+    "roiFront": "1100,550,180,80",
+    "roiBack": "1100,550,180,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "状态:检查右下角有没有挑战?通常是失败了,并退出来到集结界面,可重新开始点击右下角挑战进入战斗"
@@ -143,18 +159,53 @@
     "roiBack": "1128,536,100,100",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "状态:进入战斗,待开始,右下角图标。TODO 欠截图。"
+    "description": "状态:进入战斗,待开始,右下角图标。"
   },
   {
     "itemName": "dokan_boss_waiting",
     "imageName": "res_dokan_boss_waiting.png",
-    "roiFront": "603,148,130,32",
-    "roiBack": "603,148,130,32",
+    "roiFront": "460,140,370,80",
+    "roiBack": "460,140,370,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "馆主战等待中"
   },
-
+  {
+    "itemName": "ryou_dokan_master_battle",
+    "imageName": "res_ryou_dokan_master_battle.png",
+    "roiFront": "640,0,640,360",
+    "roiBack": "640,0,640,360",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "馆主战 等待 或 进行中时 在寮境中出现的馆主图标"
+  },
+  {
+    "itemName": "dokan_abandoned_toppa",
+    "imageName": "res_ryou_dokan_abandoned_toppa.png",
+    "roiFront": "0,550,180,170",
+    "roiBack": "0,550,180,170",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "放弃突破"
+  },
+  {
+    "itemName": "dokan_abandoned_toppa_ensure",
+    "imageName": "res_ryou_dokan_abandoned_toppa_ensure.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "放弃突破 确认按钮"
+  },
+  {
+    "itemName": "dokan_abandoned_toppa_title",
+    "imageName": "res_ryou_dokan_abandoned_toppa_title.png",
+    "roiFront": "1020,160,260,80",
+    "roiBack": "1020,160,260,80",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "放弃突破"
+  },
   {
     "itemName": "ryou_dokan_win",
     "imageName": "res_ryou_dokan_win.png",
@@ -164,7 +215,6 @@
     "threshold": 0.8,
     "description": "状态:道馆胜利"
   },
-
   {
     "itemName": "ryou_dokan_in_field2",
     "imageName": "res_ryou_dokan_in_field2.png",
@@ -174,6 +224,24 @@
     "threshold": 0.8,
     "description": "状态:进入战斗,待开始,右下角图标。"
   },
+  {
+    "itemName": "ryou_dokan_battle_master_first",
+    "imageName": "res_ryou_dokan_battle_master_first.png",
+    "roiFront": "1080,180,160,70",
+    "roiBack": "1080,180,160,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "馆主战,第一阵容"
+  },
+  {
+    "itemName": "ryou_dokan_battle_master_second",
+    "imageName": "res_ryou_dokan_battle_master_second.png",
+    "roiFront": "1080,180,160,70",
+    "roiBack": "1080,180,160,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "馆主战,第二阵容 # TODO 截图"
+  },
   {
     "itemName": "ryou_dokan_battle_over",
     "imageName": "res_ryou_dokan_battle_over.png",
@@ -183,7 +251,6 @@
     "threshold": 0.8,
     "description": "状态:战斗结算,可能是打完小朋友了,也可能是失败了。"
   },
-
   {
     "itemName": "ryou_dokan_fighting",
     "imageName": "res_ryou_dokan_fighting.png",
@@ -203,13 +270,58 @@
     "description": "状态:道馆已经结束"
   },
   {
-    "itemName": "ryou_dokan_failed_vote_no",
-    "imageName": "res_ryou_dokan_failed_vote_no.png",
-    "roiFront": "567,15,144,42",
-    "roiBack": "567,15,144,42",
+    "itemName": "ryou_dokan_toppa_rank",
+    "imageName": "res_ryou_dokan_toppa_rank.png",
+    "roiFront": "110,80,170,70",
+    "roiBack": "110,80,170,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "道馆失败/成功 出现的突破排名 弹窗"
+  },
+  {
+    "itemName": "ryou_dokan_failed_vote_keep_bounty",
+    "imageName": "res_ryou_dokan_failed_vote_keep_bounty.png",
+    "roiFront": "1020,220,260,120",
+    "roiBack": "1020,220,260,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "状态:道馆挑战失败,投票 保留赏金"
+  },
+  {
+    "itemName": "ryou_dokan_failed_vote_battle_again",
+    "imageName": "res_ryou_dokan_failed_vote_battle_again.png",
+    "roiFront": "1020,220,260,120",
+    "roiBack": "1020,220,260,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "状态:道馆挑战失败,投票 再战道馆"
+  },
+  {
+    "itemName": "ryou_dokan_abandoned_toppa_abandoned",
+    "imageName": "res_ryou_dokan_abandoned_toppa_abandoned.png",
+    "roiFront": "1020,220,260,120",
+    "roiBack": "1020,220,260,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "状态:道馆投票 放弃突破"
+  },
+  {
+    "itemName": "ryou_dokan_abandoned_toppa_continue",
+    "imageName": "res_ryou_dokan_abandoned_toppa_continue.png",
+    "roiFront": "1020,220,260,120",
+    "roiBack": "1020,220,260,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "状态:道馆投票 继续突破"
+  },
+  {
+    "itemName": "ryou_dokan_quit_battle_ensure",
+    "imageName": "res_ryou_dokan_quit_battle_ensure.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "状态:道馆挑战失败,投票NO"
+    "description": "道馆战斗界面 点击退出按钮后 弹出的确认按钮"
   },
   {
     "itemName": "ryou_dokan_exit_ensure",
@@ -220,8 +332,6 @@
     "threshold": 0.8,
     "description": "道馆退出确认"
   },
-
-  
   {
     "itemName": "ryou_dokan_cheering_scores",
     "imageName": "res_ryou_dokan_cheering_scores.png",
@@ -240,8 +350,6 @@
     "threshold": 0.8,
     "description": "进入加油相关:前往战斗中的竂友"
   },
-
-
   {
     "itemName": "scene_ryou",
     "imageName": "scene_ryou.png",
@@ -252,13 +360,156 @@
     "description": "场景检测:阴阳竂"
   },
   {
-    "itemName": "scene_ryou",
-    "imageName": "scene_ryou.png",
-    "roiFront": "1161,674,75,31",
-    "roiBack": "1161,674,75,31",
+    "itemName": "scene_shenshe",
+    "imageName": "scene_shenshe.png",
+    "roiFront": "0,100,600,600",
+    "roiBack": "0,100,600,600",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "场景检测:阴阳竂"
+    "description": "场景检测:神社"
+  },
+  {
+    "itemName": "ryou_dokan_create_dokan",
+    "imageName": "res_ryou_dokan_create_dokan.png",
+    "roiFront": "230,580,130,120",
+    "roiBack": "230,580,130,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "道馆 地图界面 建立道馆按钮"
+  },
+  {
+    "itemName": "ryou_dokan_create_dokan_ensure",
+    "imageName": "res_ryou_dokan_create_dokan_ensure.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "道馆 地图界面 点击建立道馆按钮后弹窗中的 确认按钮"
+  },
+  {
+    "itemName": "ryou_dokan_dokan_info_close",
+    "imageName": "res_ryou_dokan_dokan_info_close.png",
+    "roiFront": "1150,80,100,90",
+    "roiBack": "1150,80,100,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "道馆信息 右上角关闭按钮"
+  },
+  {
+    "itemName": "ryou_dokan_today_attack_count",
+    "imageName": "res_ryou_dokan_today_attack_count.png",
+    "roiFront": "500,630,250,50",
+    "roiBack": "500,630,250,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "寮境界面,道馆打完后 出现在底部的'今日可挑战机会'字样"
+  },
+  {
+    "itemName": "ryou_dokan_remain_attack_count_done",
+    "imageName": "res_ryou_dokan_remain_attack_count_done.png",
+    "roiFront": "550,610,220,80",
+    "roiBack": "550,610,220,80",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "今日道馆已挑战成功"
+  },
+  {
+    "itemName": "ryou_dokan_remain_attack_count_zero",
+    "imageName": "res_ryou_dokan_remain_attack_count_zero.png",
+    "roiFront": "650,610,110,80",
+    "roiBack": "650,610,110,80",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "今日可挑战次数:0次"
+  },
+  {
+    "itemName": "ryou_dokan_remain_attack_count_one",
+    "imageName": "res_ryou_dokan_remain_attack_count_one.png",
+    "roiFront": "650,610,110,80",
+    "roiBack": "650,610,110,80",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "今日可挑战次数:1次"
+  },
+  {
+    "itemName": "ryou_dokan_remain_attack_count_two",
+    "imageName": "res_ryou_dokan_remain_attack_count_two.png",
+    "roiFront": "650,610,110,80",
+    "roiBack": "650,610,110,80",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "今日可挑战次数:2次"
+  },
+  {
+    "itemName": "center_guanzhu_xiuxi",
+    "imageName": "res_ryou_dokan_center_guanzhu_xiuxi.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "查找道馆时,中间信息卡片 馆主等级-修习"
+  },
+  {
+    "itemName": "center_point_people_number",
+    "imageName": "res_ryou_dokan_center_point_people_number.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "查找道馆时,中间防守人数字样,为了定位该图下方的 防守人数数字"
+  },
+  {
+    "itemName": "center_challenge",
+    "imageName": "res_ryou_dokan_center_challenge.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "查找道馆时,挑战按钮"
+  },
+  {
+    "itemName": "challenge_ensure",
+    "imageName": "res_ryou_dokan_challenge_ensure.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "查找道馆时,确认挑战按钮"
+  },
+  {
+    "itemName": "refresh_ensure",
+    "imageName": "res_ryou_dokan_refresh_ensure.png",
+    "roiFront": "0,0,1280,720",
+    "roiBack": "0,0,1280,720",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "查找道馆时,确认刷新道馆列表按钮"
+  },
+  {
+    "itemName": "rightpad_point_bounty",
+    "imageName": "res_ryou_dokan_rightpad_point_bounty.png",
+    "roiFront": "1050,0,230,0",
+    "roiBack": "1050,0,230,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "查找道馆时,右侧道馆赏金图标,为了定位该图右侧的 赏金金额"
+  },
+  {
+    "itemName": "ryou_dokan_center_top",
+    "imageName": "res_ryou_dokan_center_top.png",
+    "roiFront": "500,20,300,70",
+    "roiBack": "500,20,300,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "寮境中上部的标志"
+  },
+  {
+    "itemName": "ryou_dokan_dokan_quit",
+    "imageName": "res_ryou_dokan_dokan_quit.png",
+    "roiFront": "0,2,80,80",
+    "roiBack": "0,2,80,80",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "左上角退出按钮-"
   }
-
 ]

+ 1 - 1
tasks/Dokan/res/list.json

@@ -2,7 +2,7 @@
     "name": "ryou_activity_list",
     "direction": "vertical",
     "type": "ocr",
-    "roiBack": "35,157,37,250",
+    "roiBack": "20,150,170,400",
     "description": "这个是当前活跃的竂活动列表界面",
     "list": [
       {

+ 15 - 6
tasks/Dokan/res/ocr.json

@@ -36,13 +36,22 @@
     "description": "道馆里找文字:后挑战馆主"
   },
   {
-    "itemName": "dokan_succeeded",
-    "roiFront": "655,76,49,28",
-    "roiBack": "655,76,49,28",
+    "itemName": "dokan_rightpad_bounty",
+    "roiFront": "0,0,0,0",
+    "roiBack": "0,0,0,0",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "查找道馆时,右侧边栏中的赏金"
+  },
+
+  {
+    "itemName": "dokan_center_people_number",
+    "roiFront": "0,0,0,0",
+    "roiBack": "0,0,0,0",
     "mode": "Full",
     "method": "Default",
-    "keyword": "关闭",
-    "description": "道馆里找文字:后关闭"
+    "keyword": "",
+    "description": "查找道馆时,中间卡片上防守人数"
   }
-
 ]

BIN
tasks/Dokan/res/res_dokan_boss_waiting.png


BIN
tasks/Dokan/res/res_ryou_dokan_abandoned_toppa.png


BIN
tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_abandoned.png


BIN
tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_continue.png


BIN
tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_ensure.png


BIN
tasks/Dokan/res/res_ryou_dokan_abandoned_toppa_title.png


BIN
tasks/Dokan/res/res_ryou_dokan_activated.png


BIN
tasks/Dokan/res/res_ryou_dokan_battle_master_first.png


BIN
tasks/Dokan/res/res_ryou_dokan_battle_master_second.png


BIN
tasks/Dokan/res/res_ryou_dokan_center_challenge.png


BIN
tasks/Dokan/res/res_ryou_dokan_center_guanzhu_xiuxi.png


BIN
tasks/Dokan/res/res_ryou_dokan_center_point_people_number.png


BIN
tasks/Dokan/res/res_ryou_dokan_center_top.png


BIN
tasks/Dokan/res/res_ryou_dokan_challenge_ensure.png


BIN
tasks/Dokan/res/res_ryou_dokan_create_dokan.png


BIN
tasks/Dokan/res/res_ryou_dokan_create_dokan_ensure.png


BIN
tasks/Dokan/res/res_ryou_dokan_dokan_info_close.png


BIN
tasks/Dokan/res/res_ryou_dokan_dokan_quit.png


BIN
tasks/Dokan/res/res_ryou_dokan_failed_vote_battle_again.png


BIN
tasks/Dokan/res/res_ryou_dokan_failed_vote_keep_bounty.png


BIN
tasks/Dokan/res/res_ryou_dokan_finding_dokan.png


BIN
tasks/Dokan/res/res_ryou_dokan_found_dokan.png


BIN
tasks/Dokan/res/res_ryou_dokan_master_battle.png


BIN
tasks/Dokan/res/res_ryou_dokan_quit_battle_ensure.png


BIN
tasks/Dokan/res/res_ryou_dokan_refresh_ensure.png


BIN
tasks/Dokan/res/res_ryou_dokan_remain_attack_count_done.png


BIN
tasks/Dokan/res/res_ryou_dokan_remain_attack_count_one.png


BIN
tasks/Dokan/res/res_ryou_dokan_remain_attack_count_two.png


BIN
tasks/Dokan/res/res_ryou_dokan_remain_attack_count_zero.png


BIN
tasks/Dokan/res/res_ryou_dokan_rightpad_point_bounty.png


BIN
tasks/Dokan/res/res_ryou_dokan_shikigami.png


BIN
tasks/Dokan/res/res_ryou_dokan_today_attack_count.png


BIN
tasks/Dokan/res/res_ryou_dokan_toppa_rank.png


BIN
tasks/Dokan/res/scene_shenshe.png


+ 9 - 0
tasks/Dokan/res/swipe.json

@@ -0,0 +1,9 @@
+[
+  {
+    "itemName": "dokan_list_up",
+    "roiFront": "1100,420,30,21",
+    "roiBack": "1240,240,30,21",
+    "mode": "default",
+    "description": "道馆选择界面 右侧侧边栏 手指向上滑动"
+  }
+]

Разница между файлами не показана из-за своего большого размера
+ 751 - 292
tasks/Dokan/script_task.py


Некоторые файлы не были показаны из-за большого количества измененных файлов