Bladeren bron

Merge pull request #381 from yEs1do/fix(SixRealms)

不极干脆不要打六道&任意皮肤椒图均可结算
huangrunheng 2 jaren geleden
bovenliggende
commit
9a422eb235

+ 1 - 1
tasks/SixRealms/assets.py

@@ -33,7 +33,7 @@ class SixRealmsAssets:
 	# description 
 	I_BOSS_SHARE = RuleImage(roi_front=(1090,604,70,74), roi_back=(1074,587,100,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_boss_share.png")
 	# 结算的椒图 
-	I_BOSS_SHUTU = RuleImage(roi_front=(435,46,388,46), roi_back=(338,1,573,166), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_boss_shutu.png")
+	I_BOSS_SHUTU = RuleImage(roi_front=(108,141,173,122), roi_back=(108,141,173,122), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_boss_shutu.png")
 	# description 
 	I_BOSS_BATTLE_AGAIN = RuleImage(roi_front=(435,403,173,64), roi_back=(409,390,212,100), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_boss_battle_again.png")
 	# description 

+ 2 - 2
tasks/SixRealms/gate1/boss.json

@@ -65,8 +65,8 @@
   {
     "itemName": "boss_shutu",
     "imageName": "gate1_boss_shutu.png",
-    "roiFront": "435,46,388,46",
-    "roiBack": "338,1,573,166",
+    "roiFront": "108,141,173,122",
+    "roiBack": "108,141,173,122",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "结算的椒图"

BIN
tasks/SixRealms/gate1/gate1_boss_shutu.png


+ 2 - 1
tasks/SixRealms/moon_sea/moon_sea.py

@@ -218,7 +218,8 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
                 self.device.stuck_record_add('BATTLE_STATUS_S')
                 continue
         logger.info('Boss battle end')
-        self.ui_click(self.I_BOSS_SHUTU, stop=self.I_MSTART)
+        if self.wait_until_appear(self.I_BOSS_SHUTU, wait_time=20):
+            self.ui_click(self.I_BOSS_SHUTU, stop=self.I_MSTART)
         return True