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

feat: 初步适配新探索界面

yuyuyuyuyu 6 месяцев назад
Родитель
Сommit
252453c9fd
72 измененных файлов с 212 добавлено и 212 удалено
  1. 6 6
      tasks/EternitySea/assets.py
  2. 10 10
      tasks/EternitySea/res/image.json
  3. 5 5
      tasks/EternitySea/res/list.json
  4. BIN
      tasks/EternitySea/res/res_eternity_sea.png
  5. BIN
      tasks/EternitySea/res/res_eternity_sea_fire.png
  6. BIN
      tasks/EternitySea/res/res_eternitysea_unlock.png
  7. BIN
      tasks/EternitySea/res/res_form_team.png
  8. BIN
      tasks/EternitySea/res/res_neweternitysea_lock.png
  9. 11 11
      tasks/EvoZone/assets.py
  10. 17 17
      tasks/EvoZone/o/image.json
  11. BIN
      tasks/EvoZone/o/o_evozone_fire.png
  12. BIN
      tasks/EvoZone/o/o_evozone_lock.png
  13. BIN
      tasks/EvoZone/o/o_evozone_unlock.png
  14. BIN
      tasks/EvoZone/o/o_fire_kirin.png
  15. BIN
      tasks/EvoZone/o/o_form_team.png
  16. BIN
      tasks/EvoZone/o/o_lightning_kirin.png
  17. BIN
      tasks/EvoZone/o/o_shi_records.png
  18. BIN
      tasks/EvoZone/o/o_water_kirin.png
  19. BIN
      tasks/EvoZone/o/o_wind_kirin.png
  20. 11 11
      tasks/EvoZone/res/list.json
  21. 2 2
      tasks/EvoZone/res/ocr.json
  22. 7 7
      tasks/FallenSun/assets.py
  23. BIN
      tasks/FallenSun/f/f_fallen_sun.png
  24. BIN
      tasks/FallenSun/f/f_fallen_sun_fire.png
  25. BIN
      tasks/FallenSun/f/f_fallen_sun_lock.png
  26. BIN
      tasks/FallenSun/f/f_fallen_sun_unlock.png
  27. BIN
      tasks/FallenSun/f/f_form_team.png
  28. 10 10
      tasks/FallenSun/f/image.json
  29. 5 5
      tasks/FallenSun/res/list.json
  30. 2 2
      tasks/FallenSun/res/ocr.json
  31. 13 13
      tasks/GameUi/assets.py
  32. BIN
      tasks/GameUi/page/page_check_awake.png
  33. BIN
      tasks/GameUi/page/page_check_exploration.png
  34. BIN
      tasks/GameUi/page/page_check_goryou.png
  35. BIN
      tasks/GameUi/page/page_check_soul_zones.png
  36. BIN
      tasks/GameUi/page/page_exploration_goto_area_boss.png
  37. BIN
      tasks/GameUi/page/page_exploration_goto_awake_zone.png
  38. BIN
      tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png
  39. BIN
      tasks/GameUi/page/page_exploration_goto_delegation.png
  40. BIN
      tasks/GameUi/page/page_exploration_goto_goryou_realm.png
  41. BIN
      tasks/GameUi/page/page_exploration_goto_realm_raid.png
  42. BIN
      tasks/GameUi/page/page_exploration_goto_secret_zones.png
  43. BIN
      tasks/GameUi/page/page_exploration_goto_six_gates.png
  44. BIN
      tasks/GameUi/page/page_exploration_goto_soul_zone.png
  45. 21 21
      tasks/GameUi/page/page_img.json
  46. 8 8
      tasks/GoryouRealm/assets.py
  47. 8 8
      tasks/GoryouRealm/gr/click.json
  48. BIN
      tasks/GoryouRealm/gr/gr_gr_fire.png
  49. BIN
      tasks/GoryouRealm/gr/gr_gr_lock.png
  50. BIN
      tasks/GoryouRealm/gr/gr_gr_unlock.png
  51. 6 6
      tasks/GoryouRealm/gr/image.json
  52. 3 3
      tasks/GoryouRealm/gr/ocr.json
  53. 7 7
      tasks/Orochi/assets.py
  54. 11 11
      tasks/Orochi/o/image.json
  55. BIN
      tasks/Orochi/o/o_form_team.png
  56. BIN
      tasks/Orochi/o/o_orochi.png
  57. BIN
      tasks/Orochi/o/o_orochi_fire.png
  58. BIN
      tasks/Orochi/o/o_orochi_lock.png
  59. BIN
      tasks/Orochi/o/o_orochi_unlock.png
  60. BIN
      tasks/Orochi/o/o_shi_records.png
  61. 14 14
      tasks/Orochi/res/list.json
  62. 12 12
      tasks/Sougenbi/assets.py
  63. 6 6
      tasks/Sougenbi/s/click.json
  64. 17 17
      tasks/Sougenbi/s/image.json
  65. BIN
      tasks/Sougenbi/s/s_s_check_sougenbi.png
  66. BIN
      tasks/Sougenbi/s/s_s_fire.png
  67. BIN
      tasks/Sougenbi/s/s_s_fire_anger.png
  68. BIN
      tasks/Sougenbi/s/s_s_fire_foolery.png
  69. BIN
      tasks/Sougenbi/s/s_s_fire_greed.png
  70. BIN
      tasks/Sougenbi/s/s_s_sougenbi.png
  71. BIN
      tasks/Sougenbi/s/s_s_team_lock.png
  72. BIN
      tasks/Sougenbi/s/s_s_team_unlock.png

+ 6 - 6
tasks/EternitySea/assets.py

@@ -12,15 +12,15 @@ class EternitySeaAssets:
 
 	# Image Rule Assets
 	# 选择永生之海 
