Jelajahi Sumber

Merge pull request #1646 from leovefy/codex/cobra-08-costume-main15

Add costume main 15 assets and localization
huangrunheng 4 bulan lalu
induk
melakukan
6e440b383f

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

@@ -40,6 +40,6 @@
   "close_emulator_wait_duration_help": "距离下一个任务超过此分钟数时关闭模拟器;设为0表示禁用",
   "close_emulator_wait_duration_help": "距离下一个任务超过此分钟数时关闭模拟器;设为0表示禁用",
   "emulator_startup_lead_time": "模拟器预热时间",
   "emulator_startup_lead_time": "模拟器预热时间",
   "emulator_startup_lead_time_help": "在开始运行任务之前提前启动模拟器的时间",
   "emulator_startup_lead_time_help": "在开始运行任务之前提前启动模拟器的时间",
-  "exit_four_help": "支持打九退四,保证稳定57级,要求设置好战斗主题,即 脚本->全局配置->游戏装饰自定义->战斗主题"
+  "exit_four_help": "支持打九退四,保证稳定57级,要求设置好战斗主题,即 脚本->全局配置->游戏装饰自定义->战斗主题",
+  "costume_main_15": "茨心乐园"
 }
 }
-

+ 13 - 1
tasks/Component/Costume/assets.py

@@ -88,6 +88,19 @@ class CostumeAssets:
 	I_PET_HOUSE_14 = RuleImage(roi_front=(1034,449,35,33), roi_back=(925,362,235,218), threshold=0.7, method="Template matching", file="./tasks/Component/Costume/main14/main14_pet_house_14.png")
 	I_PET_HOUSE_14 = RuleImage(roi_front=(1034,449,35,33), roi_back=(925,362,235,218), threshold=0.7, method="Template matching", file="./tasks/Component/Costume/main14/main14_pet_house_14.png")
 
 
 
 
