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

feat: 吉闻OCR识别改进及多模块优化

DailyTrifles:
- 吉闻按钮识别从图片匹配改为OCR识别
- 删除 I_LUCK_MSG 图片规则,改用 O_LUCK_MSG OCR 规则
- 使用 ocr_appear_click 替代 appear_then_click
- 移除 image.json 中的 luck_msg 配置项
- 优点:无需维护图片资源,识别更稳定

FrogBoss:
- 新增 AlwaysRed/AlwaysBlue 押注策略(永远押红/蓝)
- 扩大 I_FROG_BOSS_ENTER 搜索范围 (roi_back: 78x320 -> 90x380)

MemoryScrolls:
- 碎片未达50时添加失败处理,避免任务卡住

RichMan:
- 调整 I_SIDE_CHECK_SPECIAL 搜索范围 (roi_back: 42x42 -> 100x100)
- 更新 navbar_side_check_special.png 图片
lhye 8 месяцев назад
Родитель
Сommit
9be90329ec

+ 5 - 2
tasks/DailyTrifles/assets.py

@@ -17,8 +17,6 @@ class DailyTriflesAssets:
 	I_L_LOVE = RuleImage(roi_front=(123,625,67,72), roi_back=(123,625,67,72), threshold=0.9, method="Template matching", file="./tasks/DailyTrifles/love/love_l_love.png")
 	# 一键收取 
 	I_L_COLLECT = RuleImage(roi_front=(47,537,129,56), roi_back=(47,537,129,56), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/love_l_collect.png")
-	# 吉闻 
-	I_LUCK_MSG = RuleImage(roi_front=(22,47,46,27), roi_back=(22,47,46,27), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/Screenshots_luck_msg.png")
 	# 一键祝福 
 	I_ONE_CLICK_BLESS = RuleImage(roi_front=(1115,500,93,33), roi_back=(1115,500,93,33), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/Screenshots_one_click_bless.png")
 	# 点击祝福 
@@ -29,6 +27,11 @@ class DailyTriflesAssets:
 	I_FRIENDSHIP_UP = RuleImage(roi_front=(1147,80,27,28), roi_back=(1147,80,27,28), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/friendship_up.png")
 
 
+	# Ocr Rule Assets
+	# 吉闻 
+	O_LUCK_MSG = RuleOcr(roi=(15,38,70,70), area=(15,38,70,70), mode="Single", method="Default", keyword="吉闻", name="luck_msg")
+
+
 	# Image Rule Assets
 	# 礼包屋 
 	I_ROOM_GIFT = RuleImage(roi_front=(1138,658,52,40), roi_back=(1119,621,103,94), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_room_gift.png")

+ 1 - 10
tasks/DailyTrifles/love/image.json

@@ -26,15 +26,6 @@
     "threshold": 0.8,
     "description": "一键收取"
   },
-  {
-    "itemName": "luck_msg",
-    "imageName": "Screenshots_luck_msg.png",
-    "roiFront": "22,47,46,27",
-    "roiBack": "22,47,46,27",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "吉闻"
-  },
   {
     "itemName": "one_click_bless",
     "imageName": "Screenshots_one_click_bless.png",
@@ -71,4 +62,4 @@
     "threshold": 0.8,
     "description": "好友羁绊提升弹窗"
   }
-]
+]

+ 1 - 1
tasks/DailyTrifles/script_task.py

@@ -162,7 +162,7 @@ class ScriptTask(GameUi, Summon, DailyTriflesAssets):
                 break
             if self.appear_then_click(self.I_FRIENDSHIP_UP, interval=1):
                 continue
-            if self.appear_then_click(self.I_LUCK_MSG, interval=1):
+            if self.ocr_appear_click(self.O_LUCK_MSG, interval=1):
                 continue
         logger.info('Start luck msg')
         check_timer = Timer(2)

+ 1 - 1
tasks/FrogBoss/assets.py

@@ -43,7 +43,7 @@ class FrogBossAssets:
 
 	# Image Rule Assets
 	# description 
-	I_FROG_BOSS_ENTER = RuleImage(roi_front=(1191,391,36,38), roi_back=(1174,135,78,320), threshold=0.7, method="Template matching", file="./tasks/FrogBoss/fb/fb_frog_boss_enter.png")
+	I_FROG_BOSS_ENTER = RuleImage(roi_front=(1191,391,36,38), roi_back=(1170,135,90,380), threshold=0.7, method="Template matching", file="./tasks/FrogBoss/fb/fb_frog_boss_enter.png")
 	# 休息中 
 	I_FROG_BOSS_REST = RuleImage(roi_front=(510,274,169,64), roi_back=(492,260,220,113), threshold=0.8, method="Template matching", file="./tasks/FrogBoss/fb/fb_frog_boss_rest.png")
 

+ 2 - 0
tasks/FrogBoss/config.py

@@ -14,6 +14,8 @@ class Strategy(str, Enum):
     Minority = 'frog_minority'
     Bilibili = 'frog_bilibili'
     Dashen = 'frog_dashen'
+    AlwaysRed = 'frog_always_red'
+    AlwaysBlue = 'frog_always_blue'
 
 class FrogBossConfig(ConfigBase):
     before_end_frog: Time = Field(default=Time(0, 15, 0), description='before_end_frog_help')

+ 4 - 0
tasks/FrogBoss/script_task.py

@@ -105,6 +105,10 @@ class ScriptTask(RightActivity, FrogBossAssets, GeneralBattleAssets):
                 click_image = self.I_BET_LEFT if count_left > count_right else self.I_BET_RIGHT
             case Strategy.Dashen:
                 click_image = self.get_dashen(count_left, count_right)
+            case Strategy.AlwaysRed:
+                click_image = self.I_BET_LEFT
+            case Strategy.AlwaysBlue:
+                click_image = self.I_BET_RIGHT
             case _:
                 raise ValueError(f'Unknown bet mode: {self.config.model.frog_boss.frog_boss_config.strategy_frog}')
         logger.info(f'You strategy is {self.config.model.frog_boss.frog_boss_config.strategy_frog} and bet on {click_image}')

+ 4 - 0
tasks/MemoryScrolls/script_task.py

@@ -61,6 +61,10 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
                 logger.info('Small Memory Scrolls fragments reached 50, planning tomorrow exploration')
                 # 安排下次探索
                 self.custom_next_run(task='Exploration', custom_time=self.config.memory_scrolls.memory_scrolls_finish.next_exploration_time, time_delta=1)
+            else:
+                logger.warning('Small Memory Scrolls fragments not reached 50, task failed')
+                self.set_next_run(task='MemoryScrolls', success=False)
+                raise TaskEnd
             self.ui_click_until_smt_disappear(self.I_MS_FRAGMENT_S, stop=self.I_MS_FRAGMENT_S_VERIFICATION, interval=1.5)
         # 进入指定分卷
         self.goto_scroll(con)

+ 1 - 1
tasks/RichMan/assets.py

@@ -190,7 +190,7 @@ class RichManAssets:
 	# 特殊 
 	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
 	# 特殊 
-	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(155,8,42,42), roi_back=(155,8,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
+	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(0,0,26,34), roi_back=(1075,0,100,100), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
 	# 荣誉 
 	I_SIDE_SUER_HONOR = RuleImage(roi_front=(1180,191,59,60), roi_back=(1150,159,103,132), threshold=0.6, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.png")
 	# 荣誉 

+ 2 - 2
tasks/RichMan/mall/navbar/image_side.json

@@ -11,8 +11,8 @@
   {
     "itemName": "side_check_special",
     "imageName": "navbar_side_check_special.png",
-    "roiFront": "155,8,42,42",
-    "roiBack": "155,8,42,42",
+    "roiFront": "0,0,26,34",
+    "roiBack": "1075,0,100,100",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "特殊"

BIN
tasks/RichMan/mall/navbar/navbar_side_check_special.png