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

Merge branch 'pr1619' into dev

# Conflicts:
#	assets/i18n/zh-CN.json
#	tasks/Component/Costume/config.py
#	tasks/Component/Costume/costume_base.py
#	tasks/Component/CostumeBattle/battle13/battle13_de_win_13.png
#	tasks/Component/CostumeBattle/battle13/battle13_exit_13.png
#	tasks/Component/CostumeBattle/battle13/battle13_false_13.png
#	tasks/Component/CostumeBattle/battle13/battle13_friends_13.png
#	tasks/Component/CostumeBattle/battle13/battle13_local_13.png
#	tasks/Component/CostumeBattle/battle13/battle13_win_13.png
#	tasks/Component/CostumeBattle/battle13/image.json
Neptine 5 месяцев назад
Родитель
Сommit
db3d414d90
44 измененных файлов с 275 добавлено и 41 удалено
  1. 6 2
      assets/i18n/zh-CN.json
  2. 2 1
      tasks/Component/Costume/config.py
  3. 14 25
      tasks/Component/Costume/costume_base.py
  4. 58 0
      tasks/Component/CostumeBattle/assets.py
  5. BIN
      tasks/Component/CostumeBattle/battle1/battle1_battle_info_1.png
  6. 9 0
      tasks/Component/CostumeBattle/battle1/image.json
  7. BIN
      tasks/Component/CostumeBattle/battle10/battle10_battle_info_10.png
  8. 9 0
      tasks/Component/CostumeBattle/battle10/image.json
  9. BIN
      tasks/Component/CostumeBattle/battle11/battle11_battle_info_11.png
  10. 9 0
      tasks/Component/CostumeBattle/battle11/image.json
  11. BIN
      tasks/Component/CostumeBattle/battle12/battle12_battle_info_12.png
  12. 10 1
      tasks/Component/CostumeBattle/battle12/image.json
  13. BIN
      tasks/Component/CostumeBattle/battle13/battle13_battle_info_13.png
  14. BIN
      tasks/Component/CostumeBattle/battle13/battle13_de_win_13.png
  15. BIN
      tasks/Component/CostumeBattle/battle13/battle13_exit_13.png
  16. BIN
      tasks/Component/CostumeBattle/battle13/battle13_false_13.png
  17. BIN
      tasks/Component/CostumeBattle/battle13/battle13_friends_13.png
  18. BIN
      tasks/Component/CostumeBattle/battle13/battle13_local_13.png
  19. BIN
      tasks/Component/CostumeBattle/battle13/battle13_win_13.png
  20. 21 12
      tasks/Component/CostumeBattle/battle13/image.json
  21. BIN
      tasks/Component/CostumeBattle/battle14/battle14_battle_info_14.png
  22. BIN
      tasks/Component/CostumeBattle/battle14/battle14_de_win_14.png
  23. BIN
      tasks/Component/CostumeBattle/battle14/battle14_exit_14.png
  24. BIN
      tasks/Component/CostumeBattle/battle14/battle14_false_14.png
  25. BIN
      tasks/Component/CostumeBattle/battle14/battle14_friends_14.png
  26. BIN
      tasks/Component/CostumeBattle/battle14/battle14_local_14.png
  27. BIN
      tasks/Component/CostumeBattle/battle14/battle14_win_14.png
  28. 65 0
      tasks/Component/CostumeBattle/battle14/image.json
  29. BIN
      tasks/Component/CostumeBattle/battle2/battle2_battle_info_2.png
  30. 9 0
      tasks/Component/CostumeBattle/battle2/image.json
  31. BIN
      tasks/Component/CostumeBattle/battle3/battle3_battle_info_3.png
  32. 9 0
      tasks/Component/CostumeBattle/battle3/image.json
  33. BIN
      tasks/Component/CostumeBattle/battle4/battle4_battle_info_4.png
  34. 9 0
      tasks/Component/CostumeBattle/battle4/image.json
  35. BIN
      tasks/Component/CostumeBattle/battle5/battle5_battle_info_5.png
  36. 9 0
      tasks/Component/CostumeBattle/battle5/image.json
  37. BIN
      tasks/Component/CostumeBattle/battle6/battle6_battle_info_6.png
  38. 9 0
      tasks/Component/CostumeBattle/battle6/image.json
  39. BIN
      tasks/Component/CostumeBattle/battle7/battle7_battle_info_7.png
  40. 9 0
      tasks/Component/CostumeBattle/battle7/image.json
  41. BIN
      tasks/Component/CostumeBattle/battle8/battle8_battle_info_8.png
  42. 9 0
      tasks/Component/CostumeBattle/battle8/image.json
  43. BIN
      tasks/Component/CostumeBattle/battle9/battle9_battle_info_9.png
  44. 9 0
      tasks/Component/CostumeBattle/battle9/image.json

