Преглед изворни кода

Merge upstream dev through 4e3528a6 with Dokan leader recognition fixes

Integrate 6e425254..4e3528a6 (3 commits including one merge).
Adopt the corrected 48x36 leader-name template from 4354df46 and the 0.7
matching threshold from 8bbf87b8 in both assets.py and image.json.

The prior template included the rank suffix; the new template recognizes
the leader label. Preserve the existing full-screen search and runtime
template-size/position update used by this rule. PNG reference, method,
threshold and declared ROIs agree between runtime and JSON metadata.
No duplicate local implementation or missing companion change was found.
Only the three upstream Dokan asset files change, exactly as upstream;
all existing local mail, raid, exploration, UI, battle-context, activity
and desktop fixes are retained unchanged. Merge completed without conflicts.

Validation: 392 tests passed (tests/ and both FrogBoss test modules), with
two pre-existing Pydantic deprecation warnings. Python syntax and both
Dokan module imports passed; PNG decoding and metadata checks passed.
Eight synthetic matching checks covered center, screen corners and blank
screens with ROI padding 0/2. git diff --check passed.
No live emulator or desktop game test was performed.

Both target dev branches were independently rechecked before commit/push
and remained at 4c0fe0ec; upstream remained at 4e3528a6.
unknown пре 3 недеља
родитељ
комит
d07027ac79

+ 1 - 1
tasks/Dokan/assets.py

@@ -139,7 +139,7 @@ class DokanAssets:
 	# 今日可挑战次数:2次 
 	# 今日可挑战次数:2次 
 	I_RYOU_DOKAN_REMAIN_ATTACK_COUNT_TWO = RuleImage(roi_front=(650,610,110,80), roi_back=(650,610,110,80), threshold=0.9, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_remain_attack_count_two.png")
 	I_RYOU_DOKAN_REMAIN_ATTACK_COUNT_TWO = RuleImage(roi_front=(650,610,110,80), roi_back=(650,610,110,80), threshold=0.9, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_remain_attack_count_two.png")
 	# 查找道馆时,中间信息卡片 馆主等级-修习 
 	# 查找道馆时,中间信息卡片 馆主等级-修习 
-	I_CENTER_GUANZHU_XIUXI = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_guanzhu_xiuxi.png")
+	I_CENTER_GUANZHU_XIUXI = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.7, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_guanzhu_xiuxi.png")
 	# 查找道馆时,中间防守人数字样,为了定位该图下方的 防守人数数字 
 	# 查找道馆时,中间防守人数字样,为了定位该图下方的 防守人数数字 
 	I_CENTER_POINT_PEOPLE_NUMBER = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_point_people_number.png")
 	I_CENTER_POINT_PEOPLE_NUMBER = RuleImage(roi_front=(0,0,1280,720), roi_back=(0,0,1280,720), threshold=0.8, method="Template matching", file="./tasks/Dokan/res/res_ryou_dokan_center_point_people_number.png")
 	# 查找道馆时,挑战按钮 
 	# 查找道馆时,挑战按钮 

+ 1 - 1
tasks/Dokan/res/image.json

@@ -446,7 +446,7 @@
     "roiFront": "0,0,1280,720",
     "roiFront": "0,0,1280,720",
     "roiBack": "0,0,1280,720",
     "roiBack": "0,0,1280,720",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "查找道馆时,中间信息卡片 馆主等级-修习"
     "description": "查找道馆时,中间信息卡片 馆主等级-修习"
   },
   },
   {
   {

BIN
tasks/Dokan/res/res_ryou_dokan_center_guanzhu_xiuxi.png