ソースを参照

fix(ActivityShikigami): Update

ryland 11 ヶ月 前
親
コミット
5047bbc897
29 ファイル変更、519 行追加、622 行削除
  1. 0 0
      tasks/ActivityShikigami/README.md
  2. BIN
      tasks/ActivityShikigami/as/as_battle_main_to_records.png
  3. BIN
      tasks/ActivityShikigami/as/as_buff_box_1_empty.png
  4. BIN
      tasks/ActivityShikigami/as/as_buff_box_2_empty.png
  5. BIN
      tasks/ActivityShikigami/as/as_buff_change_button.png
  6. BIN
      tasks/ActivityShikigami/as/as_buff_down.png
  7. BIN
      tasks/ActivityShikigami/as/as_buff_switch.png
  8. BIN
      tasks/ActivityShikigami/as/as_buff_up.png
  9. BIN
      tasks/ActivityShikigami/as/as_check_battle_main.png
  10. BIN
      tasks/ActivityShikigami/as/as_check_buff.png
  11. BIN
      tasks/ActivityShikigami/as/as_lock.png
  12. BIN
      tasks/ActivityShikigami/as/as_new.png
  13. BIN
      tasks/ActivityShikigami/as/as_red_exit_2.png
  14. BIN
      tasks/ActivityShikigami/as/as_shi.png
  15. BIN
      tasks/ActivityShikigami/as/as_to_battle_boss.png
  16. BIN
      tasks/ActivityShikigami/as/as_to_battle_main.png
  17. 3 138
      tasks/ActivityShikigami/as/image.json
  18. 0 63
      tasks/ActivityShikigami/as/ocr.json
  19. 83 0
      tasks/ActivityShikigami/as/pages.json
  20. 39 36
      tasks/ActivityShikigami/assets.py
  21. BIN
      tasks/ActivityShikigami/fire/fire_pass_1.png
  22. BIN
      tasks/ActivityShikigami/fire/fire_pass_2.png
  23. 29 0
      tasks/ActivityShikigami/fire/image.json
  24. 65 0
      tasks/ActivityShikigami/fire/ocr.json
  25. 61 46
      tasks/ActivityShikigami/page.py
  26. 215 308
      tasks/ActivityShikigami/script_task.py
  27. 1 1
      tasks/Component/BaseActivity/config_activity.py
  28. 6 2
      tasks/GameUi/game_ui.py
  29. 17 28
      tasks/GameUi/page.py

+ 0 - 0
tasks/ActivityShikigami/README.md


BIN
tasks/ActivityShikigami/as/as_battle_main_to_records.png


BIN
tasks/ActivityShikigami/as/as_buff_box_1_empty.png


BIN
tasks/ActivityShikigami/as/as_buff_box_2_empty.png


BIN
tasks/ActivityShikigami/as/as_buff_change_button.png


BIN
tasks/ActivityShikigami/as/as_buff_down.png


BIN
tasks/ActivityShikigami/as/as_buff_switch.png


BIN
tasks/ActivityShikigami/as/as_buff_up.png


BIN
tasks/ActivityShikigami/as/as_check_battle_main.png


BIN
tasks/ActivityShikigami/as/as_check_buff.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_new.png


BIN
tasks/ActivityShikigami/as/as_red_exit_2.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_boss.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


+ 3 - 138
tasks/ActivityShikigami/as/image.json

@@ -1,31 +1,4 @@
 [
-  {
-    "itemName": "shi",
-    "imageName": "as_shi.png",
-    "roiFront": "1183,319,47,38",
-    "roiBack": "1164,134,83,318",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "进入活动"
-  },
-  {
-    "itemName": "back_green",
-    "imageName": "as_back_green.png",
-    "roiFront": "27,19,34,38",
-    "roiBack": "2,1,170,75",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "左上角返回"
-  },
-  {
-    "itemName": "battle",
-    "imageName": "as_battle.png",
-    "roiFront": "813,254,35,135",
-    "roiBack": "754,140,154,315",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "征伐斗场"
-  },
   {
     "itemName": "battle_1",
     "imageName": "as_battle_1.png",
@@ -47,8 +20,8 @@
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
-    "roiFront": "884,648,28,25",
-    "roiBack": "739,613,276,76",
+    "roiFront": "825,657,28,25",
+    "roiBack": "739,613,276,85",
     "method": "Template matching",
     "threshold": 0.5,
     "description": "上锁图标"
@@ -57,7 +30,7 @@
     "itemName": "unlock",
     "imageName": "as_unlock.png",
     "roiFront": "884,648,28,25",
-    "roiBack": "733,607,266,85",
+    "roiBack": "733,607,266,95",
     "method": "Template matching",
     "threshold": 0.5,
     "description": "还未上锁图片"
@@ -107,24 +80,6 @@
     "threshold": 0.8,
     "description": "增加到最大"
   },
-  {
-    "itemName": "skip_button",
-    "imageName": "as_skip_button.png",
-    "roiFront": "1159,37,51,22",
-    "roiBack": "1141,27,86,43",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "右上跳过按钮"
-  },
-  {
-    "itemName": "red_exit",
-    "imageName": "as_red_exit.png",
-    "roiFront": "1162,96,39,38",
-    "roiBack": "1120,49,110,135",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "红色退出"
-  },
   {
     "itemName": "toggle_button",
     "imageName": "as_toggle_button.png",
@@ -161,78 +116,6 @@
     "threshold": 0.8,
     "description": "爬塔活动副页检查标志"
   },
-  {
-    "itemName": "red_exit_2",
-    "imageName": "as_red_exit_2.png",
-    "roiFront": "1097,177,46,45",
-    "roiBack": "931,128,237,164",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "爬塔活动页面的红色退出"
-  },
-  {
-    "itemName": "buff_down",
-    "imageName": "as_buff_down.png",
-    "roiFront": "428,625,100,37",
-    "roiBack": "177,600,1040,98",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "卸载buff"
-  },
-  {
-    "itemName": "buff_change_button",
-    "imageName": "as_buff_change_button.png",
-    "roiFront": "491,604,48,46",
-    "roiBack": "439,574,197,108",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "切换buff按钮"
-  },
-  {
-    "itemName": "buff_box_1_empty",
-    "imageName": "as_buff_box_1_empty.png",
-    "roiFront": "342,345,50,59",
-    "roiBack": "317,322,100,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "buff容器1为空"
-  },
-  {
-    "itemName": "buff_box_2_empty",
-    "imageName": "as_buff_box_2_empty.png",
-    "roiFront": "883,224,49,54",
-    "roiBack": "854,195,107,105",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "buff容器2为空"
-  },
-  {
-    "itemName": "buff_up",
-    "imageName": "as_buff_up.png",
-    "roiFront": "419,624,120,41",
-    "roiBack": "176,576,1025,142",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "装配buff"
-  },
-  {
-    "itemName": "buff_switch",
-    "imageName": "as_buff_switch.png",
-    "roiFront": "640,624,100,39",
-    "roiBack": "180,601,1026,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "buff切换"
-  },
-  {
-    "itemName": "check_buff",
-    "imageName": "as_check_buff.png",
-    "roiFront": "91,12,130,47",
-    "roiBack": "77,0,156,83",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "爬塔活动buff页"
-  },
   {
     "itemName": "entry_activity",
     "imageName": "as_entry_activity.png",
@@ -251,15 +134,6 @@
     "threshold": 0.8,
     "description": "活动列表页爬塔活动"
   },
-  {
-    "itemName": "act_map_switch",
-    "imageName": "as_act_map_switch.png",
-    "roiFront": "1196,303,59,48",
-    "roiBack": "1174,263,104,118",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "活动地图切换"
-  },
   {
     "itemName": "pass_act_locat",
     "imageName": "as_pass_act_locat.png",
@@ -268,14 +142,5 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "门票活动定位"
-  },
-  {
-    "itemName": "check_ap100",
-    "imageName": "as_check_ap100.png",
-    "roiFront": "971,575,96,100",
-    "roiBack": "934,537,166,167",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "100体爬塔标识"
   }
 ]

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

