Procházet zdrojové kódy

feat(SixRealms): A little problem

huangrunheng před 2 roky
rodič
revize
d29c660cbe

+ 1 - 1
tasks/SixRealms/assets.py

@@ -26,7 +26,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=(535,241,240,330), roi_back=(500,216,292,377), threshold=0.8, method="Template matching", file="./tasks/SixRealms/gate1/gate1_boss_shutu.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")
 
 
 	# Click Rule Assets

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

@@ -65,8 +65,8 @@
   {
     "itemName": "boss_shutu",
     "imageName": "gate1_boss_shutu.png",
-    "roiFront": "535,241,240,330",
-    "roiBack": "500,216,292,377",
+    "roiFront": "435,46,388,46",
+    "roiBack": "338,1,573,166",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "结算的椒图"

binární
tasks/SixRealms/gate1/gate1_boss_shutu.png


+ 4 - 0
tasks/SixRealms/moon_sea/l101.py

@@ -1,4 +1,5 @@
 import re
+import time
 from module.logger import logger
 from tasks.SixRealms.moon_sea.skills import MoonSeaSkills
 
@@ -24,6 +25,7 @@ class MoonSeaL101(MoonSeaSkills):
                 buy_try += 1
         self.ui_click_until_disappear(self.I_UI_CONFIRM)
         self.wait_until_appear(self.I_STORE_EXIT)
+        self.cnt_skill101 += 1
         logger.info('Buy skill 101 done')
         return True
 
@@ -52,6 +54,8 @@ class MoonSeaL101(MoonSeaSkills):
     def run_l101(self):
         logger.hr('Start l101')
         logger.info('Keep buying skills until you run out of money')
+        # 进商店动画 TODO
+        time.sleep(1)
         while 1:
             self.screenshot()
             coin = self.O_COIN_NUM.ocr(self.device.image)

+ 14 - 2
tasks/SixRealms/moon_sea/l102.py

@@ -38,18 +38,30 @@ class MoonSeaL102(MoonSeaSkills):
     def imitate(self):
         # 仿造
         logger.info('Imitate')
+        cnt_imitate = 0
         while 1:
             self.screenshot()
             if self.in_main():
                 break
-            if self.appear_then_click(self.I_IMITATE_1, interval=0.5):
+            if self.appear_then_click(self.I_IMITATE_1, interval=2.5):
                 continue
             if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
                 continue
             if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
-            if self.appear_then_click(self.I_IMITATE, interval=2.5):
+            if cnt_imitate >= 6:
+                logger.info('Finish Imitate Fail')
+                logger.info('The most possible reason is that the skill is max level')
+                while 1:
+                    self.screenshot()
+                    if self.in_main():
+                        break
+                    if self.appear_then_click(self.I_BACK_EXIT, interval=2):
+                        continue
+                break
+            if self.appear_then_click(self.I_IMITATE, interval=1):
                 continue
+        self.cnt_skill101 += 1
         logger.info('Finish Imitate')
 
 

+ 6 - 1
tasks/SixRealms/moon_sea/map.py

@@ -118,12 +118,17 @@ class MoonSeaMap(MoonSeaSkills):
             logger.warning('Now you have not money to buy items')
             logger.warning('Store is not active')
             return False
+        cnt_act = 0
         while 1:
             self.screenshot()
             if self.appear(self.I_UI_CONFIRM):
                 self.ui_click_until_disappear(self.I_UI_CONFIRM, interval=2)
                 break
-            if self.appear_then_click(self.I_M_STORE_ACTIVITY, interval=1):
+            if cnt_act >= 3:
+                logger.warning('Store is not active')
+                return False
+            if self.appear_then_click(self.I_M_STORE_ACTIVITY, interval=1.5):
+                cnt_act += 1
                 continue
 
 

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

@@ -79,7 +79,7 @@ class MoonSea(MoonSeaMap, MoonSeaL101, MoonSeaL102, MoonSeaL103, MoonSeaL104, Mo
                 case MoonSeaType.island105: self.run_l105()
             # 不知道怎么处理过场动画
             # TODO
-            time.sleep(1)
+            time.sleep(2)
             continue
 
     def _continue(self):

+ 6 - 2
tasks/SixRealms/moon_sea/skills.py

@@ -9,6 +9,8 @@ from tasks.SixRealms.assets import SixRealmsAssets
 
 class MoonSeaSkills(BaseTask, SixRealmsAssets):
 
+    cnt_skill101 = 0
+
 
     def in_main(self, screenshot: bool = False):
         if screenshot:
@@ -53,10 +55,12 @@ class MoonSeaSkills(BaseTask, SixRealmsAssets):
         self.screenshot()
         select = 3  # 从0开始计数
         button = None
+        # 只选柔风
         if button is None and self.appear(self.I_SKILL101):
+            self.cnt_skill101 += 1
             button = self.I_SKILL101
-        elif button is None and self.appear(self.I_SKILL102):
-            button = self.I_SKILL102
+        # elif button is None and self.appear(self.I_SKILL102):
+        #     button = self.I_SKILL102
         # elif button is None and self.appear(self.I_SKILL103):
         #     button = self.I_SKILL103
         # elif button is None and self.appear(self.I_SKILL104):

+ 8 - 0
tasks/SixRealms/script_task.py

@@ -47,6 +47,14 @@ class ScriptTask(GameUi, SwitchSoul, MoonSea):
 
         self.run_moon_sea()
 
+        # 退出六道
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_CHECK_EXPLORATION) or self.appear(self.I_CHECK_MAIN):
+                break
+            if self.appear_then_click(self.I_BACK_EXIT, interval=2):
+                continue
+
         self.set_next_run('SixRealms', success=True, finish=True)
         raise TaskEnd