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

fix(Secret): Exit tack once completed all layers

ryland 2 лет назад
Родитель
Сommit
955f734883

+ 4 - 0
tasks/Secret/script_task.py

@@ -17,6 +17,7 @@ from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.GeneralBuff.config_buff import BuffClass
+from tasks.WeeklyTrifles.assets import WeeklyTriflesAssets
 
 class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
     lay_list = ['壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖', '拾']
@@ -74,6 +75,9 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
             layer = self.find_battle()
             logger.info(f'Current layer: {layer}')
             if not layer:
+                if self.appear(WeeklyTriflesAssets.I_WT_SE_SHARE):
+                    logger.warning('You have completed the weekly trifles, skip')
+                    break
                 continue
             if layer >= 6:
                 first_battle = False

+ 1 - 1
tasks/WeeklyTrifles/assets.py

@@ -70,7 +70,7 @@ class WeeklyTriflesAssets:
 	# 秘闻进入 
 	I_WT_ENTER_SE = RuleImage(roi_front=(1145,598,100,100), roi_back=(1145,598,100,100), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_enter_se.png")
 	# 秘闻分享 
-	I_WT_SE_SHARE = RuleImage(roi_front=(913,570,46,43), roi_back=(913,570,46,43), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_share.png")
+	I_WT_SE_SHARE = RuleImage(roi_front=(911,570,46,43), roi_back=(897,559,85,64), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_share.png")
 	# 微信 
 	I_WT_SE_WECHAT = RuleImage(roi_front=(1023,630,56,57), roi_back=(1023,630,56,57), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/secret/secret_wt_se_wechat.png")
 	# 勾玉 

+ 2 - 2
tasks/WeeklyTrifles/secret/image.json

@@ -11,8 +11,8 @@
   {
     "itemName": "wt_se_share",
     "imageName": "secret_wt_se_share.png",
-    "roiFront": "913,570,46,43",
-    "roiBack": "913,570,46,43",
+    "roiFront": "911,570,46,43",
+    "roiBack": "897,559,85,64",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "秘闻分享"