+	# Image Rule Assets
+	# 茨心乐园庭院判定
+	I_CHECK_MAIN_15 = RuleImage(roi_front=(1017,365,71,48), roi_back=(900,270,300,220), threshold=0.75, method="Template matching", file="./tasks/Component/Costume/main15/main15_check_main_15.png")
+	# 探索
+	I_MAIN_GOTO_EXPLORATION_15 = RuleImage(roi_front=(590,190,30,50), roi_back=(520,130,190,180), threshold=0.55, method="Template matching", file="./tasks/Component/Costume/main15/main15_main_goto_exploration_15.png")
+	# 召唤屋
+	I_MAIN_GOTO_SUMMON_15 = RuleImage(roi_front=(960,204,28,45), roi_back=(890,130,200,180), threshold=0.55, method="Template matching", file="./tasks/Component/Costume/main15/main15_main_goto_summon_15.png")
+	# 町中
+	I_MAIN_GOTO_TOWN_15 = RuleImage(roi_front=(838,324,24,49), roi_back=(760,250,200,190), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main15/main15_main_goto_town_15.png")
+	# 宠物屋
+	I_PET_HOUSE_15 = RuleImage(roi_front=(951,383,31,50), roi_back=(900,330,150,150), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main15/main15_pet_house_15.png")
+
+
 	# Image Rule Assets
 	# Image Rule Assets
 	# description 
 	# description 
 	I_CHECK_MAIN_2 = RuleImage(roi_front=(1090,146,48,55), roi_back=(880,108,271,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main2/main2_check_main_2.png")
 	I_CHECK_MAIN_2 = RuleImage(roi_front=(1090,146,48,55), roi_back=(880,108,271,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main2/main2_check_main_2.png")
@@ -191,4 +204,3 @@ class CostumeAssets:
 	# description 
 	# description 
 	I_PET_HOUSE_9 = RuleImage(roi_front=(888,327,40,35), roi_back=(730,316,440,57), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main9/main9_pet_house_9.png")
 	I_PET_HOUSE_9 = RuleImage(roi_front=(888,327,40,35), roi_back=(730,316,440,57), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main9/main9_pet_house_9.png")
 
 
-

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

@@ -21,6 +21,7 @@ class MainType(str, Enum):
     COSTUME_MAIN_12 = 'costume_main_12'  # 龙吟溯玉
     COSTUME_MAIN_12 = 'costume_main_12'  # 龙吟溯玉
     COSTUME_MAIN_13 = 'costume_main_13'  # 云景阆苑
     COSTUME_MAIN_13 = 'costume_main_13'  # 云景阆苑
     COSTUME_MAIN_14 = 'costume_main_14'  # 雪月华庭
     COSTUME_MAIN_14 = 'costume_main_14'  # 雪月华庭
+    COSTUME_MAIN_15 = 'costume_main_15'  # 茨心乐园
 
 
 # 结界皮肤
 # 结界皮肤
 class RealmType(str, Enum):
 class RealmType(str, Enum):
@@ -100,4 +101,3 @@ class CostumeConfig(BaseModel):
 
 
 
 
 
 
-

+ 2 - 2
tasks/Component/Costume/costume_base.py

@@ -21,7 +21,7 @@ main_costume_model = {
         'I_MAIN_GOTO_SUMMON': f'I_MAIN_GOTO_SUMMON_{i}',
         'I_MAIN_GOTO_SUMMON': f'I_MAIN_GOTO_SUMMON_{i}',
         'I_MAIN_GOTO_TOWN': f'I_MAIN_GOTO_TOWN_{i}',
         'I_MAIN_GOTO_TOWN': f'I_MAIN_GOTO_TOWN_{i}',
         'I_PET_HOUSE': f'I_PET_HOUSE_{i}'
         'I_PET_HOUSE': f'I_PET_HOUSE_{i}'
-    } for i in range(1, 15)
+    } for i in range(1, 16)
 }
 }
 
 
 
 
@@ -151,4 +151,4 @@ class CostumeBase:
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     c = CostumeBase()
     c = CostumeBase()
-    c.check_costume_main(MainType.COSTUME_MAIN_2)
+    c.check_costume_main(MainType.COSTUME_MAIN_2)

+ 47 - 0
tasks/Component/Costume/main15/image.json

@@ -0,0 +1,47 @@
+[
+  {
+    "itemName": "check_main_15",
+    "imageName": "main15_check_main_15.png",
+    "roiFront": "1017,365,71,48",
+    "roiBack": "900,270,300,220",
+    "method": "Template matching",
+    "threshold": 0.75,
+    "description": "茨心乐园庭院判定"
+  },
+  {
+    "itemName": "main_goto_exploration_15",
+    "imageName": "main15_main_goto_exploration_15.png",
+    "roiFront": "590,190,30,50",
+    "roiBack": "520,130,190,180",
+    "method": "Template matching",
+    "threshold": 0.55,
+    "description": "探索"
+  },
+  {
+    "itemName": "main_goto_summon_15",
+    "imageName": "main15_main_goto_summon_15.png",
+    "roiFront": "960,204,28,45",
+    "roiBack": "890,130,200,180",
+    "method": "Template matching",
+    "threshold": 0.55,
+    "description": "召唤屋"
+  },
+  {
+    "itemName": "main_goto_town_15",
+    "imageName": "main15_main_goto_town_15.png",
+    "roiFront": "838,324,24,49",
+    "roiBack": "760,250,200,190",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "町中"
+  },
+  {
+    "itemName": "pet_house_15",
+    "imageName": "main15_pet_house_15.png",
+    "roiFront": "951,383,31,50",
+    "roiBack": "900,330,150,150",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "宠物屋"
+  }
+]

TEMPAT SAMPAH
tasks/Component/Costume/main15/main15_check_main_15.png


TEMPAT SAMPAH
tasks/Component/Costume/main15/main15_main_goto_exploration_15.png


TEMPAT SAMPAH
tasks/Component/Costume/main15/main15_main_goto_summon_15.png


TEMPAT SAMPAH
tasks/Component/Costume/main15/main15_main_goto_town_15.png


TEMPAT SAMPAH
tasks/Component/Costume/main15/main15_pet_house_15.png