Przeglądaj źródła

Merge pull request #1288 from shenliuming/dev

fix[(SixRealms)]: unkown Select shikigami and confirm to start battle…
huangrunheng 11 miesięcy temu
rodzic
commit
bb54c63aac

+ 0 - 2
tasks/Duel/assets.py

@@ -66,8 +66,6 @@ class DuelAssets:
 	I_D_HELP = RuleImage(roi_front=(784,502,32,30), roi_back=(774,489,49,55), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_help.png")
 	# 准备 
 	I_D_PREPARE = RuleImage(roi_front=(1127,541,100,100), roi_back=(1127,541,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_prepare.png")
-	# 准备完毕 
-	I_D_PREPARE_DONE = RuleImage(roi_front=(495,82,75,55), roi_back=(495,82,75,55), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_prepare_done.png")
 	# 战斗数据 
 	I_D_BATTLE_DATA = RuleImage(roi_front=(1068,610,38,60), roi_back=(1068,610,38,60), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle_data.png")
 	# 胜利 

+ 7 - 0
tasks/SixRealms/assets.py

@@ -100,6 +100,8 @@ class SixRealmsAssets:
 	I_ISLAND_TAG_FLAG = RuleImage(roi_front=(543,601,100,100), roi_back=(543,601,100,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_island_tag_flag.png")
 	# 暂时离开六道之门 
 	I_EXIT_SIXREALMS = RuleImage(roi_front=(507.5,308,100,100), roi_back=(507.5,308,100,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_exit_sixrealms.png")
+	# 选择一个式神加入征伐队伍 
+	I_SELECT_SHIKIGAMI_AND_CONFIRM = RuleImage(roi_front=(499,238,151,57), roi_back=(479,213,199,113), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_select_shikigami_and_confirm.png")
 
 
 	# Ocr Rule Assets
@@ -140,6 +142,11 @@ class SixRealmsAssets:
 	I_SKILL105 = RuleImage(roi_front=(178,187,80,69), roi_back=(112,149,779,151), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_skill105.png")
 
 
+	# Swipe Rule Assets
+	# 征伐队伍选择界面底部阵容上拉 
+	S_TEAM_SWIPE_UP = RuleSwipe(roi_front=(520,571,93,98), roi_back=(589,180,100,100), mode="default", name="team_swipe_up")
+
+
 	# Image Rule Assets
 	# 宁息刷新 
 	I_STORE_REFRESH = RuleImage(roi_front=(545,596,46,47), roi_back=(519,568,100,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/l101/l101_store_refresh.png")

BIN
tasks/SixRealms/gate1/gate1_select_shikigami_and_confirm.png


+ 9 - 0
tasks/SixRealms/gate1/image.json

@@ -160,5 +160,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "暂时离开六道之门"
+  },
+  {
+    "itemName": "select_shikigami_and_confirm",
+    "imageName": "gate1_select_shikigami_and_confirm.png",
+    "roiFront": "499,238,151,57",
+    "roiBack": "479,213,199,113",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选择一个式神加入征伐队伍"
   }
 ]

+ 9 - 0
tasks/SixRealms/gate1/swipe.json

@@ -0,0 +1,9 @@
+[
+  {
+    "itemName": "team_swipe_up",
+    "roiFront": "520,571,93,98",
+    "roiBack": "589,180,100,100",
+    "mode": "default",
+    "description": "征伐队伍选择界面底部阵容上拉"
+  }
+]

+ 17 - 0
tasks/SixRealms/moon_sea/moon_sea.py

@@ -104,6 +104,9 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
             self.screenshot()
             if self.in_main():
                 break
+            if self.appear(self.I_SELECT_SHIKIGAMI_AND_CONFIRM):
+                self.select_shikigami_and_confirm()
+                continue
             if self.appear_then_click(self.I_MCONINUE, interval=1):
                 continue
 
@@ -149,6 +152,10 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
                 continue
             if self.appear_then_click(self.I_MCONINUE, interval=3):
                 continue
+        # Hook: select one shikigami and confirm before starting
+        if self.appear(self.I_SELECT_SHIKIGAMI_AND_CONFIRM):
+            self.select_shikigami_and_confirm()
+
         logger.info("Start Roguelike")
         while 1:
             self.screenshot()
@@ -222,6 +229,16 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
             self.ui_click(self.I_BOSS_SHUTU, stop=self.I_MSTART)
         return True
 
+    def select_shikigami_and_confirm(self):
+        """Select shikigami and confirm to start battle."""
+        while True:
+            self.screenshot()
+            if not self.appear(self.I_SELECT_SHIKIGAMI_AND_CONFIRM):
+                break
+            self.swipe(self.S_TEAM_SWIPE_UP)
+            self.appear_then_click(self.I_MSTART_CONFIRM, interval=2)
+            self.appear_then_click(self.I_COIN2, interval=2)
+
 
 if __name__ == '__main__':
     from module.config.config import Config

+ 3 - 0
tasks/SixRealms/moon_sea/skills.py

@@ -37,6 +37,9 @@ class MoonSeaSkills(BaseTask, SixRealmsAssets):
                 break
             if self.appear(self.I_COIN):
                 break
+            if self.appear(self.I_SELECT_SHIKIGAMI_AND_CONFIRM):
+                self.select_shikigami_and_confirm()
+                continue
             if self.appear_then_click(self.I_NPC_FIRE, interval=1):
                 self.device.stuck_record_clear()
                 self.device.stuck_record_add('BATTLE_STATUS_S')