فهرست منبع

fix(CostumeBattle): Remove duplicate battle13 assets with incorrect ROI values

neptine 3 ماه پیش
والد
کامیت
a11b3761f8

+ 1 - 0
tasks/AbyssShadows/assets.py

@@ -102,3 +102,4 @@ class AbyssShadowsAssets:
 	# 滑到狭间 
 	S_TO_ABBSY_SHADOWS = RuleSwipe(roi_front=(752,395,62,66), roi_back=(758,193,62,48), mode="default", name="to_abbsy_shadows")
 
+

+ 3 - 6
tasks/ActivityShikigami/assets.py

@@ -93,13 +93,10 @@ class ActivityShikigamiAssets:
 	# Ocr Rule Assets
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1124,599,96,50), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
-	# 20260725 缩小体力和活动体力的检测范围,范围太大,有可能把0识别为10的情况。
-	# 潜在风险1,超过1000的数字可能会只识别到最后的000,还有识别0的时候,score比较低,只有0.3,不知道怎么优化。
-	# 潜在风险2,部分数字,遇到过300等,会识别为0,之前没截上图,待后面遇到再处理这种情况。
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(793, 18, 44, 25), area=(793, 18, 44, 25), mode="DigitCounter", method="Default",           keyword="", name="remain_ap")
-	# 活动体力的剩余检测
-	O_REMAIN_PASS = RuleOcr(roi=(600, 18, 44, 25), area=(600, 18, 44, 25), mode="DigitCounter", method="Default",         keyword="", name="remain_pass")
+	O_REMAIN_AP = RuleOcr(roi=(777,17,63,30), area=(776,16,63,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	# 活动体力的剩余检测 
+	O_REMAIN_PASS = RuleOcr(roi=(599,15,50,29), area=(600,16,49,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")
 	# 活动票数(没有百分比) 

+ 6 - 5
tasks/Component/Costume/assets.py

@@ -89,15 +89,15 @@ class CostumeAssets:
 
 
 	# 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")
 
 
@@ -204,3 +204,4 @@ class CostumeAssets:
 	# 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")
 
+

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

@@ -94,21 +94,6 @@ class CostumeBattleAssets:
 	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
-	# 左上角退出 
-	I_EXIT_13 = RuleImage(roi_front=(25,21,24,24), roi_back=(16,10,40,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_exit_13.png")
-	# 左上角好友 
-	I_FRIENDS_13 = RuleImage(roi_front=(95,17,28,27), roi_back=(88,12,40,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_friends_13.png")
-	# 指针 
-	I_LOCAL_13 = RuleImage(roi_front=(115,491,30,32), roi_back=(107,479,48,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_local_13.png")
-	# 战斗胜利 
-	I_WIN_13 = RuleImage(roi_front=(590,152,87,129), 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=(590,152,87,129), roi_back=(390,30,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_de_win_13.png")
-	# 失败 
-	I_FALSE_13 = RuleImage(roi_front=(586,178,76,110), roi_back=(380,55,510,290), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeBattle/battle13/battle13_false_13.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")

+ 1 - 0
tasks/Component/GeneralInvite/assets.py

@@ -128,3 +128,4 @@ class GeneralInviteAssets:
 	# Ocr-description 
 	O_ONLINE = RuleOcr(roi=(790,102,124,42), area=(0,0,100,100), mode="Single", method="Default", keyword="", name="online")
 
+

+ 1 - 0
tasks/HeroTest/assets.py

@@ -111,3 +111,4 @@ class HeroTestAssets:
 	# 挑战按钮 
 	O_FIRE = RuleOcr(roi=(1130,585,92,55), area=(1126,576,100,99), mode="Single", method="Default", keyword="挑战", name="fire")
 
+