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

Merge branch 'runhey:dev' into dev

LHY 9 месяцев назад
Родитель
Сommit
dc0cfcdfb3
100 измененных файлов с 919 добавлено и 500 удалено
  1. BIN
      tasks/ActivityShikigami/as/as_check_battle_main.png
  2. BIN
      tasks/ActivityShikigami/as/as_climb_mode_ap.png
  3. BIN
      tasks/ActivityShikigami/as/as_climb_mode_pass.png
  4. BIN
      tasks/ActivityShikigami/as/as_climb_mode_switch.png
  5. BIN
      tasks/ActivityShikigami/as/as_shi.png
  6. BIN
      tasks/ActivityShikigami/as/as_to_battle_main.png
  7. BIN
      tasks/ActivityShikigami/as/as_to_battle_main_2.png
  8. 2 2
      tasks/ActivityShikigami/as/click.json
  9. 4 4
      tasks/ActivityShikigami/as/image.json
  10. 16 7
      tasks/ActivityShikigami/as/pages.json
  11. 13 11
      tasks/ActivityShikigami/assets.py
  12. 6 6
      tasks/ActivityShikigami/fire/ocr.json
  13. 8 6
      tasks/ActivityShikigami/script_task.py
  14. 7 0
      tasks/Component/Costume/config.py
  15. 46 9
      tasks/Component/Costume/costume_base.py
  16. 9 9
      tasks/Component/CostumeBattle/assets.py
  17. 25 0
      tasks/Component/CostumeCarpBanner/assets.py
  18. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_card_exp_1.png
  19. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_shi_card_1.png
  20. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png
  21. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_shi_grown_1.png
  22. BIN
      tasks/Component/CostumeCarpBanner/cb1/cb1_utilize_exp_1.png
  23. 47 0
      tasks/Component/CostumeCarpBanner/cb1/image.json
  24. 99 14
      tasks/Component/CostumeRealm/assets.py
  25. 70 7
      tasks/Component/CostumeRealm/realm1/image.json
  26. BIN
      tasks/Component/CostumeRealm/realm1/realm1_box_ap_1.png
  27. BIN
      tasks/Component/CostumeRealm/realm1/realm1_box_exp_1.png
  28. BIN
      tasks/Component/CostumeRealm/realm1/realm1_box_exp_max_1.png
  29. BIN
      tasks/Component/CostumeRealm/realm1/realm1_card_exp_1.png
  30. BIN
      tasks/Component/CostumeRealm/realm1/realm1_realm_shin_1.png
  31. BIN
      tasks/Component/CostumeRealm/realm1/realm1_shi_card_1.png
  32. BIN
      tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png
  33. BIN
      tasks/Component/CostumeRealm/realm1/realm1_shi_grown_1.png
  34. BIN
      tasks/Component/CostumeRealm/realm1/realm1_utilize_exp_1.png
  35. 54 18
      tasks/Component/CostumeRealm/realm2/image.json
  36. BIN
      tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png
  37. BIN
      tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png
  38. BIN
      tasks/Component/CostumeRealm/realm2/realm2_box_exp_max_2.png
  39. BIN
      tasks/Component/CostumeRealm/realm2/realm2_card_exp_2.png
  40. BIN
      tasks/Component/CostumeRealm/realm2/realm2_realm_shin_2.png
  41. BIN
      tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png
  42. BIN
      tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png
  43. BIN
      tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png
  44. BIN
      tasks/Component/CostumeRealm/realm2/realm2_utilize_exp_2.png
  45. 83 0
      tasks/Component/CostumeRealm/realm3/image.json
  46. BIN
      tasks/Component/CostumeRealm/realm3/realm3_box_ap_3.png
  47. BIN
      tasks/Component/CostumeRealm/realm3/realm3_box_exp_3.png
  48. BIN
      tasks/Component/CostumeRealm/realm3/realm3_box_exp_max_3.png
  49. BIN
      tasks/Component/CostumeRealm/realm3/realm3_card_exp_3.png
  50. BIN
      tasks/Component/CostumeRealm/realm3/realm3_realm_shin_3.png
  51. BIN
      tasks/Component/CostumeRealm/realm3/realm3_shi_card_3.png
  52. BIN
      tasks/Component/CostumeRealm/realm3/realm3_shi_defense_3.png
  53. BIN
      tasks/Component/CostumeRealm/realm3/realm3_shi_grown_3.png
  54. BIN
      tasks/Component/CostumeRealm/realm3/realm3_utilize_exp_3.png
  55. 83 0
      tasks/Component/CostumeRealm/realm4/image.json
  56. BIN
      tasks/Component/CostumeRealm/realm4/realm4_box_ap_4.png
  57. BIN
      tasks/Component/CostumeRealm/realm4/realm4_box_exp_4.png
  58. BIN
      tasks/Component/CostumeRealm/realm4/realm4_box_exp_max_4.png
  59. BIN
      tasks/Component/CostumeRealm/realm4/realm4_card_exp_4.png
  60. BIN
      tasks/Component/CostumeRealm/realm4/realm4_realm_shin_4.png
  61. BIN
      tasks/Component/CostumeRealm/realm4/realm4_shi_card_4.png
  62. BIN
      tasks/Component/CostumeRealm/realm4/realm4_shi_defense_4.png
  63. BIN
      tasks/Component/CostumeRealm/realm4/realm4_shi_grown_4.png
  64. BIN
      tasks/Component/CostumeRealm/realm4/realm4_utilize_exp_4.png
  65. 83 0
      tasks/Component/CostumeRealm/realm5/image.json
  66. BIN
      tasks/Component/CostumeRealm/realm5/realm5_box_ap_5.png
  67. BIN
      tasks/Component/CostumeRealm/realm5/realm5_box_exp_5.png
  68. BIN
      tasks/Component/CostumeRealm/realm5/realm5_box_exp_max_5.png
  69. BIN
      tasks/Component/CostumeRealm/realm5/realm5_card_exp_5.png
  70. BIN
      tasks/Component/CostumeRealm/realm5/realm5_realm_shin_5.png
  71. BIN
      tasks/Component/CostumeRealm/realm5/realm5_shi_card_5.png
  72. BIN
      tasks/Component/CostumeRealm/realm5/realm5_shi_defense_5.png
  73. BIN
      tasks/Component/CostumeRealm/realm5/realm5_shi_grown_5.png
  74. BIN
      tasks/Component/CostumeRealm/realm5/realm5_utilize_exp_5.png
  75. 181 181
      tasks/Component/CostumeShikigami/sk6/image.json
  76. 10 6
      tasks/Component/GeneralBattle/assets.py
  77. 12 12
      tasks/Component/GeneralBattle/gb/click.json
  78. BIN
      tasks/Component/GeneralBattle/gb/gb_confirm_close_diff_soul.png
  79. BIN
      tasks/Component/GeneralBattle/gb/gb_disable_7days_diff_soul.png
  80. 18 0
      tasks/Component/GeneralBattle/gb/img_supplement.json
  81. 26 32
      tasks/Component/GeneralBattle/general_battle.py
  82. 1 1
      tasks/Component/RightActivity/assets.py
  83. 2 2
      tasks/Component/RightActivity/ra/image.json
  84. 12 46
      tasks/Duel/assets.py
  85. BIN
      tasks/Duel/changeyys/Screenshots_jiaoti.png
  86. BIN
      tasks/Duel/changeyys/Screenshots_yingjie.png
  87. BIN
      tasks/Duel/changeyys/Screenshots_yinyangshi.png
  88. BIN
      tasks/Duel/changeyys/Screenshots_yinyangshu.png
  89. BIN
      tasks/Duel/changeyys/Screenshots_yinyangshuok.png
  90. BIN
      tasks/Duel/changeyys/Screenshots_yysjioahuan.png
  91. BIN
      tasks/Duel/changeyys/bbbqn_zhan.png
  92. 0 26
      tasks/Duel/changeyys/click.json
  93. 0 92
      tasks/Duel/changeyys/image.json
  94. BIN
      tasks/Duel/changeyys/qm_zhan.png
  95. BIN
      tasks/Duel/changeyys/sl_zhan.png
  96. BIN
      tasks/Duel/changeyys/yby_zhan.png
  97. 2 9
      tasks/Duel/config.py
  98. BIN
      tasks/Duel/duel/duel_ban.png
  99. BIN
      tasks/Duel/duel/duel_ban_flag.png
  100. BIN
      tasks/Duel/duel/duel_d_auto_entry.png

BIN
tasks/ActivityShikigami/as/as_check_battle_main.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_ap.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_pass.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_switch.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main_2.png


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