-	I_ETERNITY_SEA = RuleImage(roi_front=(1139,93,127,416), roi_back=(1139,93,127,416), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
+	I_ETERNITY_SEA = RuleImage(roi_front=(1158,88,70,70), roi_back=(1002,78,233,353), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
 	# 组队 
-	I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
+	I_FORM_TEAM = RuleImage(roi_front=(962,579,96,90), roi_back=(962,579,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
 	# 挑战 
-	I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
+	I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1146,595,92,49), roi_back=(1142,580,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
 	# 开锁 
-	I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(556,560,35,34), roi_back=(556,560,35,34), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
+	I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(700,654,35,34), roi_back=(669,644,167,64), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
 	# 关锁 
-	I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(556,560,31,37), roi_back=(556,560,31,37), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
+	I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(699,652,31,37), roi_back=(667,652,164,53), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_pet_present.png")
 	# description 
@@ -29,7 +29,7 @@ class EternitySeaAssets:
 
 	# List Rule Assets
 	# 永生之海层数列表 
-	L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(138,127,353,435), size=(56, 68), 
+	L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(124,101,74,593), size=(71, 84), 
 					 array=["壹", "贰", "叁", "肆"])
 
 

+ 10 - 10
tasks/EternitySea/res/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "eternity_sea",
     "imageName": "res_eternity_sea.png",
-    "roiFront": "1139,93,127,416",
-    "roiBack": "1139,93,127,416",
+    "roiFront": "1158,88,70,70",
+    "roiBack": "1002,78,233,353",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "选择永生之海"
@@ -11,8 +11,8 @@
   {
     "itemName": "form_team",
     "imageName": "res_form_team.png",
-    "roiFront": "939,594,96,90",
-    "roiBack": "939,594,96,90",
+    "roiFront": "962,579,96,90",
+    "roiBack": "962,579,96,90",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "组队"
@@ -20,8 +20,8 @@
   {
     "itemName": "eternity_sea_fire",
     "imageName": "res_eternity_sea_fire.png",
-    "roiFront": "1108,592,96,93",
-    "roiBack": "1108,592,96,93",
+    "roiFront": "1146,595,92,49",
+    "roiBack": "1142,580,96,93",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "挑战"
@@ -29,8 +29,8 @@
   {
     "itemName": "eternitysea_unlock",
     "imageName": "res_eternitysea_unlock.png",
-    "roiFront": "556,560,35,34",
-    "roiBack": "556,560,35,34",
+    "roiFront": "700,654,35,34",
+    "roiBack": "669,644,167,64",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "开锁"
@@ -38,8 +38,8 @@
   {
     "itemName": "neweternitysea_lock",
     "imageName": "res_neweternitysea_lock.png",
-    "roiFront": "556,560,31,37",
-    "roiBack": "556,560,31,37",
+    "roiFront": "699,652,31,37",
+    "roiBack": "667,652,164,53",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "关锁"

+ 5 - 5
tasks/EternitySea/res/list.json

@@ -2,24 +2,24 @@
   "name": "layer_list",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "138,127,353,435",
+  "roiBack": "124,101,74,593",
   "description": "永生之海层数列表",
   "list": [
     {
       "itemName": "壹",
-      "roiFront": "266,148,60,64"
+      "roiFront": "126,104,69,83"
     },
     {
       "itemName": "贰",
-      "roiFront": "270,253,54,74"
+      "roiFront": "125,203,72,81"
     },
     {
       "itemName": "叁",
-      "roiFront": "276,367,50,67"
+      "roiFront": "125,295,72,87"
     },
     {
       "itemName": "肆",
-      "roiFront": "271,479,60,70"
+      "roiFront": "124,396,74,85"
     }
   ]
 }

BIN
tasks/EternitySea/res/res_eternity_sea.png


BIN
tasks/EternitySea/res/res_eternity_sea_fire.png


BIN
tasks/EternitySea/res/res_eternitysea_unlock.png


BIN
tasks/EternitySea/res/res_form_team.png


BIN
tasks/EternitySea/res/res_neweternitysea_lock.png


+ 11 - 11
tasks/EvoZone/assets.py

@@ -12,35 +12,35 @@ class EvoZoneAssets:
 
 	# Image Rule Assets
 	# 火麒麟进入 
-	I_FIRE_KIRIN = RuleImage(roi_front=(84,126,217,406), roi_back=(84,126,217,406), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
+	I_FIRE_KIRIN = RuleImage(roi_front=(104,120,217,406), roi_back=(104,120,217,406), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
 	# 组队 
-	I_FORM_TEAM = RuleImage(roi_front=(934,585,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
+	I_FORM_TEAM = RuleImage(roi_front=(959,580,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
 	# description 
-	I_EVOZONE_LOCK = RuleImage(roi_front=(558,565,31,32), roi_back=(548,554,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
+	I_EVOZONE_LOCK = RuleImage(roi_front=(700,655,31,32), roi_back=(690,648,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
 	# description 
-	I_EVOZONE_UNLOCK = RuleImage(roi_front=(560,565,26,29), roi_back=(551,557,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
+	I_EVOZONE_UNLOCK = RuleImage(roi_front=(701,657,26,29), roi_back=(695,650,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
 	# 点击挑战 
-	I_EVOZONE_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
+	I_EVOZONE_FIRE = RuleImage(roi_front=(1127,568,131,124), roi_back=(1127,568,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
 	# 式神录 
-	I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
+	I_SHI_RECORDS = RuleImage(roi_front=(843,570,48,45), roi_back=(843,570,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_pet_present.png")
 	# 风麒麟进入 
-	I_WIND_KIRIN = RuleImage(roi_front=(377,126,232,420), roi_back=(377,126,232,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
+	I_WIND_KIRIN = RuleImage(roi_front=(410,116,225,320), roi_back=(410,116,225,320), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
 	# 水麒麟进入 
-	I_WATER_KIRIN = RuleImage(roi_front=(671,122,236,420), roi_back=(671,122,236,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
+	I_WATER_KIRIN = RuleImage(roi_front=(705,115,224,378), roi_back=(705,115,224,378), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
 	# 雷麒麟进入 
-	I_LIGHTNING_KIRIN = RuleImage(roi_front=(967,121,239,419), roi_back=(967,121,239,419), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")
+	I_LIGHTNING_KIRIN = RuleImage(roi_front=(1005,99,229,326), roi_back=(1005,99,229,326), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")
 
 
 	# List Rule Assets
 	# 这个是觉醒界面选择不同层数的 
-	L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(44, 88), 
+	L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(124,84,77,632), size=(75, 83), 
 					 array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾"])
 
 
 	# Ocr Rule Assets
 	# Ocr-description 
-	O_O_TEST_OCR = RuleOcr(roi=(126,136,360,491), area=(126,136,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")
+	O_O_TEST_OCR = RuleOcr(roi=(128,114,349,564), area=(128,114,349,564), mode="Full", method="Default", keyword="", name="o_test_ocr")
 
 

+ 17 - 17
tasks/EvoZone/o/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "fire_kirin",
     "imageName": "o_fire_kirin.png",
-    "roiFront": "84,126,217,406",
-    "roiBack": "84,126,217,406",
+    "roiFront": "104,120,217,406",
+    "roiBack": "104,120,217,406",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "火麒麟进入"
@@ -11,7 +11,7 @@
   {
     "itemName": "form_team",
     "imageName": "o_form_team.png",
-    "roiFront": "934,585,100,100",
+    "roiFront": "959,580,100,100",
     "roiBack": "916,572,156,130",
     "method": "Template matching",
     "threshold": 0.8,
@@ -20,8 +20,8 @@
   {
     "itemName": "evozone_lock",
     "imageName": "o_evozone_lock.png",
-    "roiFront": "558,565,31,32",
-    "roiBack": "548,554,53,54",
+    "roiFront": "700,655,31,32",
+    "roiBack": "690,648,53,54",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "evozone_unlock",
     "imageName": "o_evozone_unlock.png",
-    "roiFront": "560,565,26,29",
-    "roiBack": "551,557,43,45",
+    "roiFront": "701,657,26,29",
+    "roiBack": "695,650,43,45",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "evozone_fire",
     "imageName": "o_evozone_fire.png",
-    "roiFront": "1095,577,131,124",
-    "roiBack": "1095,577,131,124",
+    "roiFront": "1127,568,131,124",
+    "roiBack": "1127,568,131,124",
     "method": "Template matching",
     "threshold": 0.6,
     "description": "点击挑战"
@@ -47,8 +47,8 @@
   {
     "itemName": "shi_records",
     "imageName": "o_shi_records.png",
-    "roiFront": "821,638,48,45",
-    "roiBack": "821,638,48,45",
+    "roiFront": "843,570,48,45",
+    "roiBack": "843,570,48,45",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "式神录"
@@ -65,8 +65,8 @@
   {
     "itemName": "wind_kirin",
     "imageName": "o_wind_kirin.png",
-    "roiFront": "377,126,232,420",
-    "roiBack": "377,126,232,420",
+    "roiFront": "410,116,225,320",
+    "roiBack": "410,116,225,320",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "风麒麟进入"
@@ -74,8 +74,8 @@
   {
     "itemName": "water_kirin",
     "imageName": "o_water_kirin.png",
-    "roiFront": "671,122,236,420",
-    "roiBack": "671,122,236,420",
+    "roiFront": "705,115,224,378",
+    "roiBack": "705,115,224,378",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "水麒麟进入"
@@ -83,8 +83,8 @@
   {
     "itemName": "lightning_kirin",
     "imageName": "o_lightning_kirin.png",
-    "roiFront": "967,121,239,419",
-    "roiBack": "967,121,239,419",
+    "roiFront": "1005,99,229,326",
+    "roiBack": "1005,99,229,326",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "雷麒麟进入"

BIN
tasks/EvoZone/o/o_evozone_fire.png


BIN
tasks/EvoZone/o/o_evozone_lock.png


BIN
tasks/EvoZone/o/o_evozone_unlock.png


BIN
tasks/EvoZone/o/o_fire_kirin.png


BIN
tasks/EvoZone/o/o_form_team.png


BIN
tasks/EvoZone/o/o_lightning_kirin.png


BIN
tasks/EvoZone/o/o_shi_records.png


BIN
tasks/EvoZone/o/o_water_kirin.png


BIN
tasks/EvoZone/o/o_wind_kirin.png


+ 11 - 11
tasks/EvoZone/res/list.json

@@ -2,48 +2,48 @@
   "name": "layer_list",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "138,130,359,500",
+  "roiBack": "124,84,77,632",
   "description": "这个是觉醒界面选择不同层数的",
   "list": [
     {
       "itemName": "壹",
-      "roiFront": "281,135,39,102"
+      "roiFront": "124,92,76,70"
     },
     {
       "itemName": "贰",
-      "roiFront": "280,253,39,85"
+      "roiFront": "124,194,75,75"
     },
     {
       "itemName": "叁",
-      "roiFront": "283,422,43,93"
+      "roiFront": "124,289,77,90"
     },
     {
       "itemName": "肆",
-      "roiFront": "280,312,44,90"
+      "roiFront": "124,392,77,92"
     },
     {
       "itemName": "伍",
-      "roiFront": "282,425,43,82"
+      "roiFront": "124,502,77,82"
     },
     {
       "itemName": "陆",
-      "roiFront": "275,316,47,89"
+      "roiFront": "124,605,75,82"
     },
     {
       "itemName": "柒",
-      "roiFront": "279,312,48,93"
+      "roiFront": "125,293,75,97"
     },
     {
       "itemName": "捌",
-      "roiFront": "275,203,51,89"
+      "roiFront": "125,406,76,85"
     },
     {
       "itemName": "玖",
-      "roiFront": "278,206,48,81"
+      "roiFront": "124,507,77,84"
     },
     {
       "itemName": "拾",
-      "roiFront": "282,315,45,84"
+      "roiFront": "125,613,74,77"
     }
   ]
 }

+ 2 - 2
tasks/EvoZone/res/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "o_test_ocr",
-    "roiFront": "126,136,360,491",
-    "roiBack": "126,136,360,491",
+    "roiFront": "128,114,349,564",
+    "roiBack": "128,114,349,564",
     "mode": "Full",
     "method": "Default",
     "keyword": "",

+ 7 - 7
tasks/FallenSun/assets.py

@@ -12,27 +12,27 @@ class FallenSunAssets:
 
 	# Image Rule Assets
 	# 选择日轮 
-	I_FALLEN_SUN = RuleImage(roi_front=(784,113,290,396), roi_back=(784,113,290,396), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun.png")
+	I_FALLEN_SUN = RuleImage(roi_front=(881,100,58,65), roi_back=(720,83,231,394), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun.png")
 	# 组队 
-	I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_form_team.png")
+	I_FORM_TEAM = RuleImage(roi_front=(963,584,96,90), roi_back=(963,584,96,90), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_form_team.png")
 	# description 
-	I_FALLEN_SUN_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_fire.png")
+	I_FALLEN_SUN_FIRE = RuleImage(roi_front=(1142,593,94,51), roi_back=(1141,582,104,98), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_fire.png")
 	# description 
-	I_FALLEN_SUN_UNLOCK = RuleImage(roi_front=(557,560,31,38), roi_back=(557,560,31,38), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_unlock.png")
+	I_FALLEN_SUN_UNLOCK = RuleImage(roi_front=(699,650,31,38), roi_back=(699,650,31,38), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_unlock.png")
 	# description 
-	I_FALLEN_SUN_LOCK = RuleImage(roi_front=(557,561,31,37), roi_back=(557,561,31,37), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_lock.png")
+	I_FALLEN_SUN_LOCK = RuleImage(roi_front=(700,652,31,37), roi_back=(700,652,31,37), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_lock.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_pet_present.png")
 
 
 	# List Rule Assets
 	# 这个是御魂界面选择不同层数的 
-	L_LAYER_LIST = RuleList(folder="./tasks/FallenSun/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(43, 87), 
+	L_LAYER_LIST = RuleList(folder="./tasks/FallenSun/res", direction="vertical", mode="ocr", roi_back=(128,106,65,579), size=(65, 86), 
 					 array=["壹", "贰", "叁", "日"])
 
 
 	# Ocr Rule Assets
 	# Ocr-description 
-	O_O_TEST_OCR = RuleOcr(roi=(126,136,360,491), area=(126,136,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")
+	O_O_TEST_OCR = RuleOcr(roi=(85,96,361,491), area=(85,96,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")
 
 

BIN
tasks/FallenSun/f/f_fallen_sun.png


BIN
tasks/FallenSun/f/f_fallen_sun_fire.png


BIN
tasks/FallenSun/f/f_fallen_sun_lock.png


BIN
tasks/FallenSun/f/f_fallen_sun_unlock.png


BIN
tasks/FallenSun/f/f_form_team.png


+ 10 - 10
tasks/FallenSun/f/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "fallen_sun",
     "imageName": "f_fallen_sun.png",
-    "roiFront": "784,113,290,396",
-    "roiBack": "784,113,290,396",
+    "roiFront": "881,100,58,65",
+    "roiBack": "720,83,231,394",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "选择日轮"
@@ -11,8 +11,8 @@
   {
     "itemName": "form_team",
     "imageName": "f_form_team.png",
-    "roiFront": "939,594,96,90",
-    "roiBack": "939,594,96,90",
+    "roiFront": "963,584,96,90",
+    "roiBack": "963,584,96,90",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "组队"
@@ -20,8 +20,8 @@
   {
     "itemName": "fallen_sun_fire",
     "imageName": "f_fallen_sun_fire.png",
-    "roiFront": "1108,592,96,93",
-    "roiBack": "1108,592,96,93",
+    "roiFront": "1142,593,94,51",
+    "roiBack": "1141,582,104,98",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "fallen_sun_unlock",
     "imageName": "f_fallen_sun_unlock.png",
-    "roiFront": "557,560,31,38",
-    "roiBack": "557,560,31,38",
+    "roiFront": "699,650,31,38",
+    "roiBack": "699,650,31,38",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "fallen_sun_lock",
     "imageName": "f_fallen_sun_lock.png",
-    "roiFront": "557,561,31,37",
-    "roiBack": "557,561,31,37",
+    "roiFront": "700,652,31,37",
+    "roiBack": "700,652,31,37",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 5 - 5
tasks/FallenSun/res/list.json

@@ -2,24 +2,24 @@
   "name": "layer_list",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "138,130,359,500",
+  "roiBack": "128,106,65,579",
   "description": "这个是御魂界面选择不同层数的",
   "list": [
     {
       "itemName": "壹",
-      "roiFront": "281,135,39,102"
+      "roiFront": "128,106,65,86"
     },
     {
       "itemName": "贰",
-      "roiFront": "283,254,39,85"
+      "roiFront": "128,198,65,91"
     },
     {
       "itemName": "叁",
-      "roiFront": "282,360,43,93"
+      "roiFront": "128,304,65,91"
     },
     {
       "itemName": "日",
-      "roiFront": "271,473,54,69"
+      "roiFront": "128,406,65,77"
     }
   ]
 }

+ 2 - 2
tasks/FallenSun/res/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "o_test_ocr",
-    "roiFront": "126,136,360,491",
-    "roiBack": "126,136,360,491",
+    "roiFront": "85,96,361,491",
+    "roiBack": "85,96,360,491",
     "mode": "Full",
     "method": "Default",
     "keyword": "",

+ 13 - 13
tasks/GameUi/assets.py

@@ -44,33 +44,33 @@ class GameUiAssets:
 	# description 
 	I_MAIN_GOTO_EXPLORATION = RuleImage(roi_front=(493,116,45,75), roi_back=(243,100,933,211), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_main_goto_exploration.png")
 	# description 
-	I_CHECK_EXPLORATION = RuleImage(roi_front=(1146,175,21,22), roi_back=(1146,175,21,22), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_exploration.png")
+	I_CHECK_EXPLORATION = RuleImage(roi_front=(1154,145,21,22), roi_back=(1154,145,21,22), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_exploration.png")
 	# 探索前往觉醒 
-	I_EXPLORATION_GOTO_AWAKE_ZONE = RuleImage(roi_front=(57,628,57,42), roi_back=(33,619,113,79), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_awake_zone.png")
+	I_EXPLORATION_GOTO_AWAKE_ZONE = RuleImage(roi_front=(65,632,50,41), roi_back=(33,619,1125,98), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_awake_zone.png")
 	# 探索前往御魂 
-	I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(163,642,44,36), roi_back=(134,623,93,70), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
+	I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(165,639,44,36), roi_back=(38,621,1106,98), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
 	# 探索前往结界突破 
-	I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(248,636,67,48), roi_back=(229,612,203,87), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
+	I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(263,636,51,46), roi_back=(42,618,1103,100), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
 	# 探索前往御灵 
-	I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(353,639,47,45), roi_back=(346,626,178,67), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
+	I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(353,639,47,45), roi_back=(49,613,1107,105), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
 	# 探索前往式神委派 
-	I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(453,639,53,37), roi_back=(409,613,167,75), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
+	I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(453,639,53,37), roi_back=(43,609,1107,107), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
 	# 探索前往秘闻 
-	I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(549,633,53,40), roi_back=(524,614,200,87), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
+	I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(549,633,53,40), roi_back=(44,617,1102,99), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
 	# 探索前往地域鬼王 
-	I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(640,638,51,45), roi_back=(640,638,180,45), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
+	I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(640,638,51,45), roi_back=(33,622,1103,90), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
 	# 探索前往平安奇谭 
-	I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(739,643,180,44), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
+	I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(35,615,1097,102), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
 	# 探索前往六道之门 
-	I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(938,640,60,49), roi_back=(820,631,296,66), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
+	I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(928,638,54,46), roi_back=(46,618,1090,100), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
 	# 探索前往契灵之境 
-	I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(1037,635,56,44), roi_back=(918,623,218,72), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
+	I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(1032,634,46,50), roi_back=(41,619,1104,96), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
 	# description 
 	I_BACK_BLUE = RuleImage(roi_front=(32,37,54,52), roi_back=(3,2,130,114), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_blue.png")
 	# description 
-	I_CHECK_AWAKE = RuleImage(roi_front=(376,565,73,82), roi_back=(376,565,73,82), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_awake.png")
+	I_CHECK_AWAKE = RuleImage(roi_front=(164,534,42,41), roi_back=(124,524,197,119), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_awake.png")
 	# description 
-	I_CHECK_SOUL_ZONES = RuleImage(roi_front=(49,186,298,237), roi_back=(49,186,298,237), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
+	I_CHECK_SOUL_ZONES = RuleImage(roi_front=(1193,636,40,40), roi_back=(1131,591,149,128), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
 	# description 
 	I_CHECK_REALM_RAID = RuleImage(roi_front=(129,632,52,48), roi_back=(66,526,233,188), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_check_realm_raid.png")
 	# description 

BIN
tasks/GameUi/page/page_check_awake.png


BIN
tasks/GameUi/page/page_check_exploration.png


BIN
tasks/GameUi/page/page_check_goryou.png


BIN
tasks/GameUi/page/page_check_soul_zones.png


BIN
tasks/GameUi/page/page_exploration_goto_area_boss.png


BIN
tasks/GameUi/page/page_exploration_goto_awake_zone.png


BIN
tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png


BIN
tasks/GameUi/page/page_exploration_goto_delegation.png


BIN
tasks/GameUi/page/page_exploration_goto_goryou_realm.png


BIN
tasks/GameUi/page/page_exploration_goto_realm_raid.png


BIN
tasks/GameUi/page/page_exploration_goto_secret_zones.png


BIN
tasks/GameUi/page/page_exploration_goto_six_gates.png


BIN
tasks/GameUi/page/page_exploration_goto_soul_zone.png


+ 21 - 21
tasks/GameUi/page/page_img.json

@@ -29,8 +29,8 @@
   {
     "itemName": "check_exploration",
     "imageName": "page_check_exploration.png",
-    "roiFront": "1146,175,21,22",
-    "roiBack": "1146,175,21,22",
+    "roiFront": "1154,145,21,22",
+    "roiBack": "1154,145,21,22",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "exploration_goto_awake_zone",
     "imageName": "page_exploration_goto_awake_zone.png",
-    "roiFront": "57,628,57,42",
-    "roiBack": "33,619,113,79",
+    "roiFront": "65,632,50,41",
+    "roiBack": "33,619,1125,98",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "探索前往觉醒"
@@ -47,8 +47,8 @@
   {
     "itemName": "exploration_goto_soul_zone",
     "imageName": "page_exploration_goto_soul_zone.png",
-    "roiFront": "163,642,44,36",
-    "roiBack": "134,623,93,70",
+    "roiFront": "165,639,44,36",
+    "roiBack": "38,621,1106,98",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "探索前往御魂"
@@ -56,8 +56,8 @@
   {
     "itemName": "exploration_goto_realm_raid",
     "imageName": "page_exploration_goto_realm_raid.png",
-    "roiFront": "248,636,67,48",
-    "roiBack": "229,612,203,87",
+    "roiFront": "263,636,51,46",
+    "roiBack": "42,618,1103,100",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "探索前往结界突破"
@@ -66,7 +66,7 @@
     "itemName": "exploration_goto_goryou_realm",
     "imageName": "page_exploration_goto_goryou_realm.png",
     "roiFront": "353,639,47,45",
-    "roiBack": "346,626,178,67",
+    "roiBack": "49,613,1107,105",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "探索前往御灵"
@@ -75,7 +75,7 @@
     "itemName": "exploration_goto_delegation",
     "imageName": "page_exploration_goto_delegation.png",
     "roiFront": "453,639,53,37",
-    "roiBack": "409,613,167,75",
+    "roiBack": "43,609,1107,107",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "探索前往式神委派"
@@ -84,7 +84,7 @@
     "itemName": "exploration_goto_secret_zones",
     "imageName": "page_exploration_goto_secret_zones.png",
     "roiFront": "549,633,53,40",
-    "roiBack": "524,614,200,87",
+    "roiBack": "44,617,1102,99",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "探索前往秘闻"
@@ -93,7 +93,7 @@
     "itemName": "exploration_goto_area_boss",
     "imageName": "page_exploration_goto_area_boss.png",
     "roiFront": "640,638,51,45",
-    "roiBack": "640,638,180,45",
+    "roiBack": "33,622,1103,90",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "探索前往地域鬼王"
@@ -102,7 +102,7 @@
     "itemName": "exploration_goto_heian_kitan",
     "imageName": "page_exploration_goto_heian_kitan.png",
     "roiFront": "739,643,52,44",
-    "roiBack": "739,643,180,44",
+    "roiBack": "35,615,1097,102",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "探索前往平安奇谭"
@@ -110,8 +110,8 @@
   {
     "itemName": "exploration_goto_six_gates",
     "imageName": "page_exploration_goto_six_gates.png",
-    "roiFront": "938,640,60,49",
-    "roiBack": "820,631,296,66",
+    "roiFront": "928,638,54,46",
+    "roiBack": "46,618,1090,100",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "探索前往六道之门"
@@ -119,8 +119,8 @@
   {
     "itemName": "exploration_goto_bondling_fairyland",
     "imageName": "page_exploration_goto_bondling_fairyland.png",
-    "roiFront": "1037,635,56,44",
-    "roiBack": "918,623,218,72",
+    "roiFront": "1032,634,46,50",
+    "roiBack": "41,619,1104,96",
     "method": "Template matching",
     "threshold": 0.65,
     "description": "探索前往契灵之境"
@@ -137,8 +137,8 @@
   {
     "itemName": "check_awake",
     "imageName": "page_check_awake.png",
-    "roiFront": "376,565,73,82",
-    "roiBack": "376,565,73,82",
+    "roiFront": "164,534,42,41",
+    "roiBack": "124,524,197,119",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -146,8 +146,8 @@
   {
     "itemName": "check_soul_zones",
     "imageName": "page_check_soul_zones.png",
-    "roiFront": "49,186,298,237",
-    "roiBack": "49,186,298,237",
+    "roiFront": "1193,636,40,40",
+    "roiBack": "1131,591,149,128",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 8 - 8
tasks/GoryouRealm/assets.py

@@ -12,26 +12,26 @@ class GoryouRealmAssets:
 
 	# Click Rule Assets
 	# description 
-	C_GR_C_1 = RuleClick(roi_front=(95,105,224,548), roi_back=(95,105,224,548), name="gr_c_1")
+	C_GR_C_1 = RuleClick(roi_front=(107,98,213,409), roi_back=(107,98,213,409), name="gr_c_1")
 	# description 
-	C_GR_C_2 = RuleClick(roi_front=(382,109,229,536), roi_back=(382,109,229,536), name="gr_c_2")
+	C_GR_C_2 = RuleClick(roi_front=(405,98,228,325), roi_back=(405,98,228,325), name="gr_c_2")
 	# description 
-	C_GR_C_3 = RuleClick(roi_front=(669,112,232,539), roi_back=(669,112,232,539), name="gr_c_3")
+	C_GR_C_3 = RuleClick(roi_front=(708,118,232,367), roi_back=(708,118,232,367), name="gr_c_3")
 	# description 
-	C_GR_C_4 = RuleClick(roi_front=(961,108,225,538), roi_back=(961,108,225,538), name="gr_c_4")
+	C_GR_C_4 = RuleClick(roi_front=(1017,112,222,316), roi_back=(1017,112,222,316), name="gr_c_4")
 
 
 	# Image Rule Assets
 	# 点击挑战 
-	I_GR_FIRE = RuleImage(roi_front=(1097,582,100,100), roi_back=(1097,582,100,100), threshold=0.8, method="Template matching", file="./tasks/GoryouRealm/gr/gr_gr_fire.png")
+	I_GR_FIRE = RuleImage(roi_front=(1051,577,100,100), roi_back=(1051,577,100,100), threshold=0.8, method="Template matching", file="./tasks/GoryouRealm/gr/gr_gr_fire.png")
 	# description 
-	I_GR_LOCK = RuleImage(roi_front=(559,564,27,32), roi_back=(559,564,27,32), threshold=0.8, method="Template matching", file="./tasks/GoryouRealm/gr/gr_gr_lock.png")
+	I_GR_LOCK = RuleImage(roi_front=(702,655,27,32), roi_back=(702,655,27,32), threshold=0.8, method="Template matching", file="./tasks/GoryouRealm/gr/gr_gr_lock.png")
 	# description 
-	I_GR_UNLOCK = RuleImage(roi_front=(556,562,26,33), roi_back=(556,562,26,33), threshold=0.8, method="Template matching", file="./tasks/GoryouRealm/gr/gr_gr_unlock.png")
+	I_GR_UNLOCK = RuleImage(roi_front=(703,653,26,33), roi_back=(703,653,26,33), threshold=0.8, method="Template matching", file="./tasks/GoryouRealm/gr/gr_gr_unlock.png")
 
 
 	# Ocr Rule Assets
 	# 多少张票 
-	O_GR_TICKET = RuleOcr(roi=(920,21,100,41), area=(920,21,100,41), mode="Digit", method="Default", keyword="", name="gr_ticket")
+	O_GR_TICKET = RuleOcr(roi=(938,4,100,41), area=(938,4,100,41), mode="Digit", method="Default", keyword="", name="gr_ticket")
 
 

+ 8 - 8
tasks/GoryouRealm/gr/click.json

@@ -1,26 +1,26 @@
 [
   {
     "itemName": "gr_c_1",
-    "roiFront": "95,105,224,548",
-    "roiBack": "95,105,224,548",
+    "roiFront": "107,98,213,409",
+    "roiBack": "107,98,213,409",
     "description": "description"
   },
   {
     "itemName": "gr_c_2",
-    "roiFront": "382,109,229,536",
-    "roiBack": "382,109,229,536",
+    "roiFront": "405,98,228,325",
+    "roiBack": "405,98,228,325",
     "description": "description"
   },
   {
     "itemName": "gr_c_3",
-    "roiFront": "669,112,232,539",
-    "roiBack": "669,112,232,539",
+    "roiFront": "708,118,232,367",
+    "roiBack": "708,118,232,367",
     "description": "description"
   },
   {
     "itemName": "gr_c_4",
-    "roiFront": "961,108,225,538",
-    "roiBack": "961,108,225,538",
+    "roiFront": "1017,112,222,316",
+    "roiBack": "1017,112,222,316",
     "description": "description"
   }
 ]

BIN
tasks/GoryouRealm/gr/gr_gr_fire.png


BIN
tasks/GoryouRealm/gr/gr_gr_lock.png


BIN
tasks/GoryouRealm/gr/gr_gr_unlock.png


+ 6 - 6
tasks/GoryouRealm/gr/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "gr_fire",
     "imageName": "gr_gr_fire.png",
-    "roiFront": "1097,582,100,100",
-    "roiBack": "1097,582,100,100",
+    "roiFront": "1051,577,100,100",
+    "roiBack": "1051,577,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击挑战"
@@ -11,8 +11,8 @@
   {
     "itemName": "gr_lock",
     "imageName": "gr_gr_lock.png",
-    "roiFront": "559,564,27,32",
-    "roiBack": "559,564,27,32",
+    "roiFront": "702,655,27,32",
+    "roiBack": "702,655,27,32",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -20,8 +20,8 @@
   {
     "itemName": "gr_unlock",
     "imageName": "gr_gr_unlock.png",
-    "roiFront": "556,562,26,33",
-    "roiBack": "556,562,26,33",
+    "roiFront": "703,653,26,33",
+    "roiBack": "703,653,26,33",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 3 - 3
tasks/GoryouRealm/gr/ocr.json

@@ -1,11 +1,11 @@
 [
   {
     "itemName": "gr_ticket",
-    "roiFront": "920,21,100,41",
-    "roiBack": "920,21,100,41",
+    "roiFront": "938,4,100,41",
+    "roiBack": "938,4,100,41",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
     "description": "多少张票"
   }
-]
+]

+ 7 - 7
tasks/Orochi/assets.py

@@ -12,24 +12,24 @@ class OrochiAssets:
 
 	# Image Rule Assets
 	# 八级大蛇进入 
-	I_OROCHI = RuleImage(roi_front=(55,104,295,406), roi_back=(55,104,295,406), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi.png")
+	I_OROCHI = RuleImage(roi_front=(260,274,66,66), roi_back=(55,104,295,406), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi.png")
 	# 组队 
-	I_FORM_TEAM = RuleImage(roi_front=(937,591,100,100), roi_back=(937,591,100,100), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_form_team.png")
+	I_FORM_TEAM = RuleImage(roi_front=(957,582,100,100), roi_back=(957,582,100,100), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_form_team.png")
 	# description 
-	I_OROCHI_LOCK = RuleImage(roi_front=(575,561,22,26), roi_back=(466,546,191,62), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_lock.png")
+	I_OROCHI_LOCK = RuleImage(roi_front=(652,657,22,26), roi_back=(628,644,191,62), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_lock.png")
 	# description 
-	I_OROCHI_UNLOCK = RuleImage(roi_front=(575,561,21,21), roi_back=(483,544,188,60), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_unlock.png")
+	I_OROCHI_UNLOCK = RuleImage(roi_front=(652,656,21,21), roi_back=(624,644,188,60), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_unlock.png")
 	# 点击挑战 
-	I_OROCHI_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/Orochi/o/o_orochi_fire.png")
+	I_OROCHI_FIRE = RuleImage(roi_front=(1133,584,110,59), roi_back=(1122,572,131,124), threshold=0.6, method="Template matching", file="./tasks/Orochi/o/o_orochi_fire.png")
 	# 式神录 
-	I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_shi_records.png")
+	I_SHI_RECORDS = RuleImage(roi_front=(842,569,48,45), roi_back=(842,569,48,45), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_shi_records.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_pet_present.png")
 
 
 	# List Rule Assets
 	# 这个是御魂界面选择不同层数的 
-	L_LAYER_LIST = RuleList(folder="./tasks/Orochi/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(45, 88), 
+	L_LAYER_LIST = RuleList(folder="./tasks/Orochi/res", direction="vertical", mode="ocr", roi_back=(126,107,79,593), size=(78, 87), 
 					 array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾", "悲", "神", "虚"])
 
 

+ 11 - 11
tasks/Orochi/o/image.json

@@ -2,7 +2,7 @@
   {
     "itemName": "orochi",
     "imageName": "o_orochi.png",
-    "roiFront": "55,104,295,406",
+    "roiFront": "260,274,66,66",
     "roiBack": "55,104,295,406",
     "method": "Template matching",
     "threshold": 0.8,
@@ -11,8 +11,8 @@
   {
     "itemName": "form_team",
     "imageName": "o_form_team.png",
-    "roiFront": "937,591,100,100",
-    "roiBack": "937,591,100,100",
+    "roiFront": "957,582,100,100",
+    "roiBack": "957,582,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "组队"
@@ -20,8 +20,8 @@
   {
     "itemName": "orochi_lock",
     "imageName": "o_orochi_lock.png",
-    "roiFront": "575,561,22,26",
-    "roiBack": "466,546,191,62",
+    "roiFront": "652,657,22,26",
+    "roiBack": "628,644,191,62",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "orochi_unlock",
     "imageName": "o_orochi_unlock.png",
-    "roiFront": "575,561,21,21",
-    "roiBack": "483,544,188,60",
+    "roiFront": "652,656,21,21",
+    "roiBack": "624,644,188,60",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "orochi_fire",
     "imageName": "o_orochi_fire.png",
-    "roiFront": "1095,577,131,124",
-    "roiBack": "1095,577,131,124",
+    "roiFront": "1133,584,110,59",
+    "roiBack": "1122,572,131,124",
     "method": "Template matching",
     "threshold": 0.6,
     "description": "点击挑战"
@@ -47,8 +47,8 @@
   {
     "itemName": "shi_records",
     "imageName": "o_shi_records.png",
-    "roiFront": "821,638,48,45",
-    "roiBack": "821,638,48,45",
+    "roiFront": "842,569,48,45",
+    "roiBack": "842,569,48,45",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "式神录"

BIN
tasks/Orochi/o/o_form_team.png


BIN
tasks/Orochi/o/o_orochi.png


BIN
tasks/Orochi/o/o_orochi_fire.png


BIN
tasks/Orochi/o/o_orochi_lock.png


BIN
tasks/Orochi/o/o_orochi_unlock.png


BIN
tasks/Orochi/o/o_shi_records.png


+ 14 - 14
tasks/Orochi/res/list.json

@@ -2,60 +2,60 @@
   "name": "layer_list",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "138,130,359,500",
+  "roiBack": "126,107,79,593",
   "description": "这个是御魂界面选择不同层数的",
   "list": [
     {
       "itemName": "壹",
-      "roiFront": "281,135,39,102"
+      "roiFront": "126,111,79,75"
     },
     {
       "itemName": "贰",
-      "roiFront": "280,253,39,85"
+      "roiFront": "126,191,77,85"
     },
     {
       "itemName": "叁",
-      "roiFront": "283,422,43,93"
+      "roiFront": "126,294,78,92"
     },
     {
       "itemName": "肆",
-      "roiFront": "280,312,44,90"
+      "roiFront": "127,394,78,89"
     },
     {
       "itemName": "伍",
-      "roiFront": "282,425,43,82"
+      "roiFront": "126,505,79,84"
     },
     {
       "itemName": "陆",
-      "roiFront": "275,316,47,89"
+      "roiFront": "126,390,79,90"
     },
     {
       "itemName": "柒",
-      "roiFront": "279,312,48,93"
+      "roiFront": "126,390,78,97"
     },
     {
       "itemName": "捌",
-      "roiFront": "275,203,51,89"
+      "roiFront": "126,409,78,94"
     },
     {
       "itemName": "玖",
-      "roiFront": "278,206,48,81"
+      "roiFront": "127,399,77,84"
     },
     {
       "itemName": "拾",
-      "roiFront": "282,315,45,84"
+      "roiFront": "127,399,78,86"
     },
     {
       "itemName": "悲",
-      "roiFront": "277,427,47,85"
+      "roiFront": "126,403,79,84"
     },
     {
       "itemName": "神",
-      "roiFront": "277,534,46,86"
+      "roiFront": "126,397,79,92"
     },
     {
       "itemName": "虚",
-      "roiFront": "277,534,46,86"
+      "roiFront": "126,506,78,85"
     }
   ]
 }

+ 12 - 12
tasks/Sougenbi/assets.py

@@ -12,36 +12,36 @@ class SougenbiAssets:
 
 	# Click Rule Assets
 	# description 
-	C_C_GREED = RuleClick(roi_front=(172,144,299,100), roi_back=(172,144,299,100), name="c_greed")
+	C_C_GREED = RuleClick(roi_front=(87,99,138,51), roi_back=(87,99,138,51), name="c_greed")
 	# description 
-	C_C_ANGER = RuleClick(roi_front=(165,289,307,100), roi_back=(165,289,307,100), name="c_anger")
+	C_C_ANGER = RuleClick(roi_front=(89,203,132,52), roi_back=(89,203,132,52), name="c_anger")
 	# description 
-	C_C_FOOLERY = RuleClick(roi_front=(166,435,303,100), roi_back=(166,435,303,100), name="c_foolery")
+	C_C_FOOLERY = RuleClick(roi_front=(95,313,142,41), roi_back=(95,313,142,41), name="c_foolery")
 
 
 	# Image Rule Assets
 	# 进入业原火 
-	I_S_SOUGENBI = RuleImage(roi_front=(405,97,301,414), roi_back=(405,97,301,414), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_sougenbi.png")
+	I_S_SOUGENBI = RuleImage(roi_front=(560,139,57,61), roi_back=(412,68,231,359), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_sougenbi.png")
 	# 贪 
-	I_S_GREED = RuleImage(roi_front=(167,143,307,100), roi_back=(167,143,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_greed.png")
+	I_S_GREED = RuleImage(roi_front=(118,121,307,100), roi_back=(167,143,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_greed.png")
 	#  
 	I_S_ANGER = RuleImage(roi_front=(164,291,307,100), roi_back=(164,291,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_anger.png")
 	# 痴 
 	I_S_FOOLERY = RuleImage(roi_front=(164,436,307,100), roi_back=(164,436,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_foolery.png")
 	# description 
-	I_S_TEAM_LOCK = RuleImage(roi_front=(559,562,31,36), roi_back=(559,562,31,36), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_team_lock.png")
+	I_S_TEAM_LOCK = RuleImage(roi_front=(700,652,31,36), roi_back=(667,649,167,56), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_team_lock.png")
 	# description 
-	I_S_TEAM_UNLOCK = RuleImage(roi_front=(555,561,33,33), roi_back=(555,561,33,33), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_team_unlock.png")
+	I_S_TEAM_UNLOCK = RuleImage(roi_front=(700,655,33,33), roi_back=(669,645,164,58), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_team_unlock.png")
 	# 挑战 
-	I_S_FIRE = RuleImage(roi_front=(1105,585,100,100), roi_back=(1105,585,100,100), threshold=0.7, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire.png")
+	I_S_FIRE = RuleImage(roi_front=(1051,598,100,43), roi_back=(1051,580,100,100), threshold=0.7, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire.png")
 	# 确认进入业原火 
-	I_S_CHECK_SOUGENBI = RuleImage(roi_front=(772,222,307,292), roi_back=(772,222,307,292), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_check_sougenbi.png")
+	I_S_CHECK_SOUGENBI = RuleImage(roi_front=(933,103,176,68), roi_back=(915,80,341,134), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_check_sougenbi.png")
 	# 贪 
-	I_S_FIRE_GREED = RuleImage(roi_front=(1132,640,21,33), roi_back=(1122,635,41,48), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire_greed.png")
+	I_S_FIRE_GREED = RuleImage(roi_front=(1071,641,21,33), roi_back=(1039,586,124,97), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire_greed.png")
 	# description 
-	I_S_FIRE_ANGER = RuleImage(roi_front=(1131,643,21,30), roi_back=(1122,636,40,42), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire_anger.png")
+	I_S_FIRE_ANGER = RuleImage(roi_front=(1070,642,21,30), roi_back=(1033,574,131,115), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire_anger.png")
 	# 痴 
-	I_S_FIRE_FOOLERY = RuleImage(roi_front=(1130,641,22,31), roi_back=(1117,630,46,52), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire_foolery.png")
+	I_S_FIRE_FOOLERY = RuleImage(roi_front=(1071,641,22,31), roi_back=(1024,572,142,121), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_fire_foolery.png")
 
 
 	# Ocr Rule Assets

+ 6 - 6
tasks/Sougenbi/s/click.json

@@ -1,20 +1,20 @@
 [
   {
     "itemName": "c_greed",
-    "roiFront": "172,144,299,100",
-    "roiBack": "172,144,299,100",
+    "roiFront": "87,99,138,51",
+    "roiBack": "87,99,138,51",
     "description": "description"
   },
   {
     "itemName": "c_anger",
-    "roiFront": "165,289,307,100",
-    "roiBack": "165,289,307,100",
+    "roiFront": "89,203,132,52",
+    "roiBack": "89,203,132,52",
     "description": "description"
   },
   {
     "itemName": "c_foolery",
-    "roiFront": "166,435,303,100",
-    "roiBack": "166,435,303,100",
+    "roiFront": "95,313,142,41",
+    "roiBack": "95,313,142,41",
     "description": "description"
   }
 ]

+ 17 - 17
tasks/Sougenbi/s/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "s_sougenbi",
     "imageName": "s_s_sougenbi.png",
-    "roiFront": "405,97,301,414",
-    "roiBack": "405,97,301,414",
+    "roiFront": "560,139,57,61",
+    "roiBack": "412,68,231,359",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入业原火"
@@ -11,7 +11,7 @@
   {
     "itemName": "s_greed",
     "imageName": "s_s_greed.png",
-    "roiFront": "167,143,307,100",
+    "roiFront": "118,121,307,100",
     "roiBack": "167,143,307,100",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,8 +38,8 @@
   {
     "itemName": "s_team_lock",
     "imageName": "s_s_team_lock.png",
-    "roiFront": "559,562,31,36",
-    "roiBack": "559,562,31,36",
+    "roiFront": "700,652,31,36",
+    "roiBack": "667,649,167,56",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -47,8 +47,8 @@
   {
     "itemName": "s_team_unlock",
     "imageName": "s_s_team_unlock.png",
-    "roiFront": "555,561,33,33",
-    "roiBack": "555,561,33,33",
+    "roiFront": "700,655,33,33",
+    "roiBack": "669,645,164,58",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -56,8 +56,8 @@
   {
     "itemName": "s_fire",
     "imageName": "s_s_fire.png",
-    "roiFront": "1105,585,100,100",
-    "roiBack": "1105,585,100,100",
+    "roiFront": "1051,598,100,43",
+    "roiBack": "1051,580,100,100",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "挑战"
@@ -65,8 +65,8 @@
   {
     "itemName": "s_check_sougenbi",
     "imageName": "s_s_check_sougenbi.png",
-    "roiFront": "772,222,307,292",
-    "roiBack": "772,222,307,292",
+    "roiFront": "933,103,176,68",
+    "roiBack": "915,80,341,134",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "确认进入业原火"
@@ -74,8 +74,8 @@
   {
     "itemName": "s_fire_greed",
     "imageName": "s_s_fire_greed.png",
-    "roiFront": "1132,640,21,33",
-    "roiBack": "1122,635,41,48",
+    "roiFront": "1071,641,21,33",
+    "roiBack": "1039,586,124,97",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "贪"
@@ -83,8 +83,8 @@
   {
     "itemName": "s_fire_anger",
     "imageName": "s_s_fire_anger.png",
-    "roiFront": "1131,643,21,30",
-    "roiBack": "1122,636,40,42",
+    "roiFront": "1070,642,21,30",
+    "roiBack": "1033,574,131,115",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -92,8 +92,8 @@
   {
     "itemName": "s_fire_foolery",
     "imageName": "s_s_fire_foolery.png",
-    "roiFront": "1130,641,22,31",
-    "roiBack": "1117,630,46,52",
+    "roiFront": "1071,641,22,31",
+    "roiBack": "1024,572,142,121",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "痴"

BIN
tasks/Sougenbi/s/s_s_check_sougenbi.png


BIN
tasks/Sougenbi/s/s_s_fire.png


BIN
tasks/Sougenbi/s/s_s_fire_anger.png


BIN
tasks/Sougenbi/s/s_s_fire_foolery.png


BIN
tasks/Sougenbi/s/s_s_fire_greed.png


BIN
tasks/Sougenbi/s/s_s_sougenbi.png


BIN
tasks/Sougenbi/s/s_s_team_lock.png


BIN
tasks/Sougenbi/s/s_s_team_unlock.png