+ 6 - 2
assets/i18n/zh-CN.json

@@ -18,7 +18,11 @@
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_battle_10": "流焰蝶舞",
   "costume_battle_11": "辰烁奇夜",
-  "costume_battle_13": "茸茨跃动",
+  "costume_battle_12": "招财纳福",
+  "costume_battle_13": "登云问翠",
+  "costume_battle_14": "茸茨跃动",
+  "costume_main_13": "云景阆苑",
+  "costume_main_14": "雪月华庭",
   "enable_courtyard_affairs": "庭院事务",
   "GuildActivityMonitor": "寮活动监控",
   "guild_activity_monitor_combat_time": "监控时间设置",
@@ -28,7 +32,6 @@
   "checkin_config": "签到配置",
   "Usage": "使用说明",
   "checkin_big_god_usage_help": "自动领取网易大神APP的阴阳师福利礼包。\n\n使用前准备:\n1. 开启模拟器的Root模式\n2. 模拟器中安装并登录「网易大神」APP\n3. 在大神APP中绑定阴阳师角色\n\nFrida Server 会自动推送到模拟器并启动,无需手动操作。",
-  "costume_main_14": "雪月华庭",
   "goto_main": "前往庭院",
   "close_game": "关闭游戏",
   "close_game_wait_duration": "关闭游戏的等待时长",
@@ -39,3 +42,4 @@
   "emulator_startup_lead_time_help": "在开始运行任务之前提前启动模拟器的时间",
   "exit_four_help": "支持打九退四,保证稳定57级,要求设置好战斗主题,即 脚本->全局配置->游戏装饰自定义->战斗主题"
 }
+

+ 2 - 1
tasks/Component/Costume/config.py

@@ -70,7 +70,8 @@ class BattleType(str, Enum):
     COSTUME_BATTLE_10 = 'costume_battle_10'  # 流焰蝶舞
     COSTUME_BATTLE_11 = 'costume_battle_11'  # 辰烁奇夜
     COSTUME_BATTLE_12 = 'costume_battle_12'  # 招财纳福
-    COSTUME_BATTLE_13 = 'costume_battle_13'  # 茸茨跃动
+    COSTUME_BATTLE_13 = 'costume_battle_13'  # 登云问翠
+    COSTUME_BATTLE_14 = 'costume_battle_14'  # 茸茨跃动
 
 
 

+ 14 - 25
tasks/Component/Costume/costume_base.py

@@ -35,33 +35,19 @@ carpbanner_costume_model = {
 }
 
 
