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

fix(ActivityShikigami): Add new cases for "pass mode"

ryland 11 месяцев назад
Родитель
Сommit
465ce13a98

+ 4 - 2
tasks/ActivityShikigami/assets.py

@@ -145,8 +145,10 @@ class ActivityShikigamiAssets:
 	I_PASS_10 = RuleImage(roi_front=(279,309,100,100), roi_back=(291,305,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_10.png")
 	# 印记选右边的 
 	I_PASS_11 = RuleImage(roi_front=(918,304,100,100), roi_back=(914,308,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_11.png")
-	# none 
-	I_PASS12 = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass12.png")
+	# 击败魇兽将直接前往下一层 
+	I_PASS12 = RuleImage(roi_front=(870,356,100,50), roi_back=(104,169,1109,425), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass12.png")
+	# 魇兽将的战斗图片 
+	I_PASS_13 = RuleImage(roi_front=(1018,570,100,100), roi_back=(984,538,169,152), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_13.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/ActivityShikigami/fire/fire_pass12.png


BIN
tasks/ActivityShikigami/fire/fire_pass_13.png


+ 12 - 3
tasks/ActivityShikigami/fire/image.json

@@ -110,10 +110,19 @@
   {
     "itemName": "pass12",
     "imageName": "fire_pass12.png",
-    "roiFront": "0,0,100,100",
-    "roiBack": "0,0,100,100",
+    "roiFront": "870,356,100,50",
+    "roiBack": "104,169,1109,425",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "none"
+    "description": "击败魇兽将直接前往下一层"
+  },
+  {
+    "itemName": "pass_13",
+    "imageName": "fire_pass_13.png",
+    "roiFront": "1018,570,100,100",
+    "roiBack": "984,538,169,152",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "魇兽将的战斗图片"
   }
 ]

+ 20 - 3
tasks/ActivityShikigami/script_task.py

@@ -19,6 +19,7 @@ from module.exception import TaskEnd
 from module.logger import logger
 
 from tasks.base_task import BaseTask
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from tasks.ActivityShikigami.config import SwitchSoulConfig, GeneralBattleConfig, ActivityShikigami
 from tasks.Component.BaseActivity.base_activity import BaseActivity
@@ -186,6 +187,16 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
                 continue
             if self.ui_reward_appear_click():
                 continue
+            # 击败魇兽将直接前往下一层
+            if self.appear(self.I_PASS12):
+                logger.info('Found魇兽将')
+                from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig as GBC1
+                _battle_config = GBC1(lock_team_enable=True)
+                _battle_config.lock_team_enable = True
+                self.ui_click(self.I_PASS12, stop=self.I_PASS_13)
+                self.ui_click_until_disappear(self.I_PASS_13, interval=1)
+                self.run_general_battle(config=_battle_config)
+                continue
             # 领箱子
             if self.appear_then_click(self.I_PASS_5):
                 logger.info('Found箱子')
@@ -195,18 +206,24 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
                 logger.info('Found印记')
                 click_index = 0
                 clicks = [self.I_PASS_8, self.I_PASS_10, self.I_PASS_11]
+                self.ui_click(self.I_PASS_6, stop=self.I_UI_BACK_RED, interval=1)
+                self.screenshot()
+                if not self.appear(self.I_UI_BACK_RED):
+                    continue
                 while 1:
                     self.screenshot()
                     if self.ui_reward_appear_click():
                         break
-                    if self.appear_then_click(self.I_PASS_9):
-                        logger.info('Select one done')
+                    if not self.appear(self.I_UI_BACK_RED):
                         break
                     # 按照顺序 间隔点击
                     if self.click(clicks[click_index], interval=1):
-                        sleep(1)
+                        sleep(1.6)
                         click_index += 1
                         click_index = click_index % len(clicks)
+                    if self.appear_then_click(self.I_PASS_9, interval=1.1):
+                        logger.info('Select one done')
+                        continue
             # 下一层
             if self.appear_then_click(self.I_PASS_7, interval=1):
                 logger.info('Next layer')