@@ -1,67 +1,4 @@
 [
-  {
-    "itemName": "remain_ap",
-    "roiFront": "727,18,105,28",
-    "roiBack": "716,11,122,41",
-    "mode": "DigitCounter",
-    "method": "Default",
-    "keyword": "",
-    "description": "体力的数量检测"
-  },
-  {
-    "itemName": "remain_ap_activity",
-    "roiFront": "534,18,70,28",
-    "roiBack": "534,18,70,28",
-    "mode": "DigitCounter",
-    "method": "Default",
-    "keyword": "",
-    "description": "活动体力的剩余检测"
-  },
-  {
-    "itemName": "remain_buy",
-    "roiFront": "808,531,39,42",
-    "roiBack": "808,531,39,42",
-    "mode": "DigitCounter",
-    "method": "Default",
-    "keyword": "",
-    "description": "还有多少次购买体力的机会"
-  },
-  {
-    "itemName": "remain_ap_activity2",
-    "roiFront": "1115,25,88,29",
-    "roiBack": "1107,14,103,50",
-    "mode": "Digit",
-    "method": "Default",
-    "keyword": "",
-    "description": "活动票数(没有百分比)"
-  },
-  {
-    "itemName": "entry_activity",
-    "roiFront": "73,189,98,32",
-    "roiBack": "72,188,98,32",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "临战演武",
-    "description": "从左侧进入战斗"
-  },
-  {
-    "itemName": "remain_boss",
-    "roiFront": "1113,669,131,31",
-    "roiBack": "1099,659,162,52",
-    "mode": "DigitCounter",
-    "method": "Default",
-    "keyword": "",
-    "description": "boss剩余攻击次数"
-  },
-  {
-    "itemName": "fire",
-    "roiFront": "1137,599,83,44",
-    "roiBack": "1129,570,100,100",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "挑战",
-    "description": "挑战"
-  },
   {
     "itemName": "remain_ap100",
     "roiFront": "922,21,112,39",

+ 83 - 0
tasks/ActivityShikigami/as/pages.json

@@ -0,0 +1,83 @@
+[
+  {
+    "itemName": "shi",
+    "imageName": "as_shi.png",
+    "roiFront": "1182,391,47,29",
+    "roiBack": "1164,134,83,318",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "进入活动"
+  },
+  {
+    "itemName": "back_green",
+    "imageName": "as_back_green.png",
+    "roiFront": "27,19,34,38",
+    "roiBack": "2,1,170,75",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "左上角返回"
+  },
+  {
+    "itemName": "skip_button",
+    "imageName": "as_skip_button.png",
+    "roiFront": "1159,37,51,22",
+    "roiBack": "1141,27,86,43",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "右上跳过按钮"
+  },
+  {
+    "itemName": "red_exit",
+    "imageName": "as_red_exit.png",
+    "roiFront": "1162,96,39,38",
+    "roiBack": "1120,49,110,135",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "红色退出"
+  },
+  {
+    "itemName": "to_battle_main",
+    "imageName": "as_to_battle_main.png",
+    "roiFront": "646,121,39,176",
+    "roiBack": "606,91,100,241",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入主要的战斗界面"
+  },
+  {
+    "itemName": "to_battle_boss",
+    "imageName": "as_to_battle_boss.png",
+    "roiFront": "931,217,37,173",
+    "roiBack": "909,198,100,219",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击进入boss战斗页面"
+  },
+  {
+    "itemName": "check_battle_main",
+    "imageName": "as_check_battle_main.png",
+    "roiFront": "30,130,75,46",
+    "roiBack": "17,104,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "check_battle_boss",
+    "imageName": "as_check_battle_boss.png",
+    "roiFront": "0,0,100,100",
+    "roiBack": "0,0,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_main_to_records",
+    "imageName": "as_battle_main_to_records.png",
+    "roiFront": "1208,112,39,42",
+    "roiBack": "1171,86,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从main进入到式神录"
+  }
+]

+ 39 - 36
tasks/ActivityShikigami/assets.py

@@ -58,20 +58,14 @@ class ActivityShikigamiAssets:
 
 
 	# Image Rule Assets
-	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1183,319,47,38), roi_back=(1164,134,83,318), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
-	# 左上角返回 
-	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
-	# 征伐斗场 
-	I_BATTLE = RuleImage(roi_front=(813,254,35,135), roi_back=(754,140,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 进入爬塔1 
 	I_BATTLE_1 = RuleImage(roi_front=(541,197,149,26), roi_back=(506,622,273,96), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_1.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_LOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(739,613,276,76), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,613,276,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,607,266,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,607,266,95), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 寿司体力 
 	I_AP = RuleImage(roi_front=(1181,657,23,24), roi_back=(1149,631,103,71), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
@@ -82,10 +76,6 @@ class ActivityShikigamiAssets:
 	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
 	# 增加到最大 
 	I_ADD_MAX = RuleImage(roi_front=(17,24,33,37), roi_back=(974,524,57,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_add_max.png")
-	# 右上跳过按钮 
-	I_SKIP_BUTTON = RuleImage(roi_front=(1159,37,51,22), roi_back=(1141,27,86,43), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_skip_button.png")
-	# 红色退出 
-	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
 	# description 
 	I_TOGGLE_BUTTON = RuleImage(roi_front=(1193,463,27,25), roi_back=(1169,146,73,403), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_toggle_button.png")
 	# 爬塔进入首领战 
@@ -94,32 +84,49 @@ class ActivityShikigamiAssets:
 	I_CHECK_BOSS = RuleImage(roi_front=(87,18,126,37), roi_back=(63,0,172,81), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_boss.png")
 	# 爬塔活动副页检查标志 
 	I_CHECK_BATTLE_2 = RuleImage(roi_front=(22,632,61,69), roi_back=(1,601,109,117), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_2.png")
-	# 爬塔活动页面的红色退出 
-	I_RED_EXIT_2 = RuleImage(roi_front=(1097,177,46,45), roi_back=(931,128,237,164), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit_2.png")
-	# 卸载buff 
-	I_BUFF_DOWN = RuleImage(roi_front=(428,625,100,37), roi_back=(177,600,1040,98), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_down.png")
-	# 切换buff按钮 
-	I_BUFF_CHANGE_BUTTON = RuleImage(roi_front=(491,604,48,46), roi_back=(439,574,197,108), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_change_button.png")
-	# buff容器1为空 
-	I_BUFF_BOX_1_EMPTY = RuleImage(roi_front=(342,345,50,59), roi_back=(317,322,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_box_1_empty.png")
-	# buff容器2为空 
-	I_BUFF_BOX_2_EMPTY = RuleImage(roi_front=(883,224,49,54), roi_back=(854,195,107,105), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_box_2_empty.png")
-	# 装配buff 
-	I_BUFF_UP = RuleImage(roi_front=(419,624,120,41), roi_back=(176,576,1025,142), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_up.png")
-	# buff切换 
-	I_BUFF_SWITCH = RuleImage(roi_front=(640,624,100,39), roi_back=(180,601,1026,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_switch.png")
-	# 爬塔活动buff页 
-	I_CHECK_BUFF = RuleImage(roi_front=(91,12,130,47), roi_back=(77,0,156,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_buff.png")
 	# 进入门票活动 
 	I_ENTRY_ACTIVITY = RuleImage(roi_front=(508,318,46,42), roi_back=(56,56,971,633), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_entry_activity.png")
 	# 活动列表页爬塔活动 
 	I_CHECK_ACT_LIST_CLIMB_ACT = RuleImage(roi_front=(538,194,497,193), roi_back=(415,67,773,390), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_act_list_climb_act.png")
-	# 活动地图切换 
-	I_ACT_MAP_SWITCH = RuleImage(roi_front=(1196,303,59,48), roi_back=(1174,263,104,118), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_act_map_switch.png")
 	# 门票活动定位 
 	I_PASS_ACT_LOCAT = RuleImage(roi_front=(1214,395,29,31), roi_back=(1179,373,100,86), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_pass_act_locat.png")
-	# 100体爬塔标识 
-	I_CHECK_AP100 = RuleImage(roi_front=(971,575,96,100), roi_back=(934,537,166,167), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_ap100.png")
+
+
+	# Ocr Rule Assets
+	# 100体活动门票检测 
+	O_REMAIN_AP100 = RuleOcr(roi=(922,21,112,39), area=(913,8,131,62), mode="Digit", method="Default", keyword="", name="remain_ap100")
+	# 进入100体活动标识 
+	O_ENTER_AP100 = RuleOcr(roi=(73,98,95,32), area=(5,79,256,108), mode="Single", method="Default", keyword="将魂试炼", name="enter_ap100")
+
+
+	# Image Rule Assets
+	# 进入活动 
+	I_SHI = RuleImage(roi_front=(1182,391,47,29), roi_back=(1164,134,83,318), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	# 左上角返回 
+	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
+	# 右上跳过按钮 
+	I_SKIP_BUTTON = RuleImage(roi_front=(1159,37,51,22), roi_back=(1141,27,86,43), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_skip_button.png")
+	# 红色退出 
+	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
+	# 进入主要的战斗界面 
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(646,121,39,176), roi_back=(606,91,100,241), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	# 点击进入boss战斗页面 
+	I_TO_BATTLE_BOSS = RuleImage(roi_front=(931,217,37,173), roi_back=(909,198,100,219), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
+	# description 
+	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(30,130,75,46), roi_back=(17,104,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
+	# description 
+	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
+	# 从main进入到式神录 
+	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1208,112,39,42), roi_back=(1171,86,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
+
+
+	# Image Rule Assets
+	# 征伐斗场 
+	I_BATTLE = RuleImage(roi_front=(813,254,35,135), roi_back=(754,140,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/fire/as_battle.png")
+	# description 
+	I_PASS_1 = RuleImage(roi_front=(359,295,100,53), roi_back=(68,203,1138,369), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_1.png")
+	# description 
+	I_PASS_2 = RuleImage(roi_front=(645,224,92,57), roi_back=(98,205,1076,366), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_2.png")
 
 
 	# Ocr Rule Assets
@@ -137,9 +144,5 @@ class ActivityShikigamiAssets:
 	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(1099,659,162,52), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
-	# 100体活动门票检测 
-	O_REMAIN_AP100 = RuleOcr(roi=(922,21,112,39), area=(913,8,131,62), mode="Digit", method="Default", keyword="", name="remain_ap100")
-	# 进入100体活动标识 
-	O_ENTER_AP100 = RuleOcr(roi=(73,98,95,32), area=(5,79,256,108), mode="Single", method="Default", keyword="将魂试炼", name="enter_ap100")
 
 

BIN
tasks/ActivityShikigami/fire/fire_pass_1.png


BIN
tasks/ActivityShikigami/fire/fire_pass_2.png


+ 29 - 0
tasks/ActivityShikigami/fire/image.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "battle",
+    "imageName": "as_battle.png",
+    "roiFront": "813,254,35,135",
+    "roiBack": "754,140,154,315",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "征伐斗场"
+  },
+  {
+    "itemName": "pass_1",
+    "imageName": "fire_pass_1.png",
+    "roiFront": "359,295,100,53",
+    "roiBack": "68,203,1138,369",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "pass_2",
+    "imageName": "fire_pass_2.png",
+    "roiFront": "645,224,92,57",
+    "roiBack": "98,205,1076,366",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

+ 65 - 0
tasks/ActivityShikigami/fire/ocr.json

@@ -0,0 +1,65 @@
+[
+   {
+    "itemName": "remain_ap",
+    "roiFront": "727,18,105,28",
+    "roiBack": "716,11,122,41",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "体力的数量检测"
+  },
+  {
+    "itemName": "remain_ap_activity",
+    "roiFront": "534,18,70,28",
+    "roiBack": "534,18,70,28",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "活动体力的剩余检测"
+  },
+  {
+    "itemName": "remain_buy",
+    "roiFront": "808,531,39,42",
+    "roiBack": "808,531,39,42",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "还有多少次购买体力的机会"
+  },
+  {
+    "itemName": "remain_ap_activity2",
+    "roiFront": "1115,25,88,29",
+    "roiBack": "1107,14,103,50",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "活动票数(没有百分比)"
+  },
+  {
+    "itemName": "entry_activity",
+    "roiFront": "73,189,98,32",
+    "roiBack": "72,188,98,32",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "临战演武",
+    "description": "从左侧进入战斗"
+  },
+  {
+    "itemName": "remain_boss",
+    "roiFront": "1113,669,131,31",
+    "roiBack": "1099,659,162,52",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "boss剩余攻击次数"
+  },
+  {
+    "itemName": "fire",
+    "roiFront": "1137,599,83,44",
+    "roiBack": "1129,570,100,100",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "挑战",
+    "description": "挑战"
+  }
+]

+ 61 - 46
tasks/ActivityShikigami/page.py

@@ -1,53 +1,68 @@
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets as asa
-from tasks.GameUi.page import Page, page_main, page_act_list_climb_act, page_reward, random_click, page_failed, page_battle, page_shikigami_records
+from tasks.GameUi.page import Page, page_main
 from tasks.GlobalGame.assets import GlobalGameAssets as gga
 from tasks.GameUi.assets import GameUiAssets as G
+from tasks.Component.RightActivity.assets import RightActivityAssets as RAA
 from tasks.base_task import BaseTask as BT
 
-# 爬塔活动界面
-page_climb_act = Page(asa.I_BATTLE)
-page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT, asa.I_RED_EXIT_2]
-page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
-page_act_list_climb_act.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
-# 爬塔活动副界面
-page_climb_act_2 = Page(asa.I_CHECK_BATTLE_2)
-page_climb_act_2.additional = [asa.I_ACT_MAP_SWITCH, asa.I_PASS_ACT_LOCAT, asa.I_SKIP_BUTTON, asa.I_RED_EXIT,
-                               asa.I_RED_EXIT_2]
-page_climb_act_2.link(button=G.I_BACK_BATTLE, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BATTLE, destination=page_climb_act_2)
-# 门票爬塔活动界面
-page_climb_act_pass = Page(asa.I_AP_ACTIVITY)
-page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT, ]
-page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-page_climb_act_2.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
-# 体力爬塔活动界面
-page_climb_act_ap = Page(asa.I_AP)
-page_climb_act_ap.additional = [asa.O_ENTRY_ACTIVITY, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD,
-                                asa.I_RED_EXIT]
-page_climb_act_ap.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap)
-# 体力, 门票互相跳转
-# page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
-# page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
-# 100体爬塔活动界面
-page_climb_act_ap100 = Page(asa.I_CHECK_AP100)
-page_climb_act_2.link(button=asa.O_ENTER_AP100, destination=page_climb_act_ap100)
-page_climb_act_ap100.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-# 爬塔活动boss战界面
-page_climb_act_boss = Page(asa.I_CHECK_BOSS)
-page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
-page_climb_act_boss.link(button=G.I_BACK_Y, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BOSS, destination=page_climb_act_boss)
-# 爬塔活动加成界面
-page_climb_act_buff = Page(asa.I_CHECK_BUFF)
-page_climb_act_buff.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
-page_climb_act_buff.link(button=G.I_BACK_Y, destination=page_climb_act)
-page_climb_act.link(button=asa.I_BUFF_CHANGE_BUTTON, destination=page_climb_act_buff)
+# ************************************* 活动部分 *****************************************#
+
+# 活动列表页 act_list
+# page_act_list = Page(G.I_CHECK_ACT_LIST)
+# page_act_list.additional = [G.I_PAPER_DOLL_CLOSE]
+# page_act_list.link(button=G.I_BACK_ACT_LIST, destination=page_main)
+# page_main.link(button=G.I_ACT_LIST_EXPAND, destination=page_act_list)
+# # 活动列表页爬塔活动
+# page_act_list_climb_act = Page(asa.I_CHECK_ACT_LIST_CLIMB_ACT)
+# page_act_list.link(button=G.L_ACT_LIST_OCR, destination=page_act_list_climb_act)
+# page_act_list_climb_act.link(button=G.I_BACK_ACT_LIST, destination=page_main)
 
-page_reward.link(button=random_click(), destination=page_climb_act_pass)
-page_reward.link(button=random_click(), destination=page_climb_act_ap)
-page_reward.link(button=random_click(), destination=page_climb_act_boss)
+# 爬塔活动主要界面
+page_climb_act = Page(asa.I_TO_BATTLE_MAIN)
+page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT]
+page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
+page_main.link(button=[asa.I_SHI, RAA.I_TOGGLE_BUTTON], destination=page_climb_act)
 
-page_failed.link(button=random_click(), destination=page_climb_act_pass)
-page_failed.link(button=random_click(), destination=page_climb_act_ap)
-page_failed.link(button=random_click(), destination=page_climb_act_boss)
+# page_act_list_climb_act.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
+# # 爬塔活动副界面
+# page_climb_act_2 = Page(asa.I_CHECK_BATTLE_2)
+# page_climb_act_2.additional = [asa.I_ACT_MAP_SWITCH, asa.I_PASS_ACT_LOCAT, asa.I_SKIP_BUTTON, asa.I_RED_EXIT,
+#                                asa.I_RED_EXIT_2]
+# page_climb_act_2.link(button=G.I_BACK_BATTLE, destination=page_climb_act)
+# page_climb_act.link(button=asa.I_BATTLE, destination=page_climb_act_2)
+# # 门票爬塔活动界面
+# page_climb_act_pass = Page(asa.I_AP_ACTIVITY)
+# page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT, ]
+# page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+# page_climb_act_2.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
+# # 体力爬塔活动界面
+# page_climb_act_ap = Page(asa.I_AP)
+# page_climb_act_ap.additional = [asa.O_ENTRY_ACTIVITY, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD,
+#                                 asa.I_RED_EXIT]
+# page_climb_act_ap.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+# page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap)
+# # 体力, 门票互相跳转
+# # page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
+# # page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
+# # 100体爬塔活动界面
+# page_climb_act_ap100 = Page(asa.I_CHECK_AP100)
+# page_climb_act_2.link(button=asa.O_ENTER_AP100, destination=page_climb_act_ap100)
+# page_climb_act_ap100.link(button=G.I_BACK_Y, destination=page_climb_act_2)
+# # 爬塔活动boss战界面
+# page_climb_act_boss = Page(asa.I_CHECK_BOSS)
+# page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
+# page_climb_act_boss.link(button=G.I_BACK_Y, destination=page_climb_act)
+# page_climb_act.link(button=asa.I_BOSS, destination=page_climb_act_boss)
+# # 爬塔活动加成界面
+# page_climb_act_buff = Page(asa.I_CHECK_BUFF)
+# page_climb_act_buff.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]
+# page_climb_act_buff.link(button=G.I_BACK_Y, destination=page_climb_act)
+# page_climb_act.link(button=asa.I_BUFF_CHANGE_BUTTON, destination=page_climb_act_buff)
+#
+# page_reward.link(button=random_click(), destination=page_climb_act_pass)
+# page_reward.link(button=random_click(), destination=page_climb_act_ap)
+# page_reward.link(button=random_click(), destination=page_climb_act_boss)
+#
+# page_failed.link(button=random_click(), destination=page_climb_act_pass)
+# page_failed.link(button=random_click(), destination=page_climb_act_ap)
+# page_failed.link(button=random_click(), destination=page_climb_act_boss)

+ 215 - 308
tasks/ActivityShikigami/script_task.py

@@ -3,26 +3,30 @@
 # github https://github.com/runhey
 from enum import Enum, auto
 from time import sleep
-
+from datetime import datetime, timedelta
 import cv2
 import numpy as np
 import random
-import tasks.Component.GeneralBattle.config_general_battle
-from datetime import datetime, timedelta, time
+from typing import Any
+from cached_property import cached_property
+
+from module.atom.image import RuleImage
 from module.atom.click import RuleClick
 from module.atom.ocr import RuleOcr
 from module.base.protect import random_sleep
 from module.base.timer import Timer
 from module.exception import TaskEnd
 from module.logger import logger
+
+from tasks.base_task import BaseTask
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from tasks.ActivityShikigami.config import SwitchSoulConfig, GeneralBattleConfig, ActivityShikigami
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.config_activity import GeneralClimb
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
+import tasks.Component.GeneralBattle.config_general_battle
 import tasks.ActivityShikigami.page as game
-from typing import Any
 
 
 def _prepare_image_for_ocr(image: np.ndarray, asset: RuleOcr) -> np.ndarray:
@@ -69,124 +73,186 @@ def _prepare_image_for_ocr(image: np.ndarray, asset: RuleOcr) -> np.ndarray:
     return image_copy
 
 
-class Status(Enum):
-    TIME_OUT = auto()  # 超时
-    DOWN = auto()  # 当前爬塔类型完成
-    ALL_DOWN = auto()  # 所有爬塔类型完成
-    ALREADY_SWITCH_SOUL = auto()  # 已经切换御魂
-    ALREADY_LOCK_TEAM = auto()  # 已经锁定队伍
-    ALREADY_SWITCH_BUFF = auto()  # 已经切换buff
-    GOTO_ACT_FAILED = auto()  # 前往活动失败
-    ENTER_BATTLE_FAILED = auto()  # 进入战斗失败
-    COUNT_LIMIT = auto()  # 达到次数限制
-    NO_TICKETS = auto()  # 没有票数
+class LimitTimeOut(Exception):
+    pass
+
+
+class LimitCountOut(Exception):
+    pass
 
 
-class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
-    _check_map = None
+class StateMachine(BaseTask):
+    run_idx: int = 0  # 当前爬塔类型
     _count_map = None
 
-    page_map: dict[str, game.Page] = {
-        'pass': game.page_climb_act_pass,
-        'ap': game.page_climb_act_ap,
-        'boss': game.page_climb_act_boss,
-        'ap100': game.page_climb_act_ap100,
-    }
-    run_idx: int = 0
-    conf: ActivityShikigami = None
+    @cached_property
+    def conf(self) -> GeneralClimb:
+        return self.config.model.activity_shikigami
+
+    @property
+    def climb_type(self) -> str:
+        if self.run_idx >= len(self.conf.general_climb.run_sequence_v):
+            return self.conf.general_climb.run_sequence_v[-1]
+        return self.conf.general_climb.run_sequence_v[self.run_idx]
+
+    @property
+    def count_map(self) -> dict[str, int]:
+        """
+        :return: key: climb type, value: run count
+        """
+        if not getattr(self, "_count_map", None):
+            self._count_map = {climb_type: 0 for climb_type in self.conf.general_climb.run_sequence_v}
+        return self._count_map
+
+    # ----------------------------------------------------
+    def put_status(self):
+        """
+        更新全局状态
+        """
+
+        def get_count(self) -> int:
+            return self.count_map[self.climb_type]
+
+        def get_limit(self) -> int:
+            limit = getattr(self.conf.general_climb, f'{self.climb_type}_limit', 0)
+            return 0 if not limit else limit
+
+        # 超过运行时间
+        if self.limit_time is not None and datetime.now() - self.start_time >= self.limit_time:
+            logger.info(f"Climb type {self.climb_type} time out")
+            raise LimitTimeOut
+        # 次数达到限制
+        if get_count(self) >= get_limit(self):
+            logger.info(f"Climb type {self.climb_type} count limit reached")
+            raise LimitCountOut
+
+    def switch_next(self):
+        """
+        切换下一种爬塔类型
+        :return: True 切换成功 or False
+        """
+        self.run_idx += 1
+        if self.run_idx >= len(self.conf.general_climb.run_sequence_v):
+            logger.info('All climbing activities have been completed')
+            return False
+        # 切换爬塔类型了, 恢复所有状态
+        self.current_count = 0
+        logger.hr(f'Climb switch to {self.climb_type}', 2)
+        return True
+
+
+class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
 
     def run(self) -> None:
-        self.conf = self.config.activity_shikigami
         self.limit_time: timedelta = self.conf.general_climb.limit_time_v
-        while True:
-            self.put_status()
-            # 超时或全部完成则退出
-            if self.check(Status.TIME_OUT) or self.check(Status.ALL_DOWN):
-                logger.hr(f'Climb act all down')
+        #
+        for climb_type in self.conf.general_climb.run_sequence_v:
+            # 进入到活动的主页面,不是具体的战斗页面
+            self.ui_get_current_page()
+            self.ui_goto(game.page_climb_act)
+            try:
+                method_func = getattr(self, f'_run_{climb_type}')
+                method_func()
+            except LimitCountOut as e:
+                self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=1)
+            except LimitTimeOut as e:
                 break
-            # 当前爬塔类型完成了或达到次数限制了, 切换下一个类型
-            if self.check(Status.DOWN) or self.check(Status.COUNT_LIMIT):
+            finally:
+                # 切换下一个爬塔类型
                 self.switch_next()
-                continue
-            # 获取当前页面
-            current_page = self.ui_get_current_page(False)
-            match current_page:
-                # 庭院, 进入活动主界面
-                case game.page_main:
-                    self.switch_soul(self.conf.switch_soul_config)
-                    self.home_main()
-                # 活动主界面或副界面, 进入最终爬塔界面
-                case game.page_climb_act | game.page_climb_act_2:
-                    self.switch_soul(self.conf.switch_soul_config)
-                    # self.ui_goto(game.page_climb_act_buff)
-                    self.goto_act()
-                # buff界面, 进入最终爬塔界面
-                case game.page_climb_act_buff:
-                    self.switch_buff(self.conf.general_climb)
-                    self.goto_act()
-                # 最终爬塔界面
-                case game.page_climb_act_pass | game.page_climb_act_ap | game.page_climb_act_ap100 | game.page_climb_act_boss:
-                    self.switch_soul(self.conf.switch_soul_config)
-                    self.lock_team(self.conf.general_battle)
-                    self.check_tickets_enough()
-                    self.start_battle()
-                case game.page_battle:
-                    self.battle_wait(getattr(self.conf.general_battle, f'enable_{self.climb_type}_anti_detect', False))
-                case _:
-                    if self.check(Status.GOTO_ACT_FAILED):
-                        logger.warning(f'Climb type[{self.climb_type}] goto failed')
-                        self.put_check(Status.DOWN, True)
-                        continue
-                    self.put_check(Status.GOTO_ACT_FAILED, True)
-                    # 任何活动界面都没有识别到, 尝试主动前往爬塔活动
-                    self.goto_act(timeout=25)
+
         # 返回庭院
-        self.main_home()
+        logger.hr("Exit Shikigami", 2)
+        self.ui_get_current_page(False)
+        self.ui_goto(game.page_main)
         if self.conf.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)
         raise TaskEnd
 
+    def _run_pass(self):
+        logger.hr(f'Start run climb type PASS', 1)
+        self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
+        self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
+
+        ocr_limit_timer = Timer(1).start()
+        while 1:
+            self.screenshot()
+            self.put_status()
+            ##
+            if self.appear_then_click(self.I_PASS_1, interval=4):
+                continue
+            if self.appear_then_click(self.I_PASS_1, interval=4):
+                continue
+            if not ocr_limit_timer.reached():
+                continue
+            ocr_limit_timer.reset()
+            if not self.ocr_appear(self.O_FIRE):
+                continue
+            #  --------------------------------------------------------------
+            self.lock_team(self.conf.general_battle)
+            if not self.check_tickets_enough():
+                logger.warning(f'No tickets left, wait for next time')
+                break
+            # 点击战斗前随机休息
+            if self.conf.general_climb.random_sleep:
+                random_sleep(probability=0.2)
+            if self.start_battle():
+                continue
+
+        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=1)
+
+    def _run_ap(self):
+        logger.hr(f'Start run climb type AP')
+        self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
+        self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
+
+        ocr_limit_timer = Timer(1).start()
+        while 1:
+            self.screenshot()
+            self.put_status()
+            # --------------------------------------------------------------
+            if self.appear_then_click(self.I_CHECK_BATTLE_MAIN, interval=4):
+                continue
+            if not ocr_limit_timer.reached():
+                continue
+            ocr_limit_timer.reset()
+            if not self.ocr_appear(self.O_FIRE):
+                continue
+            #  --------------------------------------------------------------
+            self.lock_team(self.conf.general_battle)
+            if not self.check_tickets_enough():
+                logger.warning(f'No tickets left, wait for next time')
+                break
+            # 点击战斗前随机休息
+            if self.conf.general_climb.random_sleep:
+                random_sleep(probability=0.2)
+            if self.start_battle():
+                continue
+
+        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=1)
+
+    def _run_boss(self):
+        pass
+
     def start_battle(self):
-        # 先识别是否在挑战界面, 不在则交给上层处理
-        if not self.wait_until_appear(self.O_FIRE, wait_time=3):
-            logger.warning(f'Detect fire fail, try reidentify')
-            return
-        # 点击战斗前随机休息
-        if self.conf.general_climb.random_sleep:
-            random_sleep(probability=0.2)
         click_times, max_times = 0, random.randint(2, 4)
         while 1:
             self.screenshot()
             if self.is_in_battle(False):
-                # 进入战斗了则一定有门票
-                self.put_check(Status.NO_TICKETS, False)
                 break
             if click_times >= max_times:
-                # 挑战点击失败, 且无门票则大概率真没有票了
-                if self.check(Status.NO_TICKETS):
-                    self.put_check(Status.DOWN, True)
-                    logger.info(f'Climb {self.climb_type} no tickets detected, try next')
-                    return
-                # 有门票且挑战已经点击失败过一次了
-                if self.check(Status.ENTER_BATTLE_FAILED):
-                    logger.warning(f'Climb {self.climb_type} cannot enter, maybe already end, try next')
-                    self.put_check(Status.DOWN, True)
-                    return
-                # 有门票但挑战点击失败, 交给上层处理
-                logger.warning(f'Climb type {self.climb_type} enter fail, try reidentify')
-                self.put_check(Status.ENTER_BATTLE_FAILED, True)
+                logger.warning(f'Climb {self.climb_type} cannot enter, maybe already end, try next')
                 return
-            # 点击挑战
-            if self.ocr_appear_click(self.O_FIRE, interval=2):
-                click_times += 1
-                logger.info(f'Try click fire, remain times[{max_times - click_times}]')
-                continue
             if ((self.appear_then_click(self.I_C_CONFIRM1, interval=0.6) or
                  self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1) or
                  self.appear_then_click(self.I_UI_CONFIRM, interval=1)) or
                     self.appear_then_click(self.I_N_CONFIRM, interval=1)):
                 continue
+            if self.ocr_appear_click(self.O_FIRE, interval=2):
+                click_times += 1
+                logger.info(f'Try click fire, remain times[{max_times - click_times}]')
+                continue
         # 运行战斗
         self.run_general_battle(config=self.get_general_battle_conf())
 
@@ -201,7 +267,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         ok_cnt, max_retry = 0, 5
         single_start_time = datetime.now()
         while 1:
-            sleep(random.uniform(1, 1.5))
+            sleep(random.uniform(0.5, 1.5))
             self.screenshot()
             # 达到最大重试次数则直接交给上层处理
             if ok_cnt > max_retry:
@@ -209,170 +275,86 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             # 识别到挑战说明已经退出战斗
             if ok_cnt > 0 and self.ocr_appear(self.O_FIRE):
                 return True
-            # 失败
+            # 战斗失败
             if self.appear(self.I_FALSE):
                 logger.warning("Battle failed")
                 self.ui_click_until_smt_disappear(self.random_reward_click(click_now=False), self.I_FALSE, interval=1.5)
                 return False
-            # 奖励界面
-            if self.ui_page_appear(game.page_reward, interval=0.6):
-                logger.info(f'Battle success, try close reward page[{ok_cnt}]')
-                self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
-                ok_cnt += 1
+            # 战斗成功
+            if self.appear_then_click(self.I_WIN, interval=2):
                 continue
+            if self.appear(self.I_REWARD):
+                logger.info('Win battle')
+                self.ui_click_until_disappear(self.I_REWARD, interval=1.5)
+                return True
             # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
-            if ok_cnt > 0 and not self.is_in_battle(False):
-                self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
-                ok_cnt += 1
-                continue
-            # 单局到时间自动退出战斗
-            if ok_cnt == 0 and datetime.now() - single_start_time > self.conf.general_climb.get_single_limit_time(
-                    self.climb_type, timedelta(days=1)):
-                logger.attr(self.climb_type, 'Time limit arrived, close current battle')
-                self.exit_battle(skip_first=True)
-                ok_cnt += 1
-                continue
+            # if ok_cnt > 0 and not self.is_in_battle(False):
+            #     self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
+            #     ok_cnt += 1
+            #     continue
+            # # 单局到时间自动退出战斗
+            # if ok_cnt == 0 and datetime.now() - single_start_time > self.conf.general_climb.get_single_limit_time(
+            #         self.climb_type, timedelta(days=1)):
+            #     logger.attr(self.climb_type, 'Time limit arrived, close current battle')
+            #     self.exit_battle(skip_first=True)
+            #     ok_cnt += 1
+            #     continue
             # 战斗中随机滑动
             if ok_cnt == 0 and random_click_swipt_enable:
                 self.random_click_swipt()
         return True
 
-    def exit_battle(self, skip_first: bool = False) -> bool:
-        """
-        在战斗的时候强制退出战斗
-        :param skip_first: 是否跳过第一次截屏
-        :return: 退出战斗成功True or 失败False
-        """
-        timeout_timer = Timer(6).start()
-        exit_clicked = False
-        while not timeout_timer.reached():
-            self.maybe_screenshot(skip_first)
-            skip_first = False
-            # 不在战斗界面, 认为退出成功
-            if not self.is_in_battle(False):
-                return True
-            if exit_clicked:
-                self.appear_then_click(self.I_EXIT_ENSURE)
-            if not exit_clicked and self.appear_then_click(self.I_EXIT):
-                exit_clicked = True
-            sleep(random.uniform(0.5, 1.5))
-        # 还在战斗界面且超时则退出失败
-        return False
-
-    def switch_soul(self, conf: SwitchSoulConfig):
-        """
-        根据当前爬塔类型自动切换御魂
-        :param conf: 切换御魂配置
-        :return:
-        """
-        if self.check(Status.ALREADY_SWITCH_SOUL):
-            return
+    # def exit_battle(self, skip_first: bool = False) -> bool:
+    #     """
+    #     在战斗的时候强制退出战斗
+    #     :param skip_first: 是否跳过第一次截屏
+    #     :return: 退出战斗成功True or 失败False
+    #     """
+    #     timeout_timer = Timer(6).start()
+    #     exit_clicked = False
+    #     while not timeout_timer.reached():
+    #         self.maybe_screenshot(skip_first)
+    #         skip_first = False
+    #         # 不在战斗界面, 认为退出成功
+    #         if not self.is_in_battle(False):
+    #             return True
+    #         if exit_clicked:
+    #             self.appear_then_click(self.I_EXIT_ENSURE)
+    #         if not exit_clicked and self.appear_then_click(self.I_EXIT):
+    #             exit_clicked = True
+    #         sleep(random.uniform(0.5, 1.5))
+    #     # 还在战斗界面且超时则退出失败
+    #     return False
+
+    def switch_soul(self, enter_button: RuleImage, cur_img: RuleImage):
+        conf = self.conf.switch_soul_config
         conf.validate_switch_soul()
-        self.put_check(Status.ALREADY_SWITCH_SOUL, True)
         enable_switch = getattr(conf, f"enable_switch_{self.climb_type}", False)
         enable_by_name = getattr(conf, f"enable_switch_{self.climb_type}_by_name", False)
-        if enable_switch or enable_by_name:
-            self.ui_goto(game.page_shikigami_records)
+        if not enable_switch and not enable_by_name:
+            return
+        self.ui_click(enter_button, stop=self.I_CHECK_RECORDS, interval=1)
         if enable_by_name:
             group, team = getattr(conf, f"{self.climb_type}_group_team_name").split(",")
             self.run_switch_soul_by_name(group, team)
         elif enable_switch:
             group_team = getattr(conf, f"{self.climb_type}_group_team")
             self.run_switch_soul(group_team)
-        self.goto_act()
+        self.ui_click(self.I_UI_BACK_YELLOW, stop=cur_img, interval=1)
 
     def lock_team(self, battle_conf: GeneralBattleConfig):
         """
         根据配置判断当前爬塔类型是否锁定阵容, 并执行锁定或解锁
-        :param battle_conf: 战斗配置
-        :return:
         """
-        if self.check(Status.ALREADY_LOCK_TEAM):
-            return
-        self.put_check(Status.ALREADY_LOCK_TEAM, True)
         enable_preset = getattr(battle_conf, f"enable_{self.climb_type}_preset", False)
         if not enable_preset:
             logger.info(f'Lock {self.climb_type} team')
-            while 1:
-                self.screenshot()
-                if self.appear_then_click(self.I_UNLOCK, interval=1):
-                    continue
-                if self.appear(self.I_LOCK):
-                    return
-        logger.info(f'Unlock {self.climb_type} team')
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_LOCK, interval=1):
-                continue
-            if self.appear(self.I_UNLOCK):
-                break
-
-    def switch_buff(self, climb_conf: GeneralClimb):
-        if self.check(Status.ALREADY_SWITCH_BUFF):
-            return
-        self.put_check(Status.ALREADY_SWITCH_BUFF, True)
-        buffs = getattr(climb_conf, f'{self.climb_type}_buff', None)
-        if not buffs or len(buffs.split(',')) == 1:
-            logger.info('Not set buff, skip')
+            self.ui_click(self.I_UNLOCK, stop=self.I_LOCK, interval=1)
             return
-        buff_list = [buff.strip() for buff in buffs.split(',')]
-        if not buff_list:
-            logger.info('Buff incorrect formatting, skip')
-            return
-        buff_box_list = [self.C_BUFF_1_BOX, self.C_BUFF_2_BOX]
-        buff_box_empty_list = [self.I_BUFF_BOX_1_EMPTY, self.I_BUFF_BOX_2_EMPTY]
-        buff_up_map = {
-            'buff_1': self.C_BUFF_1_UP,
-            'buff_2': self.C_BUFF_2_UP,
-            'buff_3': self.C_BUFF_3_UP,
-            'buff_4': self.C_BUFF_4_UP,
-            'buff_5': self.C_BUFF_5_UP
-        }
-        logger.info(f'start switch {self.climb_type} {buff_list}')
-        for i, buff_box in enumerate(buff_box_list):
-            logger.info(f'Start down {buff_list[i]}')
-            ok = 0
-            while ok <= 3:
-                self.screenshot()
-                # 打开buff面板
-                self.click(buff_box, interval=1.5)
-                ok = (ok + 1) if self.appear(buff_box_empty_list[i]) else 0
-                # 卸下buff
-                self.appear_then_click(self.I_BUFF_DOWN, interval=0.5)
-            logger.info(f'Down {buff_list[i]} ok')
-        for i, buff_box in enumerate(buff_box_list):
-            logger.info(f'Start up {buff_list[i]}')
-            ok = 0
-            while ok <= 3:
-                self.screenshot()
-                # 打开buff面板
-                self.click(buff_box, interval=1.5)
-                ok = (ok + 1) if not self.appear(buff_box_empty_list[i]) else 0
-                # 装上buff
-                self.appear_then_click(self.I_BUFF_UP, buff_up_map[buff_list[i]], interval=0.5)
-            logger.info(f'Up {buff_list[i]} ok')
-
-    def put_status(self):
-        """
-        更新全局状态
-        """
-        # 超过运行时间
-        if self.limit_time is not None and datetime.now() - self.start_time >= self.limit_time:
-            logger.warning(f"Climb type {self.climb_type} time out")
-            self.put_check(Status.TIME_OUT, True)
-        # 次数达到限制
-        if self.get_count() >= self.get_limit():
-            logger.info(f"Climb type {self.climb_type} count limit reached")
-            self.put_check(Status.DOWN, True)
-
-    def get_count(self) -> int:
-        """
-        获取当前爬塔类型运行次数
-        :return: 运行次数
-        """
-        return self.count_map[self.climb_type]
+        logger.info(f'Unlock {self.climb_type} team')
+        self.ui_click(self.I_LOCK, stop=self.I_UNLOCK, interval=1)
 
-    def check_tickets_enough(self):
+    def check_tickets_enough(self) -> bool:
         """
         判断当前爬塔门票是否足够
         :return: True 可以运行 or False
@@ -380,7 +362,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         logger.hr(f'Check {self.climb_type} tickets')
         if not self.wait_until_appear(self.O_FIRE, wait_time=3):
             logger.warning(f'Detect fire fail, try reidentify')
-            return
+            return False
         self.screenshot()
         remain_times = 0
         if self.climb_type == 'pass':
@@ -394,34 +376,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         if self.climb_type == 'ap100':
             remain_times = self.O_REMAIN_AP100.ocr_digit(
                 _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_AP100))
-        self.put_check(Status.NO_TICKETS, remain_times <= 0)
-
-    def get_limit(self) -> int:
-        """
-        获取配置中当前爬塔类型次数限制
-        :return: 限制次数
-        """
-        limit = getattr(self.conf.general_climb, f'{self.climb_type}_limit', 0)
-        return 0 if not limit else limit
-
-    def switch_next(self):
-        """
-        切换下一种爬塔类型
-        :return: True 切换成功 or False
-        """
-        self.run_idx += 1
-        if self.run_idx >= len(self.conf.general_climb.run_sequence_v):
-            logger.info('All climbing activities have been completed')
-            self.put_check(Status.ALL_DOWN, True)
-            return
-        # 切换爬塔类型了, 恢复所有状态
-        self.current_count = 0
-        self.put_check(Status.ALREADY_SWITCH_SOUL, False)
-        self.put_check(Status.ALREADY_LOCK_TEAM, False)
-        self.put_check(Status.GOTO_ACT_FAILED, False)
-        self.put_check(Status.ENTER_BATTLE_FAILED, False)
-        self.put_check(Status.COUNT_LIMIT, False)
-        logger.hr(f'Climb switch to {self.climb_type}', 2)
+        return remain_times > 0
 
     def get_general_battle_conf(self) -> tasks.Component.GeneralBattle.config_general_battle.GeneralBattleConfig:
         from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig as gbc
@@ -437,26 +392,6 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                    random_click_swipt_enable=getattr(self.conf.general_battle, f'enable_{self.climb_type}_anti_detect',
                                                      False), )
 
-    def home_main(self) -> bool:
-        """
-        从庭院到活动的爬塔界面
-        :return:
-        """
-        logger.hr("Enter Shikigami", 2)
-        self.ui_goto(game.page_climb_act)
-
-    def main_home(self) -> bool:
-        """
-        从活动的爬塔界面到庭院
-        :return:
-        """
-        logger.hr("Exit Shikigami", 2)
-        self.ui_get_current_page(False)
-        self.ui_goto(game.page_main)
-
-    def goto_act(self, timeout: int = 45):
-        self.ui_goto(self.page_map[self.climb_type], timeout=timeout)
-
     def random_reward_click(self, exclude_click: list = None, click_now: bool = True) -> RuleClick:
         """
         随机点击
@@ -472,36 +407,6 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             self.click(target, interval=1.8)
         return target
 
-    @property
-    def climb_type(self) -> str:
-        if self.run_idx >= len(self.conf.general_climb.run_sequence_v):
-            return self.conf.general_climb.run_sequence_v[-1]
-        return self.conf.general_climb.run_sequence_v[self.run_idx]
-
-    @property
-    def count_map(self) -> dict[str, int]:
-        """
-        :return: key: climb type, value: run count
-        """
-        if not getattr(self, "_count_map", None):
-            self._count_map = {climb_type: 0 for climb_type in self.conf.general_climb.run_sequence_v}
-        return self._count_map
-
-    @property
-    def check_map(self) -> dict[str, dict[Status, Any]]:
-        if not getattr(self, "_check_map", None):
-            self._check_map = {
-                climb_type: {status: None for status in list(Status)}
-                for climb_type in self.conf.general_climb.run_sequence_v
-            }
-        return self._check_map
-
-    def check(self, status: Status) -> Any:
-        return self.check_map[self.climb_type][status]
-
-    def put_check(self, status: Status, value: Any):
-        self.check_map[self.climb_type][status] = value
-
 
 if __name__ == '__main__':
     from module.config.config import Config
@@ -512,3 +417,5 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
 
     t.run()
+
+

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

@@ -18,7 +18,7 @@ class ApMode(str, Enum):
 
 class GeneralClimb(ConfigBase):
     limit_time: Time = Field(default=Time(minute=30), description='限制爬塔运行总时间')
-    boss_limit_time: Time = Field(default=Time(minute=5), description='boss单局限制时间')
+    # boss_limit_time: Time = Field(default=Time(minute=5), description='boss单局限制时间')
     pass_limit: int = Field(default=50, description='门票爬塔的最大次数')
     ap_limit: int = Field(default=300, description='体力爬塔的最大次数')
     boss_limit: int = Field(default=20, description='boss战爬塔的最大次数')

+ 6 - 2
tasks/GameUi/game_ui.py

@@ -36,8 +36,7 @@ class GameUi(BaseTask, GameUiAssets):
                 GameUiAssets.I_BACK_FRIENDS, GameUiAssets.I_BACK_DAILY,
                 GameUiAssets.I_REALM_RAID_GOTO_EXPLORATION,
                 GameUiAssets.I_SIX_GATES_GOTO_EXPLORATION, SixRealmsAssets.I_EXIT_SIXREALMS,
-                ActivityShikigamiAssets.I_SKIP_BUTTON, ActivityShikigamiAssets.I_RED_EXIT, BaseTask.I_UI_BACK_BLUE,
-                ActivityShikigamiAssets.I_RED_EXIT_2]
+                ActivityShikigamiAssets.I_SKIP_BUTTON, ActivityShikigamiAssets.I_RED_EXIT, BaseTask.I_UI_BACK_BLUE]
 
     def __init__(self, config, device):
         super().__init__(config, device)
@@ -285,6 +284,11 @@ class GameUi(BaseTask, GameUiAssets):
             while not max_wait_timer.reached():
                 if timeout_timer.reached():
                     return False
+                if isinstance(button, list):
+                    exec_operates = [self.appear_then_operate(btn, interval=0.8, skip_first_screenshot=False)
+                                     for btn in button]
+                    if exec_operates[0]:  # 只要第一个成功就跳出
+                        break
                 if self.appear_then_operate(button, interval=0.8, skip_first_screenshot=False):
                     break
                 logger.warning(f"[{max_wait_timer.current():.1f}s]Failed click {button} on {current_page}, retry...")

+ 17 - 28
tasks/GameUi/page.py

@@ -187,11 +187,6 @@ page_main.link(button=G.I_MAIN_GOTO_COLLECTION, destination=page_collection)
 page_travel = Page(G.I_CHECK_TRAVEL)
 page_travel.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_TRAVEL, destination=page_travel)
-# 活动列表页 act_list
-page_act_list = Page(G.I_CHECK_ACT_LIST)
-page_act_list.additional = [G.I_PAPER_DOLL_CLOSE]
-page_act_list.link(button=G.I_BACK_ACT_LIST, destination=page_main)
-page_main.link(button=G.I_ACT_LIST_EXPAND, destination=page_act_list)
 
 # 道馆
 from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
@@ -201,39 +196,33 @@ page_dokan = Page(DokanAssets.I_RYOU_DOKAN_CHECK)
 page_dokan.additional = [GeneralBattleAssets.I_EXIT, DokanAssets.I_RYOU_DOKAN_EXIT_ENSURE, G.I_BACK_BLUE]
 page_dokan.link(button=G.I_BACK_Y, destination=page_main)
 
-# ************************************* 活动部分 *****************************************#
-from tasks.ActivityShikigami.assets import ActivityShikigamiAssets as asa
-
-# 活动列表页爬塔活动
-page_act_list_climb_act = Page(asa.I_CHECK_ACT_LIST_CLIMB_ACT)
-page_act_list.link(button=G.L_ACT_LIST_OCR, destination=page_act_list_climb_act)
-page_act_list_climb_act.link(button=G.I_BACK_ACT_LIST, destination=page_main)
 
 # ************************************* 战斗部分 *****************************************#
 # 战斗界面
-page_battle = Page(GeneralBattleAssets.I_BATTLE_INFO)
-
-
+# page_battle = Page(GeneralBattleAssets.I_BATTLE_INFO)
+#
+#
 def random_click(low: int = None, high: int = None, ltrb: tuple = (True, False, True, False)) -> RuleClick | list[RuleClick]:
     """
     随机生成RuleClick, 不传入参数则返回1个RuleClick, 传入参数则生成范围内的click数组
     :return: RuleClick或者RuleClick的数组
     """
-    click_area_list = [asa.C_RANDOM_LEFT, asa.C_RANDOM_TOP, asa.C_RANDOM_RIGHT, asa.C_RANDOM_BOTTOM]
+    from tasks.Component.GeneralBattle.assets import GeneralBattleAssets as GBA
+    click_area_list = [GBA.C_REWARD_1, GBA.C_REWARD_2, GBA.C_REWARD_3]
     click = random.choice(list(compress(click_area_list, ltrb)))
     click.name = "SAFE_RANDOM_CLICK"
     if low is None or high is None:
         return click
     return [click for _ in range(random.randint(low, high))]
-
-
-# 奖励界面
-page_reward = Page(check_button=[GeneralBattleAssets.I_REWARD_PURPLE_SNAKE_SKIN, GeneralBattleAssets.I_REWARD,
-                                 GeneralBattleAssets.I_REWARD_EXP_SOUL_4, GeneralBattleAssets.I_WIN,
-                                 GeneralBattleAssets.I_REWARD_GOLD, GeneralBattleAssets.I_REWARD_GOLD_SNAKE_SKIN,
-                                 GeneralBattleAssets.I_REWARD_SOUL_5, GeneralBattleAssets.I_REWARD_SOUL_6,
-                                 GGA.I_UI_REWARD, ])
-page_reward.additional = [random_click()]
-# 失败界面
-page_failed = Page(GeneralBattleAssets.I_FALSE)
-page_failed.additional = [random_click()]
+#
+#
+# # 奖励界面
+# page_reward = Page(check_button=[GeneralBattleAssets.I_REWARD_PURPLE_SNAKE_SKIN, GeneralBattleAssets.I_REWARD,
+#                                  GeneralBattleAssets.I_REWARD_EXP_SOUL_4, GeneralBattleAssets.I_WIN,
+#                                  GeneralBattleAssets.I_REWARD_GOLD, GeneralBattleAssets.I_REWARD_GOLD_SNAKE_SKIN,
+#                                  GeneralBattleAssets.I_REWARD_SOUL_5, GeneralBattleAssets.I_REWARD_SOUL_6,
+#                                  GGA.I_UI_REWARD, ])
+# page_reward.additional = [random_click()]
+# # 失败界面
+# page_failed = Page(GeneralBattleAssets.I_FALSE)
+# page_failed.additional = [random_click()]