Pārlūkot izejas kodu

feat(Orochi): 改用 page_orochi 进行御魂页导航

注册 page_orochi(CHECK_10..13 层标志判定到达,soul_zones 经 I_OROCHI 进入),
补充对应资产并重新生成 assets.py。删除 Orochi 手写 orochi_enter 循环,调用点改为
goto_page(page_orochi)。一并修复 TrueOrochi 因删除 orochi_enter 导致的
AttributeError。
User 1 mēnesi atpakaļ
vecāks
revīzija
af5fcf0567

+ 8 - 0
tasks/Orochi/assets.py

@@ -25,6 +25,14 @@ class OrochiAssets:
 	I_SHI_RECORDS = RuleImage(roi_front=(842,569,48,45), roi_back=(842,569,48,45), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_shi_records.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_pet_present.png")
+	# 八岐大蛇标志 
+	I_OROCHI_CHECK_10 = RuleImage(roi_front=(929,123,203,39), roi_back=(896,100,269,84), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_check_10.png")
+	# 巫女大蛇标志 
+	I_OROCHI_CHECK_11 = RuleImage(roi_front=(929,123,203,39), roi_back=(896,100,269,84), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_check_11.png")
+	# 神罚标志 
+	I_OROCHI_CHECK_12 = RuleImage(roi_front=(929,116,100,46), roi_back=(896,100,269,84), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_check_12.png")
+	# 虚无大蛇标志 
+	I_OROCHI_CHECK_13 = RuleImage(roi_front=(929,121,211,41), roi_back=(896,100,269,84), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_check_13.png")
 
 
 	# List Rule Assets

+ 36 - 0
tasks/Orochi/o/image.json

@@ -61,5 +61,41 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "小小宠物,发现宝藏"
+  },
+  {
+    "itemName": "orochi_check_10",
+    "imageName": "o_orochi_check_10.png",
+    "roiFront": "929,123,203,39",
+    "roiBack": "896,100,269,84",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "八岐大蛇标志"
+  },
+  {
+    "itemName": "orochi_check_11",
+    "imageName": "o_orochi_check_11.png",
+    "roiFront": "929,123,203,39",
+    "roiBack": "896,100,269,84",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "巫女大蛇标志"
+  },
+  {
+    "itemName": "orochi_check_12",
+    "imageName": "o_orochi_check_12.png",
+    "roiFront": "929,116,100,46",
+    "roiBack": "896,100,269,84",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神罚标志"
+  },
+  {
+    "itemName": "orochi_check_13",
+    "imageName": "o_orochi_check_13.png",
+    "roiFront": "929,121,211,41",
+    "roiBack": "896,100,269,84",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "虚无大蛇标志"
   }
 ]

BIN
tasks/Orochi/o/o_orochi_check_10.png


BIN
tasks/Orochi/o/o_orochi_check_11.png


BIN
tasks/Orochi/o/o_orochi_check_12.png


BIN
tasks/Orochi/o/o_orochi_check_13.png


+ 16 - 0
tasks/Orochi/page.py

@@ -0,0 +1,16 @@
+from tasks.GameUi.default_pages import page_exploration, page_soul_zones, page_shikigami_records
+from tasks.GameUi.matcher import any_of
+from tasks.GameUi.page_definition import Page
+from tasks.GlobalGame.assets import GlobalGameAssets
+from tasks.Orochi.assets import OrochiAssets
+
+# 御魂页面(魂1-魂10,魂11,12,13检查标志...)
+page_orochi = Page(any_of(OrochiAssets.I_OROCHI_CHECK_10, OrochiAssets.I_OROCHI_CHECK_11,
+                          OrochiAssets.I_OROCHI_CHECK_12, OrochiAssets.I_OROCHI_CHECK_13))
+page_orochi.connect(page_exploration, GlobalGameAssets.I_UI_BACK_YELLOW, key="page_orochi->page_exploration")
+page_soul_zones.connect(page_orochi, OrochiAssets.I_OROCHI, key="page_soul_zones->page_orochi")
+
+page_orochi.connect(page_shikigami_records, OrochiAssets.I_SHI_RECORDS,
+                    key="page_orochi->page_shikigami_records", cost=2)
+page_shikigami_records.connect(page_orochi, GlobalGameAssets.I_UI_BACK_YELLOW,
+                               key="page_shikigami_records->page_orochi", cost=2)

+ 7 - 19
tasks/Orochi/script_task.py

@@ -13,6 +13,7 @@ from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_soul_zones, page_shikigami_records
 from tasks.Orochi.assets import OrochiAssets
+from tasks.Orochi.page import page_orochi
 from tasks.Orochi.config import Orochi, UserStatus, Layer
 from tasks.TrueOrochi.assets import TrueOrochiAssets
 from module.logger import logger
@@ -43,8 +44,8 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
         config: Orochi = self.config.orochi
         if not self.is_in_battle(True):
-            self.goto_page(page_main)
             if config.orochi_config.soul_buff_enable:
+                self.goto_page(page_main)
                 self.open_buff()
                 self.soul(is_open=True)
                 self.close_buff()
@@ -59,15 +60,14 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
         # 御魂结束后检测是否出现真蛇
         if config.orochi_config.check_true_orochi_enable:
-            self.goto_page(page_soul_zones)
-            self.orochi_enter()
+            self.goto_page(page_orochi)
             self.screenshot()
             if self.appear(self.I_FIND_TS):
                 logger.info('Find true orochi after orochi battle, set TrueOrochi task to run now')
                 self.set_next_run(task='TrueOrochi', success=False, finish=False, server=False, target=datetime.now())
-        self.goto_page(page_main)
         # 记得关掉
         if config.orochi_config.soul_buff_enable:
+            self.goto_page(page_main)
             self.open_buff()
             self.soul(is_open=False)
             self.close_buff()
@@ -79,14 +79,6 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
         raise TaskEnd
 
-    def orochi_enter(self) -> bool:
-        logger.info('Enter orochi')
-        while True:
-            self.screenshot()
-            if self.appear(self.I_FORM_TEAM):
-                return True
-            if self.appear_then_click(self.I_OROCHI, interval=1):
-                continue
 
     def check_layer(self, layer: str) -> bool:
         """
@@ -132,8 +124,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
     def run_leader(self):
         logger.info('Start run leader')
-        self.goto_page(page_soul_zones)
-        self.orochi_enter()
+        self.goto_page(page_orochi)
         layer = self.config.orochi.orochi_config.layer
         self.check_layer(layer)
         # https://github.com/runhey/OnmyojiAutoScript/issues/592
@@ -224,7 +215,6 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
     def run_member(self):
         logger.info('Start run member')
         # self.ui_goto(page_soul_zones)
-        # self.orochi_enter()
         # self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
 
         # 进入战斗流程
@@ -273,8 +263,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
     def run_alone(self):
         logger.info('Start run alone')
-        self.goto_page(page_soul_zones)
-        self.orochi_enter()
+        self.goto_page(page_orochi)
         layer = self.config.orochi.orochi_config.layer
         self.check_layer(layer)
         self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
@@ -326,8 +315,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
         # 已经在战斗中不必初始化,保证已经组队开始战斗的情况下可以自动执行后续任务
         if not self.is_in_battle(True):
-            self.goto_page(page_soul_zones)
-            self.orochi_enter()
+            self.goto_page(page_orochi)
             layer = self.config.orochi.orochi_config.layer
             self.check_layer(layer)
             self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)

+ 4 - 5
tasks/TrueOrochi/script_task.py

@@ -14,7 +14,8 @@ from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.GeneralRoom.general_room import GeneralRoom
 from tasks.Orochi.script_task import ScriptTask as OrochiScriptTask
 from tasks.Orochi.config import Layer
-from tasks.GameUi.page import page_main, page_soul_zones, page_shikigami_records
+from tasks.Orochi.page import page_orochi
+from tasks.GameUi.page import page_main, page_shikigami_records
 from tasks.TrueOrochi.assets import TrueOrochiAssets
 
 
@@ -40,8 +41,7 @@ class ScriptTask(OrochiScriptTask, TrueOrochiAssets):
             self.run_switch_soul_by_name(self.config.true_orochi.switch_soul.group_name,
                                          self.config.true_orochi.switch_soul.team_name)
 
-        self.goto_page(page_soul_zones)
-        self.orochi_enter()
+        self.goto_page(page_orochi)
         sleep(0.5)
         battle = self.check_true_orochi(True)
         if not battle:
@@ -89,8 +89,7 @@ class ScriptTask(OrochiScriptTask, TrueOrochiAssets):
         self.check_times(True)
 
         # 检查是否还有真蛇入口,支持存储两次
-        self.goto_page(page_soul_zones)
-        self.orochi_enter()
+        self.goto_page(page_orochi)
         sleep(0.5)
         if conf.current_success < 2 and self.check_true_orochi(True):
             battle = True