@@ -19,8 +19,8 @@
   },
   {
     "itemName": "random_bottom",
-    "roiFront": "179,577,972,100",
-    "roiBack": "179,579,972,100",
+    "roiFront": "179,598,972,78",
+    "roiBack": "179,597,972,81",
     "description": "description"
   },
   {

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

@@ -20,7 +20,7 @@
   {
     "itemName": "climb_mode_pass",
     "imageName": "as_climb_mode_pass.png",
-    "roiFront": "1151,528,21,28",
+    "roiFront": "1142,546,21,21",
     "roiBack": "1118,500,62,100",
     "method": "Template matching",
     "threshold": 0.8,
@@ -29,8 +29,8 @@
   {
     "itemName": "climb_mode_ap",
     "imageName": "as_climb_mode_ap.png",
-    "roiFront": "1100,530,22,25",
-    "roiBack": "1063,508,100,100",
+    "roiFront": "1091,545,22,25",
+    "roiBack": "1049,504,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力爬塔标志"
@@ -38,7 +38,7 @@
   {
     "itemName": "climb_mode_switch",
     "imageName": "as_climb_mode_switch.png",
-    "roiFront": "1238,531,29,26",
+    "roiFront": "1233,543,29,26",
     "roiBack": "1179,494,100,100",
     "method": "Template matching",
     "threshold": 0.8,

+ 16 - 7
tasks/ActivityShikigami/as/pages.json

@@ -2,7 +2,7 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "1184,300,47,29",
+    "roiFront": "1184,460,47,29",
     "roiBack": "1164,134,83,393",
     "method": "Template matching",
     "threshold": 0.7,
@@ -38,8 +38,8 @@
   {
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "478,340,39,176",
-    "roiBack": "449,297,100,241",
+    "roiFront": "267,277,39,176",
+    "roiBack": "238,242,100,241",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入主要的战斗界面"
@@ -47,8 +47,8 @@
   {
     "itemName": "to_battle_boss",
     "imageName": "as_to_battle_boss.png",
-    "roiFront": "931,217,37,173",
-    "roiBack": "909,198,100,219",
+    "roiFront": "974,327,37,136",
+    "roiBack": "934,317,100,219",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击进入boss战斗页面"
@@ -56,8 +56,8 @@
   {
     "itemName": "check_battle_main",
     "imageName": "as_check_battle_main.png",
-    "roiFront": "45,629,63,61",
-    "roiBack": "24,602,264,100",
+    "roiFront": "34,639,39,46",
+    "roiBack": "12,597,264,105",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -79,5 +79,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "从main进入到式神录"
+  },
+  {
+    "itemName": "to_battle_main_2",
+    "imageName": "as_to_battle_main_2.png",
+    "roiFront": "15,94,247,38",
+    "roiBack": "2,68,311,100",
+    "method": "Template matching",
+    "threshold": 0.65,
+    "description": "description"
   }
 ]

+ 13 - 11
tasks/ActivityShikigami/assets.py

@@ -18,7 +18,7 @@ class ActivityShikigamiAssets:
 	# description 
 	C_RANDOM_TOP = RuleClick(roi_front=(84,49,1159,93), roi_back=(85,46,1159,101), name="random_top")
 	# description 
-	C_RANDOM_BOTTOM = RuleClick(roi_front=(179,577,972,100), roi_back=(179,579,972,100), name="random_bottom")
+	C_RANDOM_BOTTOM = RuleClick(roi_front=(179,598,972,78), roi_back=(179,597,972,81), name="random_bottom")
 	# description 
 	C_RANDOM_ALL = RuleClick(roi_front=(42,94,1207,543), roi_back=(42,94,1207,543), name="random_all")
 
@@ -29,16 +29,16 @@ class ActivityShikigamiAssets:
 	# 还未上锁图片 
 	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_CLIMB_MODE_PASS = RuleImage(roi_front=(1151,528,21,28), roi_back=(1118,500,62,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
+	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1142,546,21,21), roi_back=(1118,500,62,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
 	# 体力爬塔标志 
-	I_CLIMB_MODE_AP = RuleImage(roi_front=(1100,530,22,25), roi_back=(1063,508,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_ap.png")
+	I_CLIMB_MODE_AP = RuleImage(roi_front=(1091,545,22,25), roi_back=(1049,504,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_ap.png")
 	# 切换按键 
-	I_CLIMB_MODE_SWITCH = RuleImage(roi_front=(1238,531,29,26), roi_back=(1179,494,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_switch.png")
+	I_CLIMB_MODE_SWITCH = RuleImage(roi_front=(1233,543,29,26), roi_back=(1179,494,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_switch.png")
 
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1184,300,47,29), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(1184,460,47,29), roi_back=(1164,134,83,393), 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")
 	# 右上跳过按钮 
@@ -46,15 +46,17 @@ class ActivityShikigamiAssets:
 	# 红色退出 
 	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=(478,340,39,176), roi_back=(449,297,100,241), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(267,277,39,176), roi_back=(238,242,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")
+	I_TO_BATTLE_BOSS = RuleImage(roi_front=(974,327,37,136), roi_back=(934,317,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=(45,629,63,61), roi_back=(24,602,264,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
+	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(34,639,39,46), roi_back=(12,597,264,105), 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=(1017,572,39,42), roi_back=(976,539,146,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
+	# description 
+	I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(15,94,247,38), roi_back=(2,68,311,100), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
 
 
 	# Image Rule Assets
@@ -90,13 +92,13 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(939,18,73,29), area=(939,18,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(575,16,73,29), area=(575,16,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(552,18,57,28), area=(552,18,57,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(783,18,57,28), area=(783,18,57,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 
-	O_REMAIN_PASS2 = RuleOcr(roi=(1115,25,88,29), area=(1107,14,103,50), mode="Digit", method="Default", keyword="", name="remain_pass2")
+	O_REMAIN_PASS2 = RuleOcr(roi=(750,17,88,29), area=(750,17,88,29), mode="Digit", method="Default", keyword="", name="remain_pass2")
 	# boss剩余攻击次数 
 	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(1099,659,162,52), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
 	# 100体活动门票检测 

+ 6 - 6
tasks/ActivityShikigami/fire/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap",
-    "roiFront": "939,18,73,29",
-    "roiBack": "939,18,73,29",
+    "roiFront": "575,16,73,29",
+    "roiBack": "575,16,73,29",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   {
     "itemName": "remain_pass",
-    "roiFront": "552,18,57,28",
-    "roiBack": "552,18,57,28",
+    "roiFront": "783,18,57,28",
+    "roiBack": "783,18,57,28",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -37,8 +37,8 @@
   },
   {
     "itemName": "remain_pass2",
-    "roiFront": "1115,25,88,29",
-    "roiBack": "1107,14,103,50",
+    "roiFront": "750,17,88,29",
+    "roiBack": "750,17,88,29",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

+ 8 - 6
tasks/ActivityShikigami/script_task.py

@@ -179,7 +179,8 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             更新前请先看 ./README.md
         """
         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.ui_clicks([self.I_TO_BATTLE_MAIN, self.I_TO_BATTLE_MAIN_2],
+                       stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
         self.switch_climb_mode_in_game('pass')
 
@@ -216,7 +217,8 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             更新前请先看 ./README.md
         """
         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.ui_clicks([self.I_TO_BATTLE_MAIN, self.I_TO_BATTLE_MAIN_2],
+                       stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
         self.switch_climb_mode_in_game('ap')
 
@@ -305,7 +307,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
                         break
                     if appear_reward or appear_reward_purple_snake_skin:
                         reward_click = random.choice(
-                            [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP])
+                            [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT])
                         self.click(reward_click, interval=1.8)
                         continue
                 return True
@@ -341,7 +343,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             'pass': self.I_CLIMB_MODE_PASS,
         }
         logger.info(f'Switch climb mode to {mode}')
-        self.ui_click(self.I_CLIMB_MODE_SWITCH, stop=map_check[mode], interval=1)
+        self.ui_click(self.I_CLIMB_MODE_SWITCH, stop=map_check[mode], interval=1.9)
 
     def lock_team(self, battle_conf: GeneralBattleConfig):
         """
@@ -350,10 +352,10 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         enable_preset = getattr(battle_conf, f"enable_{self.climb_type}_preset", False)
         if not enable_preset:
             logger.info(f'Lock {self.climb_type} team')
-            self.ui_click(self.I_UNLOCK, stop=self.I_LOCK, interval=1)
+            self.ui_click(self.I_UNLOCK, stop=self.I_LOCK, interval=1.5)
             return
         logger.info(f'Unlock {self.climb_type} team')
-        self.ui_click(self.I_LOCK, stop=self.I_UNLOCK, interval=1)
+        self.ui_click(self.I_LOCK, stop=self.I_UNLOCK, interval=1.5)
 
     def check_tickets_enough(self) -> bool:
         """

+ 7 - 0
tasks/Component/Costume/config.py

@@ -28,6 +28,12 @@ class RealmType(str, Enum):
     COSTUME_REALM_2 = 'costume_realm_2'  # 狐梦之乡
     COSTUME_REALM_3 = 'costume_realm_3'  # 编心织忆
     COSTUME_REALM_4 = 'costume_realm_4'  # 花海繁生
+    COSTUME_REALM_5 = 'costume_realm_5'  # 莲心梦乡
+
+# 鲤鱼旗皮肤
+class CarpBannerType(str, Enum):
+    COSTUME_CARPBANNER_DEFAULT = 'costume_carpbanner_default'  # 吉鲤游风
+    COSTUME_CARPBANNER_1 = 'costume_carpbanner_1'  # 无垢莲台(仅适配莲心梦乡)
 
 # 主题,就是庭院最右下角的展开按钮
 class ThemeType(str, Enum):
@@ -69,6 +75,7 @@ class CostumeConfig(BaseModel):
     # 皮肤配置
     costume_main_type: MainType = Field(default=MainType.COSTUME_MAIN, description='costume_main_type_help')
     costume_realm_type: RealmType = Field(default=RealmType.COSTUME_REALM_DEFAULT, description='costume_realm_type_help')
+    costume_carpbanner_type: CarpBannerType = Field(default=CarpBannerType.COSTUME_CARPBANNER_DEFAULT,description='costume_realm_type_help')
     costume_theme_type: ThemeType = Field(default=ThemeType.COSTUME_THEME_DEFAULT, description='costume_theme_type_help')
     costume_shikigami_type: ShikigamiType = Field(default=ShikigamiType.COSTUME_SHIKIGAMI_DEFAULT, description='costume_shikigami_type_help')
     costume_sign_type: SignType = Field(default=SignType.COSTUME_SIGN_DEFAULT, description='costume_sign_type_help')

+ 46 - 9
tasks/Component/Costume/costume_base.py

@@ -6,11 +6,12 @@ from module.atom.image import RuleImage
 from module.logger import logger
 
 from tasks.Component.Costume.config import (MainType, CostumeConfig, RealmType,
-                                            ThemeType, ShikigamiType, SignType, BattleType)
+                                            ThemeType, ShikigamiType, SignType, BattleType, CarpBannerType)
 from tasks.Component.Costume.assets import CostumeAssets
 from tasks.Component.CostumeRealm.assets import CostumeRealmAssets
 from tasks.Component.CostumeBattle.assets import CostumeBattleAssets
 from tasks.Component.CostumeShikigami.assets import CostumeShikigamiAssets
+from tasks.Component.CostumeCarpBanner.assets import CostumeCarpBannerAssets
 
 # 庭院皮肤
 # 主界面皮肤(使用字典推导式动态生成)
@@ -27,15 +28,32 @@ main_costume_model = {
 
 # 结界皮肤
 realm_costume_model = {
-    RealmType.COSTUME_REALM_1: {'I_SHI_CARD': 'I_SHI_CARD_1',
-                                'I_SHI_DEFENSE': 'I_SHI_DEFENSE_1',},
-    RealmType.COSTUME_REALM_2: {'I_SHI_CARD': 'I_SHI_CARD_2',
-                                'I_SHI_DEFENSE': 'I_SHI_DEFENSE_2',
-                                'I_SHI_GROWN': 'I_SHI_GROWN_2',
-                                'I_BOX_AP': 'I_BOX_AP_2',
-                                'I_BOX_EXP': 'I_BOX_EXP_2'},
+    getattr(RealmType, f"COSTUME_REALM_{i}"): {
+        'I_SHI_CARD': f'I_SHI_CARD_{i}',
+        'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
+        'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
+        'I_CARD_EXP': f'I_CARD_EXP_{i}',
+        'I_BOX_AP': f'I_BOX_AP_{i}',
+        'I_BOX_EXP': f'I_BOX_EXP_{i}',
+        'I_REALM_SHIN': f'I_REALM_SHIN_{i}',
+        'I_UTILIZE_EXP': f'I_UTILIZE_EXP_{i}',
+        'I_BOX_EXP_MAX': f'I_BOX_EXP_MAX_{i}',
+    } for i in range(1, 6)
 }
 
+
+# 鲤鱼旗皮肤
+carpbanner_costume_model = {
+    getattr(CarpBannerType, f"COSTUME_CARPBANNER_{i}"): {
+        'I_SHI_CARD': f'I_SHI_CARD_{i}',
+        'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
+        'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
+        'I_CARD_EXP': f'I_CARD_EXP_{i}',
+        'I_UTILIZE_EXP': f'I_UTILIZE_EXP_{i}',
+    } for i in range(1, 2)
+}
+
+
 # 战斗主题(使用循环处理常规情况 + 特例处理)
 battle_theme_model = {}
 for i in range(1, 12):
@@ -81,6 +99,7 @@ class CostumeBase:
             config: CostumeConfig = self.config.model.global_game.costume_config
         self.check_costume_main(config.costume_main_type)
         self.check_costume_realm(config.costume_realm_type)
+        self.check_costume_carpbanner(config.costume_carpbanner_type)
         self.check_costume_battle(config.costume_battle_type)
         self.check_costume_shikigami(config.costume_shikigami_type)
 
@@ -107,12 +126,30 @@ class CostumeBase:
             assert_value: RuleImage = getattr(costume_assets, value)
             self.replace_img(key, assert_value)
 
+    def check_costume_carpbanner(self, carpbanner_type: CarpBannerType):
+        if carpbanner_type == CarpBannerType.COSTUME_CARPBANNER_DEFAULT:
+            return
+        logger.info(f'Switch carp banner theme {carpbanner_type} (override realm assets)')
+        carpbanner_assets = CostumeCarpBannerAssets()
+        model = carpbanner_costume_model.get(carpbanner_type, {})
+        for key, value in model.items():
+            if not hasattr(carpbanner_assets, value):
+                logger.warning(f'Carp banner asset {value} not found, skip')
+                continue
+            assert_value: RuleImage = getattr(carpbanner_assets, value)
+            # 执行替换(覆盖结界皮肤的同名key)
+            self.replace_img(key, assert_value)
+
     def check_costume_realm(self, realm_type: RealmType):
         if realm_type == RealmType.COSTUME_REALM_DEFAULT:
             return
         logger.info(f'Switch realm theme {realm_type}')
         costume_realm_assets = CostumeRealmAssets()
-        for key, value in realm_costume_model[realm_type].items():
+        model = realm_costume_model.get(realm_type, {})
+        for key, value in model.items():
+            if not hasattr(costume_realm_assets, value):
+                logger.warning(f'Realm asset {value} not found, skip')
+                continue
             assert_value: RuleImage = getattr(costume_realm_assets, value)
             self.replace_img(key, assert_value)
 

+ 9 - 9
tasks/Component/CostumeBattle/assets.py

@@ -28,6 +28,15 @@ class CostumeBattleAssets:
 	I_LOCAL_10 = RuleImage(roi_front=(29,566,23,26), roi_back=(29,566,23,26), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle10/battle10_local_10.png")
 
 
+	# Image Rule Assets
+	# 左上角退出 
+	I_EXIT_11 = RuleImage(roi_front=(16,15,31,34), roi_back=(16,15,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle11/battle11_exit_11.png")
+	# 左上角好友 
+	I_FRIENDS_11 = RuleImage(roi_front=(90,14,30,28), roi_back=(90,14,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle11/battle11_friends_11.png")
+	# 指针 
+	I_LOCAL_11 = RuleImage(roi_front=(29,566,29,28), roi_back=(29,566,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle11/battle11_local_11.png")
+
+
 	# Image Rule Assets
 	# description 
 	I_LOCAL_2 = RuleImage(roi_front=(30,569,21,22), roi_back=(30,569,21,22), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle2/battle2_local_2.png")
@@ -106,12 +115,3 @@ class CostumeBattleAssets:
 	I_LOCAL_9 = RuleImage(roi_front=(114,489,37,37), roi_back=(114,489,37,37), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle9/battle9_local_9.png")
 
 
-	# Image Rule Assets
-	# 左上角退出 
-	I_EXIT_11 = RuleImage(roi_front=(16,15,31,34), roi_back=(16,15,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle11/battle11_exit_11.png")
-	# 左上角好友 
-	I_FRIENDS_11 = RuleImage(roi_front=(90,14,30,28), roi_back=(90,14,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle11/battle11_friends_11.png")
-	# 指针 
-	I_LOCAL_11 = RuleImage(roi_front=(29,566,29,28), roi_back=(29,566,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle11/battle11_local_11.png")
-
-

+ 25 - 0
tasks/Component/CostumeCarpBanner/assets.py

@@ -0,0 +1,25 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class CostumeCarpBannerAssets: 
+
+
+	# Image Rule Assets
+	# 育成 
+	I_SHI_GROWN_1 = RuleImage(roi_front=(602,339,26,37), roi_back=(524,269,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_grown_1.png")
+	# 结界卡 
+	I_SHI_CARD_1 = RuleImage(roi_front=(887,335,15,35), roi_back=(854,306,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_card_1.png")
+	# 防守 
+	I_SHI_DEFENSE_1 = RuleImage(roi_front=(269,335,24,46), roi_back=(200,277,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png")
+	# 收取经验(没有满的图) 
+	I_CARD_EXP_1 = RuleImage(roi_front=(875,181,57,54), roi_back=(803,111,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_card_exp_1.png")
+	# 寄养别人的经验 
+	I_UTILIZE_EXP_1 = RuleImage(roi_front=(589,187,58,43), roi_back=(539,144,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb1/cb1_utilize_exp_1.png")
+
+

BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_card_exp_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_shi_card_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_shi_defense_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_shi_grown_1.png


BIN
tasks/Component/CostumeCarpBanner/cb1/cb1_utilize_exp_1.png


+ 47 - 0
tasks/Component/CostumeCarpBanner/cb1/image.json

@@ -0,0 +1,47 @@
+[
+  {
+    "itemName": "shi_grown_1",
+    "imageName": "cb1_shi_grown_1.png",
+    "roiFront": "602,339,26,37",
+    "roiBack": "524,269,181,198",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "育成"
+  },
+  {
+    "itemName": "shi_card_1",
+    "imageName": "cb1_shi_card_1.png",
+    "roiFront": "887,335,15,35",
+    "roiBack": "854,306,87,120",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "结界卡"
+  },
+  {
+    "itemName": "shi_defense_1",
+    "imageName": "cb1_shi_defense_1.png",
+    "roiFront": "269,335,24,46",
+    "roiBack": "200,277,154,166",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "防守"
+  },
+  {
+    "itemName": "card_exp_1",
+    "imageName": "cb1_card_exp_1.png",
+    "roiFront": "875,181,57,54",
+    "roiBack": "803,111,199,185",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "收取经验(没有满的图)"
+  },
+  {
+    "itemName": "utilize_exp_1",
+    "imageName": "cb1_utilize_exp_1.png",
+    "roiFront": "589,187,58,43",
+    "roiBack": "539,144,156,123",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "寄养别人的经验"
+  }
+]

+ 99 - 14
tasks/Component/CostumeRealm/assets.py

@@ -11,22 +11,107 @@ class CostumeRealmAssets:
 
 
 	# Image Rule Assets
-	# description 
-	I_SHI_CARD_1 = RuleImage(roi_front=(919,295,36,66), roi_back=(868,238,141,150), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_card_1.png")
-	# description 
-	I_SHI_DEFENSE_1 = RuleImage(roi_front=(308,294,35,100), roi_back=(197,241,247,207), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png")
+	# 育成 
+	I_SHI_GROWN_1 = RuleImage(roi_front=(621,300,35,38), roi_back=(553,253,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_grown_1.png")
+	# 结界卡 
+	I_SHI_CARD_1 = RuleImage(roi_front=(923,302,38,56), roi_back=(902,288,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_card_1.png")
+	# 防守 
+	I_SHI_DEFENSE_1 = RuleImage(roi_front=(309,299,31,62), roi_back=(252,266,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png")
+	# 收取经验(没有满的图) 
+	I_CARD_EXP_1 = RuleImage(roi_front=(918,142,57,54), roi_back=(849,86,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_card_exp_1.png")
+	# 收取体力(没有满) 
+	I_BOX_AP_1 = RuleImage(roi_front=(813,384,51,46), roi_back=(735,305,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_box_ap_1.png")
+	# 收取盒子的经验(没有满) 
+	I_BOX_EXP_1 = RuleImage(roi_front=(899,390,42,45), roi_back=(854,348,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_box_exp_1.png")
+	# 结界皮肤 
+	I_REALM_SHIN_1 = RuleImage(roi_front=(161,389,54,58), roi_back=(0,273,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_realm_shin_1.png")
+	# 寄养别人的经验 
+	I_UTILIZE_EXP_1 = RuleImage(roi_front=(616,143,58,43), roi_back=(566,101,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_utilize_exp_1.png")
+	# 盒子经验满 
+	I_BOX_EXP_MAX_1 = RuleImage(roi_front=(893,376,56,61), roi_back=(803,317,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_box_exp_max_1.png")
 
 
 	# Image Rule Assets
-	# description 
-	I_SHI_GROWN_2 = RuleImage(roi_front=(663,344,36,68), roi_back=(598,280,159,186), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png")
-	# description 
-	I_SHI_CARD_2 = RuleImage(roi_front=(934,351,36,43), roi_back=(903,318,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png")
-	# description 
-	I_SHI_DEFENSE_2 = RuleImage(roi_front=(369,365,33,100), roi_back=(285,315,178,188), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png")
-	# description 
-	I_BOX_AP_2 = RuleImage(roi_front=(925,448,50,54), roi_back=(852,377,154,160), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png")
-	# description 
-	I_BOX_EXP_2 = RuleImage(roi_front=(991,448,41,59), roi_back=(921,372,155,173), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png")
+	# 育成 
+	I_SHI_GROWN_2 = RuleImage(roi_front=(665,354,35,38), roi_back=(588,299,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png")
+	# 结界卡 
+	I_SHI_CARD_2 = RuleImage(roi_front=(935,354,32,56), roi_back=(913,329,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png")
+	# 防守 
+	I_SHI_DEFENSE_2 = RuleImage(roi_front=(371,368,31,62), roi_back=(300,321,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png")
+	# 收取经验(没有满的图) 
+	I_CARD_EXP_2 = RuleImage(roi_front=(935,223,57,54), roi_back=(873,151,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_card_exp_2.png")
+	# 收取体力(没有满) 
+	I_BOX_AP_2 = RuleImage(roi_front=(927,448,51,46), roi_back=(863,367,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png")
+	# 收取盒子的经验(没有满) 
+	I_BOX_EXP_2 = RuleImage(roi_front=(990,457,42,45), roi_back=(953,414,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png")
+	# 结界皮肤 
+	I_REALM_SHIN_2 = RuleImage(roi_front=(157,503,54,58), roi_back=(7,386,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_realm_shin_2.png")
+	# 寄养别人的经验 
+	I_UTILIZE_EXP_2 = RuleImage(roi_front=(659,218,58,43), roi_back=(609,174,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_utilize_exp_2.png")
+	# 盒子经验满 
+	I_BOX_EXP_MAX_2 = RuleImage(roi_front=(991,443,48,51), roi_back=(893,378,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_exp_max_2.png")
+
+
+	# Image Rule Assets
+	# 育成 
+	I_SHI_GROWN_3 = RuleImage(roi_front=(605,304,35,38), roi_back=(530,247,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_shi_grown_3.png")
+	# 结界卡 
+	I_SHI_CARD_3 = RuleImage(roi_front=(935,295,38,56), roi_back=(910,282,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_shi_card_3.png")
+	# 防守 
+	I_SHI_DEFENSE_3 = RuleImage(roi_front=(253,309,31,62), roi_back=(200,269,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_shi_defense_3.png")
+	# 收取经验(没有满的图) 
+	I_CARD_EXP_3 = RuleImage(roi_front=(939,147,50,54), roi_back=(864,86,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_card_exp_3.png")
+	# 收取体力(没有满) 
+	I_BOX_AP_3 = RuleImage(roi_front=(949,376,51,46), roi_back=(872,298,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_box_ap_3.png")
+	# 收取盒子的经验(没有满) 
+	I_BOX_EXP_3 = RuleImage(roi_front=(1012,390,42,45), roi_back=(962,347,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_box_exp_3.png")
+	# 结界皮肤 
+	I_REALM_SHIN_3 = RuleImage(roi_front=(160,401,54,58), roi_back=(0,290,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_realm_shin_3.png")
+	# 寄养别人的经验 
+	I_UTILIZE_EXP_3 = RuleImage(roi_front=(595,151,58,43), roi_back=(543,113,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_utilize_exp_3.png")
+	# 盒子经验满 
+	I_BOX_EXP_MAX_3 = RuleImage(roi_front=(1012,374,49,50), roi_back=(919,317,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm3/realm3_box_exp_max_3.png")
+
+
+	# Image Rule Assets
+	# 育成 
+	I_SHI_GROWN_4 = RuleImage(roi_front=(609,323,27,38), roi_back=(532,250,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_shi_grown_4.png")
+	# 结界卡 
+	I_SHI_CARD_4 = RuleImage(roi_front=(929,315,38,56), roi_back=(904,299,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_shi_card_4.png")
+	# 防守 
+	I_SHI_DEFENSE_4 = RuleImage(roi_front=(242,320,31,62), roi_back=(184,276,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_shi_defense_4.png")
+	# 收取经验(没有满的图) 
+	I_CARD_EXP_4 = RuleImage(roi_front=(930,181,57,54), roi_back=(855,111,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_card_exp_4.png")
+	# 收取体力(没有满) 
+	I_BOX_AP_4 = RuleImage(roi_front=(958,386,51,46), roi_back=(889,313,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_box_ap_4.png")
+	# 收取盒子的经验(没有满) 
+	I_BOX_EXP_4 = RuleImage(roi_front=(1022,394,32,45), roi_back=(968,353,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_box_exp_4.png")
+	# 结界皮肤 
+	I_REALM_SHIN_4 = RuleImage(roi_front=(228,406,54,58), roi_back=(60,293,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_realm_shin_4.png")
+	# 寄养别人的经验 
+	I_UTILIZE_EXP_4 = RuleImage(roi_front=(596,181,58,43), roi_back=(545,144,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_utilize_exp_4.png")
+	# 盒子经验满 
+	I_BOX_EXP_MAX_4 = RuleImage(roi_front=(1026,381,41,51), roi_back=(934,323,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm4/realm4_box_exp_max_4.png")
+
+
+	# Image Rule Assets
+	# 育成 
+	I_SHI_GROWN_5 = RuleImage(roi_front=(642,356,35,38), roi_back=(568,295,181,198), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_shi_grown_5.png")
+	# 结界卡 
+	I_SHI_CARD_5 = RuleImage(roi_front=(925,358,38,56), roi_back=(901,333,87,120), threshold=0.6, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_shi_card_5.png")
+	# 防守 
+	I_SHI_DEFENSE_5 = RuleImage(roi_front=(312,356,31,62), roi_back=(257,310,154,166), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_shi_defense_5.png")
+	# 收取经验(没有满的图) 
+	I_CARD_EXP_5 = RuleImage(roi_front=(922,216,57,54), roi_back=(850,145,199,185), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_card_exp_5.png")
+	# 收取体力(没有满) 
+	I_BOX_AP_5 = RuleImage(roi_front=(981,420,51,46), roi_back=(925,345,202,204), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_box_ap_5.png")
+	# 收取盒子的经验(没有满) 
+	I_BOX_EXP_5 = RuleImage(roi_front=(1050,430,42,45), roi_back=(996,382,147,127), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_box_exp_5.png")
+	# 结界皮肤 
+	I_REALM_SHIN_5 = RuleImage(roi_front=(237,411,54,58), roi_back=(95,303,360,276), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_realm_shin_5.png")
+	# 寄养别人的经验 
+	I_UTILIZE_EXP_5 = RuleImage(roi_front=(632,216,58,43), roi_back=(582,172,156,123), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_utilize_exp_5.png")
+	# 盒子经验满 
+	I_BOX_EXP_MAX_5 = RuleImage(roi_front=(1048,420,48,56), roi_back=(958,353,228,186), threshold=0.7, method="Template matching", file="./tasks/Component/CostumeRealm/realm5/realm5_box_exp_max_5.png")
 
 

+ 70 - 7
tasks/Component/CostumeRealm/realm1/image.json

@@ -1,20 +1,83 @@
 [
+  {
+    "itemName": "shi_grown_1",
+    "imageName": "realm1_shi_grown_1.png",
+    "roiFront": "621,300,35,38",
+    "roiBack": "553,253,181,198",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "育成"
+  },
   {
     "itemName": "shi_card_1",
     "imageName": "realm1_shi_card_1.png",
-    "roiFront": "919,295,36,66",
-    "roiBack": "868,238,141,150",
+    "roiFront": "923,302,38,56",
+    "roiBack": "902,288,87,120",
     "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
+    "threshold": 0.6,
+    "description": "结界卡"
   },
   {
     "itemName": "shi_defense_1",
     "imageName": "realm1_shi_defense_1.png",
-    "roiFront": "308,294,35,100",
-    "roiBack": "197,241,247,207",
+    "roiFront": "309,299,31,62",
+    "roiBack": "252,266,154,166",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "防守"
+  },
+  {
+    "itemName": "card_exp_1",
+    "imageName": "realm1_card_exp_1.png",
+    "roiFront": "918,142,57,54",
+    "roiBack": "849,86,199,185",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "收取经验(没有满的图)"
+  },
+  {
+    "itemName": "box_ap_1",
+    "imageName": "realm1_box_ap_1.png",
+    "roiFront": "813,384,51,46",
+    "roiBack": "735,305,202,204",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取体力(没有满)"
+  },
+  {
+    "itemName": "box_exp_1",
+    "imageName": "realm1_box_exp_1.png",
+    "roiFront": "899,390,42,45",
+    "roiBack": "854,348,147,127",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取盒子的经验(没有满)"
+  },
+  {
+    "itemName": "realm_shin_1",
+    "imageName": "realm1_realm_shin_1.png",
+    "roiFront": "161,389,54,58",
+    "roiBack": "0,273,360,276",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "结界皮肤"
+  },
+  {
+    "itemName": "utilize_exp_1",
+    "imageName": "realm1_utilize_exp_1.png",
+    "roiFront": "616,143,58,43",
+    "roiBack": "566,101,156,123",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "寄养别人的经验"
+  },
+  {
+    "itemName": "box_exp_max_1",
+    "imageName": "realm1_box_exp_max_1.png",
+    "roiFront": "893,376,56,61",
+    "roiBack": "803,317,228,186",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "盒子经验满"
   }
 ]

BIN
tasks/Component/CostumeRealm/realm1/realm1_box_ap_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_box_exp_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_box_exp_max_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_card_exp_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_realm_shin_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_shi_card_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_shi_grown_1.png


BIN
tasks/Component/CostumeRealm/realm1/realm1_utilize_exp_1.png


+ 54 - 18
tasks/Component/CostumeRealm/realm2/image.json

@@ -2,46 +2,82 @@
   {
     "itemName": "shi_grown_2",
     "imageName": "realm2_shi_grown_2.png",
-    "roiFront": "663,344,36,68",
-    "roiBack": "598,280,159,186",
+    "roiFront": "665,354,35,38",
+    "roiBack": "588,299,181,198",
     "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
+    "threshold": 0.6,
+    "description": "育成"
   },
   {
     "itemName": "shi_card_2",
     "imageName": "realm2_shi_card_2.png",
-    "roiFront": "934,351,36,43",
-    "roiBack": "903,318,100,100",
+    "roiFront": "935,354,32,56",
+    "roiBack": "913,329,87,120",
     "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
+    "threshold": 0.6,
+    "description": "结界卡"
   },
   {
     "itemName": "shi_defense_2",
     "imageName": "realm2_shi_defense_2.png",
-    "roiFront": "369,365,33,100",
-    "roiBack": "285,315,178,188",
+    "roiFront": "371,368,31,62",
+    "roiBack": "300,321,154,166",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "防守"
+  },
+  {
+    "itemName": "card_exp_2",
+    "imageName": "realm2_card_exp_2.png",
+    "roiFront": "935,223,57,54",
+    "roiBack": "873,151,199,185",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "收取经验(没有满的图)"
   },
   {
     "itemName": "box_ap_2",
     "imageName": "realm2_box_ap_2.png",
-    "roiFront": "925,448,50,54",
-    "roiBack": "852,377,154,160",
+    "roiFront": "927,448,51,46",
+    "roiBack": "863,367,202,204",
     "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
+    "threshold": 0.7,
+    "description": "收取体力(没有满)"
   },
   {
     "itemName": "box_exp_2",
     "imageName": "realm2_box_exp_2.png",
-    "roiFront": "991,448,41,59",
-    "roiBack": "921,372,155,173",
+    "roiFront": "990,457,42,45",
+    "roiBack": "953,414,147,127",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取盒子的经验(没有满)"
+  },
+  {
+    "itemName": "realm_shin_2",
+    "imageName": "realm2_realm_shin_2.png",
+    "roiFront": "157,503,54,58",
+    "roiBack": "7,386,360,276",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "结界皮肤"
+  },
+  {
+    "itemName": "utilize_exp_2",
+    "imageName": "realm2_utilize_exp_2.png",
+    "roiFront": "659,218,58,43",
+    "roiBack": "609,174,156,123",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "寄养别人的经验"
+  },
+  {
+    "itemName": "box_exp_max_2",
+    "imageName": "realm2_box_exp_max_2.png",
+    "roiFront": "991,443,48,51",
+    "roiBack": "893,378,228,186",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "盒子经验满"
   }
 ]

BIN
tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_box_exp_max_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_card_exp_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_realm_shin_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png


BIN
tasks/Component/CostumeRealm/realm2/realm2_utilize_exp_2.png


+ 83 - 0
tasks/Component/CostumeRealm/realm3/image.json

@@ -0,0 +1,83 @@
+[
+  {
+    "itemName": "shi_grown_3",
+    "imageName": "realm3_shi_grown_3.png",
+    "roiFront": "605,304,35,38",
+    "roiBack": "530,247,181,198",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "育成"
+  },
+  {
+    "itemName": "shi_card_3",
+    "imageName": "realm3_shi_card_3.png",
+    "roiFront": "935,295,38,56",
+    "roiBack": "910,282,87,120",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "结界卡"
+  },
+  {
+    "itemName": "shi_defense_3",
+    "imageName": "realm3_shi_defense_3.png",
+    "roiFront": "253,309,31,62",
+    "roiBack": "200,269,154,166",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "防守"
+  },
+  {
+    "itemName": "card_exp_3",
+    "imageName": "realm3_card_exp_3.png",
+    "roiFront": "939,147,50,54",
+    "roiBack": "864,86,199,185",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "收取经验(没有满的图)"
+  },
+  {
+    "itemName": "box_ap_3",
+    "imageName": "realm3_box_ap_3.png",
+    "roiFront": "949,376,51,46",
+    "roiBack": "872,298,202,204",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取体力(没有满)"
+  },
+  {
+    "itemName": "box_exp_3",
+    "imageName": "realm3_box_exp_3.png",
+    "roiFront": "1012,390,42,45",
+    "roiBack": "962,347,147,127",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取盒子的经验(没有满)"
+  },
+  {
+    "itemName": "realm_shin_3",
+    "imageName": "realm3_realm_shin_3.png",
+    "roiFront": "160,401,54,58",
+    "roiBack": "0,290,360,276",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "结界皮肤"
+  },
+  {
+    "itemName": "utilize_exp_3",
+    "imageName": "realm3_utilize_exp_3.png",
+    "roiFront": "595,151,58,43",
+    "roiBack": "543,113,156,123",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "寄养别人的经验"
+  },
+  {
+    "itemName": "box_exp_max_3",
+    "imageName": "realm3_box_exp_max_3.png",
+    "roiFront": "1012,374,49,50",
+    "roiBack": "919,317,228,186",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "盒子经验满"
+  }
+]

BIN
tasks/Component/CostumeRealm/realm3/realm3_box_ap_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_box_exp_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_box_exp_max_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_card_exp_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_realm_shin_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_shi_card_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_shi_defense_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_shi_grown_3.png


BIN
tasks/Component/CostumeRealm/realm3/realm3_utilize_exp_3.png


+ 83 - 0
tasks/Component/CostumeRealm/realm4/image.json

@@ -0,0 +1,83 @@
+[
+  {
+    "itemName": "shi_grown_4",
+    "imageName": "realm4_shi_grown_4.png",
+    "roiFront": "609,323,27,38",
+    "roiBack": "532,250,181,198",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "育成"
+  },
+  {
+    "itemName": "shi_card_4",
+    "imageName": "realm4_shi_card_4.png",
+    "roiFront": "929,315,38,56",
+    "roiBack": "904,299,87,120",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "结界卡"
+  },
+  {
+    "itemName": "shi_defense_4",
+    "imageName": "realm4_shi_defense_4.png",
+    "roiFront": "242,320,31,62",
+    "roiBack": "184,276,154,166",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "防守"
+  },
+  {
+    "itemName": "card_exp_4",
+    "imageName": "realm4_card_exp_4.png",
+    "roiFront": "930,181,57,54",
+    "roiBack": "855,111,199,185",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "收取经验(没有满的图)"
+  },
+  {
+    "itemName": "box_ap_4",
+    "imageName": "realm4_box_ap_4.png",
+    "roiFront": "958,386,51,46",
+    "roiBack": "889,313,202,204",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取体力(没有满)"
+  },
+  {
+    "itemName": "box_exp_4",
+    "imageName": "realm4_box_exp_4.png",
+    "roiFront": "1022,394,32,45",
+    "roiBack": "968,353,147,127",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取盒子的经验(没有满)"
+  },
+  {
+    "itemName": "realm_shin_4",
+    "imageName": "realm4_realm_shin_4.png",
+    "roiFront": "228,406,54,58",
+    "roiBack": "60,293,360,276",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "结界皮肤"
+  },
+  {
+    "itemName": "utilize_exp_4",
+    "imageName": "realm4_utilize_exp_4.png",
+    "roiFront": "596,181,58,43",
+    "roiBack": "545,144,156,123",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "寄养别人的经验"
+  },
+  {
+    "itemName": "box_exp_max_4",
+    "imageName": "realm4_box_exp_max_4.png",
+    "roiFront": "1026,381,41,51",
+    "roiBack": "934,323,228,186",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "盒子经验满"
+  }
+]

BIN
tasks/Component/CostumeRealm/realm4/realm4_box_ap_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_box_exp_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_box_exp_max_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_card_exp_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_realm_shin_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_shi_card_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_shi_defense_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_shi_grown_4.png


BIN
tasks/Component/CostumeRealm/realm4/realm4_utilize_exp_4.png


+ 83 - 0
tasks/Component/CostumeRealm/realm5/image.json

@@ -0,0 +1,83 @@
+[
+  {
+    "itemName": "shi_grown_5",
+    "imageName": "realm5_shi_grown_5.png",
+    "roiFront": "642,356,35,38",
+    "roiBack": "568,295,181,198",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "育成"
+  },
+  {
+    "itemName": "shi_card_5",
+    "imageName": "realm5_shi_card_5.png",
+    "roiFront": "925,358,38,56",
+    "roiBack": "901,333,87,120",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "结界卡"
+  },
+  {
+    "itemName": "shi_defense_5",
+    "imageName": "realm5_shi_defense_5.png",
+    "roiFront": "312,356,31,62",
+    "roiBack": "257,310,154,166",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "防守"
+  },
+  {
+    "itemName": "card_exp_5",
+    "imageName": "realm5_card_exp_5.png",
+    "roiFront": "922,216,57,54",
+    "roiBack": "850,145,199,185",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "收取经验(没有满的图)"
+  },
+  {
+    "itemName": "box_ap_5",
+    "imageName": "realm5_box_ap_5.png",
+    "roiFront": "981,420,51,46",
+    "roiBack": "925,345,202,204",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取体力(没有满)"
+  },
+  {
+    "itemName": "box_exp_5",
+    "imageName": "realm5_box_exp_5.png",
+    "roiFront": "1050,430,42,45",
+    "roiBack": "996,382,147,127",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "收取盒子的经验(没有满)"
+  },
+  {
+    "itemName": "realm_shin_5",
+    "imageName": "realm5_realm_shin_5.png",
+    "roiFront": "237,411,54,58",
+    "roiBack": "95,303,360,276",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "结界皮肤"
+  },
+  {
+    "itemName": "utilize_exp_5",
+    "imageName": "realm5_utilize_exp_5.png",
+    "roiFront": "632,216,58,43",
+    "roiBack": "582,172,156,123",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "寄养别人的经验"
+  },
+  {
+    "itemName": "box_exp_max_5",
+    "imageName": "realm5_box_exp_max_5.png",
+    "roiFront": "1048,420,48,56",
+    "roiBack": "958,353,228,186",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "盒子经验满"
+  }
+]

BIN
tasks/Component/CostumeRealm/realm5/realm5_box_ap_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_box_exp_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_box_exp_max_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_card_exp_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_realm_shin_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_shi_card_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_shi_defense_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_shi_grown_5.png


BIN
tasks/Component/CostumeRealm/realm5/realm5_utilize_exp_5.png


+ 181 - 181
tasks/Component/CostumeShikigami/sk6/image.json

@@ -1,182 +1,182 @@
-[
-  {
-    "itemName": "check_records_6",
-    "imageName": "sk6_check_records_6.png",
-    "roiFront": "269,71,55,50",
-    "roiBack": "269,71,55,50",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "用于判断在式神录"
-  },
-  {
-    "itemName": "record_soul_back_6",
-    "imageName": "sk6_record_soul_back_6.png",
-    "roiFront": "19,9,51,44",
-    "roiBack": "19,9,51,44",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "退出式神录"
-  },
-  {
-    "itemName": "soul_preset_6",
-    "imageName": "sk6_soul_preset_6.png",
-    "roiFront": "335,73,90,51",
-    "roiBack": "310,57,169,72",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "预设"
-  },
-  {
-    "itemName": "sou_switch_1_6",
-    "imageName": "sk6_sou_switch_1_6.png",
-    "roiFront": "973,140,34,32",
-    "roiBack": "967,131,51,48",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "第一组切换"
-  },
-  {
-    "itemName": "sou_switch_2_6",
-    "imageName": "sk6_sou_switch_2_6.png",
-    "roiFront": "971,293,33,33",
-    "roiBack": "960,284,58,49",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "第二组切换"
-  },
-  {
-    "itemName": "sou_switch_3_6",
-    "imageName": "sk6_sou_switch_3_6.png",
-    "roiFront": "968,448,41,38",
-    "roiBack": "962,442,52,48",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_switch_4_6",
-    "imageName": "sk6_sou_switch_4_6.png",
-    "roiFront": "967,597,42,25",
-    "roiBack": "962,592,53,34",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_switch_sure_6",
-    "imageName": "sk6_sou_switch_sure_6.png",
-    "roiFront": "668,401,180,61",
-    "roiBack": "668,401,180,61",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_check_in_6",
-    "imageName": "sk6_sou_check_in_6.png",
-    "roiFront": "269,69,50,49",
-    "roiBack": "269,69,50,49",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "用于判断是否在式神录里面"
-  },
-  {
-    "itemName": "sou_check_group_1_6",
-    "imageName": "sk6_sou_check_group_1_6.png",
-    "roiFront": "1086,91,22,57",
-    "roiBack": "1086,91,22,57",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "检查是否为第一组"
-  },
-  {
-    "itemName": "sou_check_group_2_6",
-    "imageName": "sk6_sou_check_group_2_6.png",
-    "roiFront": "1086,163,25,57",
-    "roiBack": "1086,163,25,57",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_check_group_3_6",
-    "imageName": "sk6_sou_check_group_3_6.png",
-    "roiFront": "1085,234,22,49",
-    "roiBack": "1085,234,22,49",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_check_group_4_6",
-    "imageName": "sk6_sou_check_group_4_6.png",
-    "roiFront": "1086,303,21,56",
-    "roiBack": "1086,303,21,56",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_check_group_5_6",
-    "imageName": "sk6_sou_check_group_5_6.png",
-    "roiFront": "1088,370,21,53",
-    "roiBack": "1088,370,21,53",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_check_group_6_6",
-    "imageName": "sk6_sou_check_group_6_6.png",
-    "roiFront": "1085,443,23,54",
-    "roiBack": "1085,443,23,54",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_check_group_7_6",
-    "imageName": "sk6_sou_check_group_7_6.png",
-    "roiFront": "1088,512,21,54",
-    "roiBack": "1088,512,21,54",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "sou_team_present_6",
-    "imageName": "sk6_sou_team_present_6.png",
-    "roiFront": "720,76,136,43",
-    "roiBack": "706,68,175,63",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "匹配队伍预设"
-  },
-  {
-    "itemName": "sou_click_present_6",
-    "imageName": "sk6_sou_click_present_6.png",
-    "roiFront": "967,305,43,22",
-    "roiBack": "965,142,48,480",
-    "method": "Template matching",
-    "threshold": 0.9,
-    "description": "需要切换的预设按钮(颜色深一点)"
-  },
-  {
-    "itemName": "st_souls_6",
-    "imageName": "sk6_st_souls_6.png",
-    "roiFront": "1180,236,62,66",
-    "roiBack": "1176,230,70,80",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "选中的御魂"
-  },
-  {
-    "itemName": "st_replace_6",
-    "imageName": "sk6_st_replace_6.png",
-    "roiFront": "856,170,100,100",
-    "roiBack": "856,170,100,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "更换"
-  }
+[
+  {
+    "itemName": "check_records_6",
+    "imageName": "sk6_check_records_6.png",
+    "roiFront": "269,71,55,50",
+    "roiBack": "269,71,55,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用于判断在式神录"
+  },
+  {
+    "itemName": "record_soul_back_6",
+    "imageName": "sk6_record_soul_back_6.png",
+    "roiFront": "19,9,51,44",
+    "roiBack": "19,9,51,44",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "退出式神录"
+  },
+  {
+    "itemName": "soul_preset_6",
+    "imageName": "sk6_soul_preset_6.png",
+    "roiFront": "335,73,90,51",
+    "roiBack": "310,57,169,72",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "预设"
+  },
+  {
+    "itemName": "sou_switch_1_6",
+    "imageName": "sk6_sou_switch_1_6.png",
+    "roiFront": "973,140,34,32",
+    "roiBack": "967,131,51,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第一组切换"
+  },
+  {
+    "itemName": "sou_switch_2_6",
+    "imageName": "sk6_sou_switch_2_6.png",
+    "roiFront": "971,293,33,33",
+    "roiBack": "960,284,58,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第二组切换"
+  },
+  {
+    "itemName": "sou_switch_3_6",
+    "imageName": "sk6_sou_switch_3_6.png",
+    "roiFront": "968,448,41,38",
+    "roiBack": "962,442,52,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_switch_4_6",
+    "imageName": "sk6_sou_switch_4_6.png",
+    "roiFront": "967,597,42,25",
+    "roiBack": "962,592,53,34",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_switch_sure_6",
+    "imageName": "sk6_sou_switch_sure_6.png",
+    "roiFront": "668,401,180,61",
+    "roiBack": "668,401,180,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_in_6",
+    "imageName": "sk6_sou_check_in_6.png",
+    "roiFront": "269,69,50,49",
+    "roiBack": "269,69,50,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用于判断是否在式神录里面"
+  },
+  {
+    "itemName": "sou_check_group_1_6",
+    "imageName": "sk6_sou_check_group_1_6.png",
+    "roiFront": "1086,91,22,57",
+    "roiBack": "1086,91,22,57",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "检查是否为第一组"
+  },
+  {
+    "itemName": "sou_check_group_2_6",
+    "imageName": "sk6_sou_check_group_2_6.png",
+    "roiFront": "1086,163,25,57",
+    "roiBack": "1086,163,25,57",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_3_6",
+    "imageName": "sk6_sou_check_group_3_6.png",
+    "roiFront": "1085,234,22,49",
+    "roiBack": "1085,234,22,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_4_6",
+    "imageName": "sk6_sou_check_group_4_6.png",
+    "roiFront": "1086,303,21,56",
+    "roiBack": "1086,303,21,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_5_6",
+    "imageName": "sk6_sou_check_group_5_6.png",
+    "roiFront": "1088,370,21,53",
+    "roiBack": "1088,370,21,53",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_6_6",
+    "imageName": "sk6_sou_check_group_6_6.png",
+    "roiFront": "1085,443,23,54",
+    "roiBack": "1085,443,23,54",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_check_group_7_6",
+    "imageName": "sk6_sou_check_group_7_6.png",
+    "roiFront": "1088,512,21,54",
+    "roiBack": "1088,512,21,54",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "sou_team_present_6",
+    "imageName": "sk6_sou_team_present_6.png",
+    "roiFront": "720,76,136,43",
+    "roiBack": "706,68,175,63",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "匹配队伍预设"
+  },
+  {
+    "itemName": "sou_click_present_6",
+    "imageName": "sk6_sou_click_present_6.png",
+    "roiFront": "967,305,43,22",
+    "roiBack": "965,142,48,480",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "需要切换的预设按钮(颜色深一点)"
+  },
+  {
+    "itemName": "st_souls_6",
+    "imageName": "sk6_st_souls_6.png",
+    "roiFront": "1180,236,62,66",
+    "roiBack": "1176,230,70,80",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选中的御魂"
+  },
+  {
+    "itemName": "st_replace_6",
+    "imageName": "sk6_st_replace_6.png",
+    "roiFront": "856,170,100,100",
+    "roiBack": "856,170,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "更换"
+  }
 ]

+ 10 - 6
tasks/Component/GeneralBattle/assets.py

@@ -49,17 +49,17 @@ class GeneralBattleAssets:
 	# 预设组7 
 	C_PRESET_GROUP_7 = RuleClick(roi_front=(35,615,25,50), roi_back=(35,615,25,50), name="preset_group_7")
 	# 从左开始第一个绿标 
-	C_GREEN_LEFT_1 = RuleClick(roi_front=(128,433,90,150), roi_back=(128,433,90,150), name="green_left_1")
+	C_GREEN_LEFT_1 = RuleClick(roi_front=(183,506,125,108), roi_back=(183,506,125,108), name="green_left_1")
 	# 从左开始第二个绿标 
-	C_GREEN_LEFT_2 = RuleClick(roi_front=(371,385,81,145), roi_back=(371,385,81,145), name="green_left_2")
+	C_GREEN_LEFT_2 = RuleClick(roi_front=(407,474,100,100), roi_back=(407,474,100,100), name="green_left_2")
 	# 从左开始第三个绿标 
-	C_GREEN_LEFT_3 = RuleClick(roi_front=(586,328,100,76), roi_back=(586,328,100,76), name="green_left_3")
+	C_GREEN_LEFT_3 = RuleClick(roi_front=(608,446,64,44), roi_back=(608,446,64,44), name="green_left_3")
 	# 从左开始第四个绿标 
-	C_GREEN_LEFT_4 = RuleClick(roi_front=(817,379,77,133), roi_back=(817,379,77,133), name="green_left_4")
+	C_GREEN_LEFT_4 = RuleClick(roi_front=(769,475,81,98), roi_back=(769,475,81,98), name="green_left_4")
 	# 从左开始第五个绿标 
-	C_GREEN_LEFT_5 = RuleClick(roi_front=(1059,416,85,145), roi_back=(1059,416,85,145), name="green_left_5")
+	C_GREEN_LEFT_5 = RuleClick(roi_front=(932,473,132,108), roi_back=(932,473,132,108), name="green_left_5")
 	# 绿标阴阳师 
-	C_GREEN_MAIN = RuleClick(roi_front=(590,454,88,178), roi_back=(590,454,88,178), name="green_main")
+	C_GREEN_MAIN = RuleClick(roi_front=(565,555,104,81), roi_back=(565,555,104,81), name="green_main")
 	# 绿标点击 区域,默认为全屏,需要在代码中更新其区域 
 	C_GREEN_MARK_AREA = RuleClick(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), name="green_mark_area")
 	# 战斗的时候有一定的概率随机点击 
@@ -142,6 +142,10 @@ class GeneralBattleAssets:
 	I_GREED_GHOST = RuleImage(roi_front=(56,40,45,45), roi_back=(56,40,45,45), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_greed_ghost.png")
 	# 确认按钮 
 	I_CONFIRM = RuleImage(roi_front=(732,383,83,43), roi_back=(330,228,615,286), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_confirm.png")
+	# 关闭御魂不一致提示弹窗 
+	I_CONFIRM_CLOSE_DIFF_SOUL = RuleImage(roi_front=(571,404,135,54), roi_back=(517,374,226,112), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_confirm_close_diff_soul.png")
+	# 禁用御魂不一致提示7天 
+	I_DISABLE_7DAYS_DIFF_SOUL = RuleImage(roi_front=(547,342,27,36), roi_back=(524,325,70,71), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_disable_7days_diff_soul.png")
 
 
 	# Ocr Rule Assets

+ 12 - 12
tasks/Component/GeneralBattle/gb/click.json

@@ -67,38 +67,38 @@
   },
   {
     "itemName": "green_left_1",
-    "roiFront": "128,433,90,150",
-    "roiBack": "128,433,90,150",
+    "roiFront": "183,506,125,108",
+    "roiBack": "183,506,125,108",
     "description": "从左开始第一个绿标"
   },
   {
     "itemName": "green_left_2",
-    "roiFront": "371,385,81,145",
-    "roiBack": "371,385,81,145",
+    "roiFront": "407,474,100,100",
+    "roiBack": "407,474,100,100",
     "description": "从左开始第二个绿标"
   },
   {
     "itemName": "green_left_3",
-    "roiFront": "586,328,100,76",
-    "roiBack": "586,328,100,76",
+    "roiFront": "608,446,64,44",
+    "roiBack": "608,446,64,44",
     "description": "从左开始第三个绿标"
   },
   {
     "itemName": "green_left_4",
-    "roiFront": "817,379,77,133",
-    "roiBack": "817,379,77,133",
+    "roiFront": "769,475,81,98",
+    "roiBack": "769,475,81,98",
     "description": "从左开始第四个绿标"
   },
   {
     "itemName": "green_left_5",
-    "roiFront": "1059,416,85,145",
-    "roiBack": "1059,416,85,145",
+    "roiFront": "932,473,132,108",
+    "roiBack": "932,473,132,108",
     "description": "从左开始第五个绿标"
   },
   {
     "itemName": "green_main",
-    "roiFront": "590,454,88,178",
-    "roiBack": "590,454,88,178",
+    "roiFront": "565,555,104,81",
+    "roiBack": "565,555,104,81",
     "description": "绿标阴阳师"
   },
   {

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


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


+ 18 - 0
tasks/Component/GeneralBattle/gb/img_supplement.json

@@ -16,5 +16,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "确认按钮"
+  },
+  {
+    "itemName": "confirm_close_diff_soul",
+    "imageName": "gb_confirm_close_diff_soul.png",
+    "roiFront": "571,404,135,54",
+    "roiBack": "517,374,226,112",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "关闭御魂不一致提示弹窗"
+  },
+  {
+    "itemName": "disable_7days_diff_soul",
+    "imageName": "gb_disable_7days_diff_soul.png",
+    "roiFront": "547,342,27,36",
+    "roiBack": "524,325,70,71",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "禁用御魂不一致提示7天"
   }
 ]

+ 26 - 32
tasks/Component/GeneralBattle/general_battle.py

@@ -48,40 +48,34 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
         else:
             return False
 
-    def battle_before(self, buff, config):
+    def battle_before(self, buff: BuffClass | list[BuffClass], config: GeneralBattleConfig, timeout: float = 5) -> bool:
+        """战斗前设置
+        :return: True:进入战斗或点击了准备按钮且识别不到准备按钮了 False:超过timeout s还没有进入战斗且没有点击过准备
         """
-        战斗前设置
-        """
-        # 用于ui加载,防止还在加载过程中导致准备界面识别失败,最多等待2秒
-        wait_in_prepare_timer = Timer(2).start()
-        while not self.is_in_prepare() and not wait_in_prepare_timer.reached():
-            logger.info('Wait to enter the preparation page')
-            time.sleep(0.5)
+        timeout_timer = Timer(timeout).start()
         confed = False
-        need_battle_timer = Timer(2)
-        # 如果不在准备界面,想设置也设置不了,只能直接开始战斗
-        while self.is_in_prepare():
-            # 配置了锁定阵容则启动超时器
-            if config.lock_team_enable and not need_battle_timer.started():
-                need_battle_timer.start()
-            # 在准备界面,且没有锁定阵容,则进行相关配置
-            if not config.lock_team_enable and not confed:
-                logger.info("Lock team is not enable")
-                # 第一次进则切换预设
-                if self.current_count == 1:
-                    self.switch_preset_team(config.preset_enable, config.preset_group, config.preset_team)
-                # 判断是否开启buff并开启
-                self.check_and_open_buff(buff)
-                # 配置过了不再配置
-                confed = True
-            # 如果锁定了阵容且超过2秒还在准备界面,则点击准备
-            if config.lock_team_enable and need_battle_timer.reached():
-                self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=1.5)
-            # 没有锁定阵容且配置完成则直接点击准备
-            if not config.lock_team_enable and confed:
-                self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=1.5)
-            # 照顾一下某些模拟器慢的
-            time.sleep(0.2)
+        while not timeout_timer.reached():
+            self.screenshot()
+            if self.is_in_real_battle(False):  # 战斗阶段
+                return True
+            if self.appear_then_click(self.I_DISABLE_7DAYS_DIFF_SOUL, interval=0.6):  # 关闭御魂不一致提示
+                continue
+            if self.appear_then_click(self.I_CONFIRM_CLOSE_DIFF_SOUL, interval=0.6):  # 确认关闭御魂不一致提示
+                continue
+            if self.is_in_prepare(False):  # 战斗准备阶段
+                if not getattr(config, 'lock_team_enable', False):  # 没有锁定阵容
+                    if self.current_count == 1 and not confed:  # 第一次战斗且是本次第一次配置
+                        self.switch_preset_team(config.preset_enable, config.preset_group, config.preset_team)
+                        self.check_and_open_buff(buff)
+                        confed = True
+                # 点击准备(锁定阵容自动点准备,不锁定阵容前面也已经配置完毕需要点准备)
+                if self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=0.8):
+                    continue
+                continue
+            # 未知界面, 既不是准备界面也不是战斗界面
+            logger.info('Wait for preparation page')
+            sleep(random.uniform(0.4, 0.8))
+        return False
 
     def run_general_battle_back(self, config: GeneralBattleConfig = None, exit_four: bool = False) -> bool:
         """

+ 1 - 1
tasks/Component/RightActivity/assets.py

@@ -16,6 +16,6 @@ class RightActivityAssets:
 	# description 
 	I_RA_CLOSE = RuleImage(roi_front=(1256,123,23,44), roi_back=(1256,123,23,44), threshold=0.8, method="Template matching", file="./tasks/Component/RightActivity/ra/ra_ra_close.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/Component/RightActivity/ra/as_toggle_button.png")
+	I_TOGGLE_BUTTON = RuleImage(roi_front=(1193,527,27,25), roi_back=(1169,146,73,453), threshold=0.8, method="Template matching", file="./tasks/Component/RightActivity/ra/as_toggle_button.png")
 
 

+ 2 - 2
tasks/Component/RightActivity/ra/image.json

@@ -20,8 +20,8 @@
   {
     "itemName": "toggle_button",
     "imageName": "as_toggle_button.png",
-    "roiFront": "1193,463,27,25",
-    "roiBack": "1169,146,73,403",
+    "roiFront": "1193,527,27,25",
+    "roiBack": "1169,146,73,453",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 12 - 46
tasks/Duel/assets.py

@@ -10,40 +10,6 @@ from module.atom.list import RuleList
 class DuelAssets: 
 
 
-	# Click Rule Assets
-	# 清明 
-	C_QM_ZHAN = RuleClick(roi_front=(263,435,60,75), roi_back=(263,435,60,75), name="qm_zhan")
-	# 神乐 
-	C_SL_ZHAN = RuleClick(roi_front=(520,434,60,75), roi_back=(520,434,60,75), name="sl_zhan")
-	# 源博雅 
-	C_YBY_ZHAN = RuleClick(roi_front=(775,435,60,75), roi_back=(775,435,60,75), name="yby_zhan")
-	# 八百比丘尼 
-	C_BBBQN_ZHAN = RuleClick(roi_front=(1030,437,60,75), roi_back=(1030,437,60,75), name="bbbqn_zhan")
-
-
-	# Image Rule Assets
-	# 进入阴阳术 
-	I_YINYANGSHU = RuleImage(roi_front=(970,633,100,49), roi_back=(970,633,100,49), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yinyangshu.png")
-	# 进入阴阳术成功 
-	I_YINYANGSHUOK = RuleImage(roi_front=(98,3,100,38), roi_back=(98,3,100,38), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yinyangshuok.png")
-	# 点击阴阳师 
-	I_YINYANGSHI = RuleImage(roi_front=(80,615,58,67), roi_back=(80,615,58,67), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yinyangshi.png")
-	# 点击英杰 
-	I_YINGJIE = RuleImage(roi_front=(80,615,58,67), roi_back=(80,615,58,67), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yingjie.png")
-	# 交替 
-	I_JIAOTI = RuleImage(roi_front=(32,380,52,42), roi_back=(32,380,52,42), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_jiaoti.png")
-	# 进入阴阳师交换页面 
-	I_YYSJIOAHUAN = RuleImage(roi_front=(89,13,176,42), roi_back=(89,13,176,42), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yysjioahuan.png")
-	# 清明(出战) 
-	I_QM_ZHAN = RuleImage(roi_front=(263,435,60,75), roi_back=(263,435,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/qm_zhan.png")
-	# 神乐(出战) 
-	I_SL_ZHAN = RuleImage(roi_front=(520,434,60,75), roi_back=(520,434,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/sl_zhan.png")
-	# 源博雅(出战) 
-	I_YBY_ZHAN = RuleImage(roi_front=(775,435,60,75), roi_back=(775,435,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/yby_zhan.png")
-	# 八百比丘尼(出战) 
-	I_BBBQN_ZHAN = RuleImage(roi_front=(1030,437,60,75), roi_back=(1030,437,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/bbbqn_zhan.png")
-
-
 	# Click Rule Assets
 	# 战斗数据 
 	C_D_BATTLE_DATA = RuleClick(roi_front=(584,279,100,100), roi_back=(584,279,100,100), name="d_battle_data")
@@ -61,25 +27,21 @@ class DuelAssets:
 	# 战斗带保护的 
 	I_D_BATTLE_PROTECT = RuleImage(roi_front=(1153,578,100,100), roi_back=(1118,553,155,149), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle_protect.png")
 	# 自动上阵 
-	I_D_AUTO_ENTRY = RuleImage(roi_front=(21,116,66,62), roi_back=(2,95,115,111), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_auto_entry.png")
+	I_D_AUTO_ENTRY = RuleImage(roi_front=(23,118,53,54), roi_back=(2,97,93,96), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_auto_entry.png")
 	# 主界面的感叹号 
-	I_D_HELP = RuleImage(roi_front=(784,502,32,30), roi_back=(774,489,49,55), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_help.png")
+	I_D_HELP = RuleImage(roi_front=(783,500,29,30), roi_back=(778,476,49,78), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_help.png")
 	# 准备 
 	I_D_PREPARE = RuleImage(roi_front=(1127,541,100,100), roi_back=(1127,541,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_prepare.png")
-	# 准备完毕  
-	I_D_PREPARE_DONE = RuleImage(roi_front=(495,82,75,55), roi_back=(495,82,75,55), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_prepare_done.png")
-	# 战斗数据 
-	I_D_BATTLE_DATA = RuleImage(roi_front=(1068,610,38,60), roi_back=(1068,610,38,60), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle_data.png")
 	# 胜利 
 	I_D_VICTORY = RuleImage(roi_front=(433,76,100,100), roi_back=(433,76,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_victory.png")
 	# 失败 
 	I_D_FAIL = RuleImage(roi_front=(422,66,100,100), roi_back=(422,66,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_fail.png")
 	# 战 
-	I_D_WORD_BATTLE = RuleImage(roi_front=(612,41,54,54), roi_back=(612,41,54,54), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_word_battle.png")
+	I_D_WORD_BATTLE = RuleImage(roi_front=(613,41,54,54), roi_back=(600,24,84,85), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_word_battle.png")
 	# 名士的星星 
-	I_D_CELEB_STAR = RuleImage(roi_front=(586,456,30,32), roi_back=(574,444,53,54), threshold=0.75, method="Template matching", file="./tasks/Duel/duel/duel_d_celeb_star.png")
+	I_D_CELEB_STAR = RuleImage(roi_front=(646,450,33,37), roi_back=(551,433,185,67), threshold=0.75, method="Template matching", file="./tasks/Duel/duel/duel_d_celeb_star.png")
 	# 名士专属 
-	I_D_CELEB_HONOR = RuleImage(roi_front=(665,531,25,30), roi_back=(652,517,52,53), threshold=0.75, method="Template matching", file="./tasks/Duel/duel/duel_d_celeb_honor.png")
+	I_D_CELEB_HONOR = RuleImage(roi_front=(338,641,25,30), roi_back=(199,606,222,76), threshold=0.75, method="Template matching", file="./tasks/Duel/duel/duel_d_celeb_honor.png")
 	# 练 
 	I_BATTLE_WITH_TRAIN = RuleImage(roi_front=(1161,588,78,81), roi_back=(1114,547,163,172), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_battle_with_train.png")
 	# 练2 
@@ -89,16 +51,20 @@ class DuelAssets:
 	# 活动的战斗按钮 
 	I_D_BATTLE2 = RuleImage(roi_front=(1171,592,69,78), roi_back=(1119,566,154,143), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle2.png")
 	# 禁用 
-	I_BAN = RuleImage(roi_front=(1112,537,100,100), roi_back=(1112,537,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_ban.png")
+	I_BAN = RuleImage(roi_front=(1139,565,77,72), roi_back=(1122,545,114,116), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_ban.png")
 	# 左上角的退出 
 	I_DUEL_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_duel_exit.png")
+	# ban选界面 
+	I_D_CHECK_BAN = RuleImage(roi_front=(611,36,56,62), roi_back=(590,14,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_check_ban.png")
+	# 斗技荣誉图标 
+	I_DUEL_HONOR = RuleImage(roi_front=(211,636,20,20), roi_back=(200,601,130,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_duel_honor.png")
 
 
 	# Ocr Rule Assets
 	# 荣誉 
-	O_D_HONOR = RuleOcr(roi=(699,562,131,31), area=(699,562,131,31), mode="DigitCounter", method="Default", keyword="", name="d_honor")
+	O_D_HONOR = RuleOcr(roi=(233,644,131,31), area=(233,643,131,31), mode="DigitCounter", method="Default", keyword="", name="d_honor")
 	# 分数 
-	O_D_SCORE = RuleOcr(roi=(701,509,61,33), area=(701,509,61,33), mode="Digit", method="Default", keyword="", name="d_score")
+	O_D_SCORE = RuleOcr(roi=(604,484,108,28), area=(604,484,108,28), mode="DigitCounter", method="Default", keyword="", name="d_score")
 	# 名士星星数 
 	O_D_CELEB_STAR = RuleOcr(roi=(625,454,77,37), area=(625,454,77,37), mode="Digit", method="Default", keyword="", name="d_celeb_star")
 	# 手动 

BIN
tasks/Duel/changeyys/Screenshots_jiaoti.png


BIN
tasks/Duel/changeyys/Screenshots_yingjie.png


BIN
tasks/Duel/changeyys/Screenshots_yinyangshi.png


BIN
tasks/Duel/changeyys/Screenshots_yinyangshu.png


BIN
tasks/Duel/changeyys/Screenshots_yinyangshuok.png


BIN
tasks/Duel/changeyys/Screenshots_yysjioahuan.png


BIN
tasks/Duel/changeyys/bbbqn_zhan.png


+ 0 - 26
tasks/Duel/changeyys/click.json

@@ -1,26 +0,0 @@
-[
-  {
-    "itemName": "qm_zhan",
-    "roiFront": "263,435,60,75",
-    "roiBack": "263,435,60,75",
-    "description": "清明"
-  },
-  {
-    "itemName": "sl_zhan",
-    "roiFront": "520,434,60,75",
-    "roiBack": "520,434,60,75",
-    "description": "神乐"
-  },
-  {
-    "itemName": "yby_zhan",
-    "roiFront": "775,435,60,75",
-    "roiBack": "775,435,60,75",
-    "description": "源博雅"
-  },
-  {
-    "itemName": "bbbqn_zhan",
-    "roiFront": "1030,437,60,75",
-    "roiBack": "1030,437,60,75",
-    "description": "八百比丘尼"
-  }
-]

+ 0 - 92
tasks/Duel/changeyys/image.json

@@ -1,92 +0,0 @@
-[
-  {
-    "itemName": "yinyangshu",
-    "imageName": "Screenshots_yinyangshu.png",
-    "roiFront": "970,633,100,49",
-    "roiBack": "970,633,100,49",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "进入阴阳术"
-  },
-  {
-    "itemName": "yinyangshuok",
-    "imageName": "Screenshots_yinyangshuok.png",
-    "roiFront": "98,3,100,38",
-    "roiBack": "98,3,100,38",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "进入阴阳术成功"
-  },
-  {
-    "itemName": "yinyangshi",
-    "imageName": "Screenshots_yinyangshi.png",
-    "roiFront": "80,615,58,67",
-    "roiBack": "80,615,58,67",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "点击阴阳师"
-  },
-  {
-    "itemName": "yingjie",
-    "imageName": "Screenshots_yingjie.png",
-    "roiFront": "80,615,58,67",
-    "roiBack": "80,615,58,67",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "点击英杰"
-  },
-  {
-    "itemName": "jiaoti",
-    "imageName": "Screenshots_jiaoti.png",
-    "roiFront": "32,380,52,42",
-    "roiBack": "32,380,52,42",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "交替"
-  },
-  {
-    "itemName": "yysjioahuan",
-    "imageName": "Screenshots_yysjioahuan.png",
-    "roiFront": "89,13,176,42",
-    "roiBack": "89,13,176,42",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "进入阴阳师交换页面"
-  },
-  {
-    "itemName": "qm_zhan",
-    "imageName": "qm_zhan.png",
-    "roiFront": "263,435,60,75",
-    "roiBack": "263,435,60,75",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "清明(出战)"
-  },
-  {
-    "itemName": "sl_zhan",
-    "imageName": "sl_zhan.png",
-    "roiFront": "520,434,60,75",
-    "roiBack": "520,434,60,75",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "神乐(出战)"
-  },
-  {
-    "itemName": "yby_zhan",
-    "imageName": "yby_zhan.png",
-    "roiFront": "775,435,60,75",
-    "roiBack": "775,435,60,75",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "源博雅(出战)"
-  },
-  {
-    "itemName": "bbbqn_zhan",
-    "imageName": "bbbqn_zhan.png",
-    "roiFront": "1030,437,60,75",
-    "roiBack": "1030,437,60,75",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "八百比丘尼(出战)"
-  }
-]

BIN
tasks/Duel/changeyys/qm_zhan.png


BIN
tasks/Duel/changeyys/sl_zhan.png


BIN
tasks/Duel/changeyys/yby_zhan.png


+ 2 - 9
tasks/Duel/config.py

@@ -3,6 +3,7 @@
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 from datetime import time
+from tasks.Component.SwitchOnmyoji.config import Onmyoji
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
@@ -11,19 +12,11 @@ from enum import Enum
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 
 
-class Onmyoji(str, Enum):
-    Ylg = '源赖光'
-    Qm = '晴明'
-    Sl = '神乐'
-    Yby = '源博雅'
-    Bbbqn = '八百比丘尼'
-
-
 class DuelConfig(ConfigBase):
     # 是否切换阴阳师
     switch_enabled: bool = Field(default=True, description='是否切换阴阳师')
     # 切换阴阳师
-    switch_onmyoji: Onmyoji = Field(default=Onmyoji.Ylg, description='切换阴阳师')
+    switch_onmyoji: Onmyoji = Field(default=Onmyoji.YORIMITSU, description='切换阴阳师')
     # 一键切换斗技御魂
     switch_all_soul: bool = Field(default=False, description='switch_all_soul_help')
     # 限制时间

BIN
tasks/Duel/duel/duel_ban.png


BIN
tasks/Duel/duel/duel_ban_flag.png


BIN
tasks/Duel/duel/duel_d_auto_entry.png


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