-# 战斗主题(使用循环处理常规情况 + 特例处理)
-battle_theme_model = {}
-for i in range(1, 14):
-    entry = {
+# 战斗主题
+battle_theme_model = {
+    getattr(BattleType, f"COSTUME_BATTLE_{i}"): {
         'I_LOCAL': f'I_LOCAL_{i}',
         'I_EXIT': f'I_EXIT_{i}',
         'I_FRIENDS': f'I_FRIENDS_{i}',
-    }
-    if i == 8:  # 特殊处理第8项
-        entry.update({
-            'I_WIN': 'I_WIN_8',
-            'I_DE_WIN': 'I_DE_WIN_8',
-            'I_FALSE': 'I_FALSE_8'
-        })
-    if i == 12:  # 特殊处理第12项
-        entry.update({
-            'I_WIN': 'I_WIN_12',
-            'I_DE_WIN': 'I_DE_WIN_12',
-            'I_FALSE': 'I_FALSE_12'
-        })
-    if i == 13:  # 13项特殊处理
-        entry.update({
-            'I_WIN': 'I_WIN_13',
-            'I_DE_WIN': 'I_DE_WIN_13',
-            'I_FALSE': 'I_FALSE_13'
-        })
-    battle_theme_model[getattr(BattleType, f"COSTUME_BATTLE_{i}")] = entry
+        'I_BATTLE_INFO': f'I_BATTLE_INFO_{i}',
+        # 以下资源并非所有主题都需要修改,未采集的资源将被跳过
+        'I_WIN': f'I_WIN_{i}', # 已知:8,12,13,14
+        'I_DE_WIN': f'I_DE_WIN_{i}', # 已知:8,12,13,14
+        'I_FALSE': f'I_FALSE_{i}' # 已知:8,12,13,14
+    } for i in range(1, 15)
+}
 
 # 幕间主题
 shikigami_costume_model = {
@@ -138,6 +124,9 @@ class CostumeBase:
         logger.info(f'Switch battle theme {battle_type}')
         costume_battle_assets = CostumeBattleAssets()
         for key, value in battle_theme_model[battle_type].items():
+            if not hasattr(costume_battle_assets, value):
+                # 尚未采集完成的资产,跳过
+                continue
             assert_value: RuleImage = getattr(costume_battle_assets, value)
             # 绿标的坐标点范围不变
             if key == 'I_LOCAL':
@@ -162,4 +151,4 @@ class CostumeBase:
 
 if __name__ == '__main__':
     c = CostumeBase()
-    c.check_costume_main(MainType.COSTUME_MAIN_2)
+    c.check_costume_main(MainType.COSTUME_MAIN_2)

+ 58 - 0
tasks/Component/CostumeBattle/assets.py

@@ -17,6 +17,8 @@ class CostumeBattleAssets:
 	I_EXIT_1 = RuleImage(roi_front=(21,20,27,31), roi_back=(21,20,27,31), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle1/battle1_exit_1.png")
 	# 左上角好友 
 	I_FRIENDS_1 = RuleImage(roi_front=(88,18,35,34), roi_back=(88,18,35,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle1/battle1_friends_1.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_1 = RuleImage(roi_front=(231,14,37,39), roi_back=(210,1,147,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle1/battle1_battle_info_1.png")
 
 
 	# Image Rule Assets
@@ -26,6 +28,8 @@ class CostumeBattleAssets:
 	I_FRIENDS_10 = RuleImage(roi_front=(90,14,35,37), roi_back=(90,14,35,37), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle10/battle10_friends_10.png")
 	# 指针 
 	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")
+	# 战斗信息标识 
+	I_BATTLE_INFO_10 = RuleImage(roi_front=(232,17,33,34), roi_back=(208,0,147,58), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle10/battle10_battle_info_10.png")
 
 
 	# Image Rule Assets
@@ -35,6 +39,8 @@ class CostumeBattleAssets:
 	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")
+	# 战斗信息标识 
+	I_BATTLE_INFO_11 = RuleImage(roi_front=(235,21,29,28), roi_back=(142,0,169,71), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle11/battle11_battle_info_11.png")
 
 
 	# Image Rule Assets
@@ -50,6 +56,42 @@ class CostumeBattleAssets:
 	I_DE_WIN_12 = RuleImage(roi_front=(390,30,46,88), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle12/battle12_de_win_12.png")
 	# 失败 
 	I_FALSE_12 = RuleImage(roi_front=(390,30,58,86), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle12/battle12_false_12.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_12 = RuleImage(roi_front=(234,17,32,32), roi_back=(215,0,142,58), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle12/battle12_battle_info_12.png")
+
+
+	# Image Rule Assets
+	# 左上角退出 
+	I_EXIT_13 = RuleImage(roi_front=(25,20,22,25), roi_back=(10,10,69,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_exit_13.png")
+	# 左上角好友 
+	I_FRIENDS_13 = RuleImage(roi_front=(98,15,22,30), roi_back=(74,10,71,47), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_friends_13.png")
+	# 指针 
+	I_LOCAL_13 = RuleImage(roi_front=(29,566,28,28), roi_back=(29,566,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_local_13.png")
+	# 战斗胜利 
+	I_WIN_13 = RuleImage(roi_front=(631,142,68,67), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_win_13.png")
+	# 针对封魔的特殊 
+	I_DE_WIN_13 = RuleImage(roi_front=(577,59,73,49), roi_back=(386,0,480,231), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_de_win_13.png")
+	# 失败 
+	I_FALSE_13 = RuleImage(roi_front=(550,152,58,77), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_false_13.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_13 = RuleImage(roi_front=(234,17,32,32), roi_back=(215,0,142,58), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_battle_info_13.png")
+
+
+	# Image Rule Assets
+	# 左上角退出 
+	I_EXIT_14 = RuleImage(roi_front=(25,20,22,25), roi_back=(10,10,69,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle14/battle14_exit_14.png")
+	# 左上角好友 
+	I_FRIENDS_14 = RuleImage(roi_front=(98,15,22,30), roi_back=(74,10,71,47), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle14/battle14_friends_14.png")
+	# 指针 
+	I_LOCAL_14 = RuleImage(roi_front=(117,493,28,28), roi_back=(66,456,110,121), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle14/battle14_local_14.png")
+	# 战斗胜利 
+	I_WIN_14 = RuleImage(roi_front=(544,190,68,67), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle14/battle14_win_14.png")
+	# 针对封魔的特殊 
+	I_DE_WIN_14 = RuleImage(roi_front=(590,152,87,129), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle14/battle14_de_win_14.png")
+	# 失败 
+	I_FALSE_14 = RuleImage(roi_front=(597,190,57,66), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle14/battle14_false_14.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_14 = RuleImage(roi_front=(234,17,32,32), roi_back=(215,0,142,58), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle14/battle14_battle_info_14.png")
 
 
 	# Image Rule Assets
@@ -74,6 +116,8 @@ class CostumeBattleAssets:
 	I_EXIT_2 = RuleImage(roi_front=(17,16,35,34), roi_back=(17,16,35,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle2/battle2_exit_2.png")
 	# description 
 	I_FRIENDS_2 = RuleImage(roi_front=(88,15,34,39), roi_back=(88,15,34,39), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle2/battle2_friends_2.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_2 = RuleImage(roi_front=(232,17,34,36), roi_back=(211,0,145,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle2/battle2_battle_info_2.png")
 
 
 	# Image Rule Assets
@@ -83,6 +127,8 @@ class CostumeBattleAssets:
 	I_EXIT_3 = RuleImage(roi_front=(23,18,27,31), roi_back=(23,18,27,31), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle3/battle3_exit_3.png")
 	# 左上角好友 
 	I_FRIENDS_3 = RuleImage(roi_front=(89,17,35,34), roi_back=(89,17,35,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle3/battle3_friends_3.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_3 = RuleImage(roi_front=(233,17,35,35), roi_back=(211,0,145,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle3/battle3_battle_info_3.png")
 
 
 	# Image Rule Assets
@@ -92,6 +138,8 @@ class CostumeBattleAssets:
 	I_EXIT_4 = RuleImage(roi_front=(22,17,27,31), roi_back=(22,17,27,31), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle4/battle4_exit_4.png")
 	# 左上角好友 
 	I_FRIENDS_4 = RuleImage(roi_front=(88,16,35,34), roi_back=(88,16,35,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle4/battle4_friends_4.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_4 = RuleImage(roi_front=(234,18,33,33), roi_back=(212,0,139,59), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle4/battle4_battle_info_4.png")
 
 
 	# Image Rule Assets
@@ -101,6 +149,8 @@ class CostumeBattleAssets:
 	I_EXIT_5 = RuleImage(roi_front=(22,17,27,31), roi_back=(22,17,27,31), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle5/battle5_exit_5.png")
 	# 左上角好友 
 	I_FRIENDS_5 = RuleImage(roi_front=(90,17,35,34), roi_back=(90,17,35,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle5/battle5_friends_5.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_5 = RuleImage(roi_front=(233,18,31,31), roi_back=(212,0,147,57), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle5/battle5_battle_info_5.png")
 
 
 	# Image Rule Assets
@@ -110,6 +160,8 @@ class CostumeBattleAssets:
 	I_EXIT_6 = RuleImage(roi_front=(22,17,27,31), roi_back=(22,17,27,31), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle6/battle6_exit_6.png")
 	# 左上角好友 
 	I_FRIENDS_6 = RuleImage(roi_front=(89,18,35,34), roi_back=(89,18,35,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle6/battle6_friends_6.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_6 = RuleImage(roi_front=(233,18,32,31), roi_back=(213,0,144,57), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle6/battle6_battle_info_6.png")
 
 
 	# Image Rule Assets
@@ -119,6 +171,8 @@ class CostumeBattleAssets:
 	I_EXIT_7 = RuleImage(roi_front=(22,17,27,31), roi_back=(22,17,27,31), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle7/battle7_exit_7.png")
 	# 左上角好友 
 	I_FRIENDS_7 = RuleImage(roi_front=(89,18,35,34), roi_back=(89,18,35,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle7/battle7_friends_7.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_7 = RuleImage(roi_front=(232,16,33,33), roi_back=(214,0,141,57), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle7/battle7_battle_info_7.png")
 
 
 	# Image Rule Assets
@@ -134,6 +188,8 @@ class CostumeBattleAssets:
 	I_DE_WIN_8 = RuleImage(roi_front=(392,99,100,100), roi_back=(239,36,399,198), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle8/battle8_de_win_8.png")
 	# 失败 
 	I_FALSE_8 = RuleImage(roi_front=(384,106,100,100), roi_back=(346,96,184,120), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle8/battle8_false_8.png")
+	# 战斗信息标识 
+	I_BATTLE_INFO_8 = RuleImage(roi_front=(232,17,32,33), roi_back=(212,0,143,57), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle8/battle8_battle_info_8.png")
 
 
 	# Image Rule Assets
@@ -143,5 +199,7 @@ class CostumeBattleAssets:
 	I_FRIENDS_9 = RuleImage(roi_front=(93,15,31,36), roi_back=(93,15,31,36), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle9/battle9_friends_9.png")
 	# 指针 
 	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")
+	# 战斗信息标识 
+	I_BATTLE_INFO_9 = RuleImage(roi_front=(232,15,36,34), roi_back=(212,1,145,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle9/battle9_battle_info_9.png")
 
 

BIN
tasks/Component/CostumeBattle/battle1/battle1_battle_info_1.png


+ 9 - 0
tasks/Component/CostumeBattle/battle1/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角好友"
+  },
+  {
+    "itemName": "battle_info_1",
+    "imageName": "battle1_battle_info_1.png",
+    "roiFront": "231,14,37,39",
+    "roiBack": "210,1,147,72",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle10/battle10_battle_info_10.png


+ 9 - 0
tasks/Component/CostumeBattle/battle10/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "指针"
+  },
+  {
+    "itemName": "battle_info_10",
+    "imageName": "battle10_battle_info_10.png",
+    "roiFront": "232,17,33,34",
+    "roiBack": "208,0,147,58",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle11/battle11_battle_info_11.png


+ 9 - 0
tasks/Component/CostumeBattle/battle11/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "指针"
+  },
+  {
+    "itemName": "battle_info_11",
+    "imageName": "battle11_battle_info_11.png",
+    "roiFront": "235,21,29,28",
+    "roiBack": "142,0,169,71",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle12/battle12_battle_info_12.png


+ 10 - 1
tasks/Component/CostumeBattle/battle12/image.json

@@ -52,5 +52,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "失败"
+  },
+  {
+    "itemName": "battle_info_12",
+    "imageName": "battle12_battle_info_12.png",
+    "roiFront": "234,17,32,32",
+    "roiBack": "215,0,142,58",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
-]
+]

BIN
tasks/Component/CostumeBattle/battle13/battle13_battle_info_13.png


BIN
tasks/Component/CostumeBattle/battle13/battle13_de_win_13.png


BIN
tasks/Component/CostumeBattle/battle13/battle13_exit_13.png


BIN
tasks/Component/CostumeBattle/battle13/battle13_false_13.png


BIN
tasks/Component/CostumeBattle/battle13/battle13_friends_13.png


BIN
tasks/Component/CostumeBattle/battle13/battle13_local_13.png


BIN
tasks/Component/CostumeBattle/battle13/battle13_win_13.png


+ 21 - 12
tasks/Component/CostumeBattle/battle13/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "exit_13",
     "imageName": "battle13_exit_13.png",
-    "roiFront": "25,21,24,24",
-    "roiBack": "16,10,40,44",
+    "roiFront": "25,20,22,25",
+    "roiBack": "10,10,69,48",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角退出"
@@ -11,8 +11,8 @@
   {
     "itemName": "friends_13",
     "imageName": "battle13_friends_13.png",
-    "roiFront": "95,17,28,27",
-    "roiBack": "88,12,40,40",
+    "roiFront": "98,15,22,30",
+    "roiBack": "74,10,71,47",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角好友"
@@ -20,8 +20,8 @@
   {
     "itemName": "local_13",
     "imageName": "battle13_local_13.png",
-    "roiFront": "115,491,30,32",
-    "roiBack": "107,479,48,50",
+    "roiFront": "29,566,28,28",
+    "roiBack": "29,566,40,40",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "指针"
@@ -29,7 +29,7 @@
   {
     "itemName": "win_13",
     "imageName": "battle13_win_13.png",
-    "roiFront": "590,152,87,129",
+    "roiFront": "631,142,68,67",
     "roiBack": "390,30,510,290",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,8 +38,8 @@
   {
     "itemName": "de_win_13",
     "imageName": "battle13_de_win_13.png",
-    "roiFront": "590,152,87,129",
-    "roiBack": "390,30,510,290",
+    "roiFront": "577,59,73,49",
+    "roiBack": "386,0,480,231",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "针对封魔的特殊"
@@ -47,10 +47,19 @@
   {
     "itemName": "false_13",
     "imageName": "battle13_false_13.png",
-    "roiFront": "586,178,76,110",
-    "roiBack": "380,55,510,290",
+    "roiFront": "550,152,58,77",
+    "roiBack": "390,30,510,290",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "失败"
+  },
+  {
+    "itemName": "battle_info_13",
+    "imageName": "battle13_battle_info_13.png",
+    "roiFront": "234,17,32,32",
+    "roiBack": "215,0,142,58",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
-]
+]

BIN
tasks/Component/CostumeBattle/battle14/battle14_battle_info_14.png


BIN
tasks/Component/CostumeBattle/battle14/battle14_de_win_14.png


BIN
tasks/Component/CostumeBattle/battle14/battle14_exit_14.png


BIN
tasks/Component/CostumeBattle/battle14/battle14_false_14.png


BIN
tasks/Component/CostumeBattle/battle14/battle14_friends_14.png


BIN
tasks/Component/CostumeBattle/battle14/battle14_local_14.png


BIN
tasks/Component/CostumeBattle/battle14/battle14_win_14.png


+ 65 - 0
tasks/Component/CostumeBattle/battle14/image.json

@@ -0,0 +1,65 @@
+[
+  {
+    "itemName": "exit_14",
+    "imageName": "battle14_exit_14.png",
+    "roiFront": "25,20,22,25",
+    "roiBack": "10,10,69,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "左上角退出"
+  },
+  {
+    "itemName": "friends_14",
+    "imageName": "battle14_friends_14.png",
+    "roiFront": "98,15,22,30",
+    "roiBack": "74,10,71,47",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "左上角好友"
+  },
+  {
+    "itemName": "local_14",
+    "imageName": "battle14_local_14.png",
+    "roiFront": "117,493,28,28",
+    "roiBack": "66,456,110,121",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "指针"
+  },
+  {
+    "itemName": "win_14",
+    "imageName": "battle14_win_14.png",
+    "roiFront": "544,190,68,67",
+    "roiBack": "390,30,510,290",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗胜利"
+  },
+  {
+    "itemName": "de_win_14",
+    "imageName": "battle14_de_win_14.png",
+    "roiFront": "590,152,87,129",
+    "roiBack": "390,30,510,290",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "针对封魔的特殊"
+  },
+  {
+    "itemName": "false_14",
+    "imageName": "battle14_false_14.png",
+    "roiFront": "597,190,57,66",
+    "roiBack": "390,30,510,290",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "失败"
+  },
+  {
+    "itemName": "battle_info_14",
+    "imageName": "battle14_battle_info_14.png",
+    "roiFront": "234,17,32,32",
+    "roiBack": "215,0,142,58",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
+  }
+]

BIN
tasks/Component/CostumeBattle/battle2/battle2_battle_info_2.png


+ 9 - 0
tasks/Component/CostumeBattle/battle2/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "battle_info_2",
+    "imageName": "battle2_battle_info_2.png",
+    "roiFront": "232,17,34,36",
+    "roiBack": "211,0,145,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle3/battle3_battle_info_3.png


+ 9 - 0
tasks/Component/CostumeBattle/battle3/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角好友"
+  },
+  {
+    "itemName": "battle_info_3",
+    "imageName": "battle3_battle_info_3.png",
+    "roiFront": "233,17,35,35",
+    "roiBack": "211,0,145,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle4/battle4_battle_info_4.png


+ 9 - 0
tasks/Component/CostumeBattle/battle4/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角好友"
+  },
+  {
+    "itemName": "battle_info_4",
+    "imageName": "battle4_battle_info_4.png",
+    "roiFront": "234,18,33,33",
+    "roiBack": "212,0,139,59",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle5/battle5_battle_info_5.png


+ 9 - 0
tasks/Component/CostumeBattle/battle5/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角好友"
+  },
+  {
+    "itemName": "battle_info_5",
+    "imageName": "battle5_battle_info_5.png",
+    "roiFront": "233,18,31,31",
+    "roiBack": "212,0,147,57",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle6/battle6_battle_info_6.png


+ 9 - 0
tasks/Component/CostumeBattle/battle6/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角好友"
+  },
+  {
+    "itemName": "battle_info_6",
+    "imageName": "battle6_battle_info_6.png",
+    "roiFront": "233,18,32,31",
+    "roiBack": "213,0,144,57",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle7/battle7_battle_info_7.png


+ 9 - 0
tasks/Component/CostumeBattle/battle7/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角好友"
+  },
+  {
+    "itemName": "battle_info_7",
+    "imageName": "battle7_battle_info_7.png",
+    "roiFront": "232,16,33,33",
+    "roiBack": "214,0,141,57",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle8/battle8_battle_info_8.png


+ 9 - 0
tasks/Component/CostumeBattle/battle8/image.json

@@ -52,5 +52,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "失败"
+  },
+  {
+    "itemName": "battle_info_8",
+    "imageName": "battle8_battle_info_8.png",
+    "roiFront": "232,17,32,33",
+    "roiBack": "212,0,143,57",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]

BIN
tasks/Component/CostumeBattle/battle9/battle9_battle_info_9.png


+ 9 - 0
tasks/Component/CostumeBattle/battle9/image.json

@@ -25,5 +25,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "指针"
+  },
+  {
+    "itemName": "battle_info_9",
+    "imageName": "battle9_battle_info_9.png",
+    "roiFront": "232,15,36,34",
+    "roiBack": "212,1,145,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗信息标识"
   }
 ]