yEs1do 2 лет назад
Родитель
Сommit
513712faae

+ 1 - 3
tasks/AreaBoss/assets.py

@@ -52,8 +52,6 @@ class AreaBossAssets:
 	S_AB_FILTER_DOWN = RuleSwipe(roi_front=(1130,230,10,10), roi_back=(920,680,10,10), mode="default", name="ab_filter_down")
 	# 极地鬼 层数列表 手指向下滑动  
 	S_AB_FLOOR_DOWN = RuleSwipe(roi_front=(390,260,10,10), roi_back=(450,500,10,10), mode="default", name="ab_floor_down")
-	# 极地鬼 层数列表 手指向上滑动  
-	S_AB_FLOOR_UP = RuleSwipe(roi_front=(450,500,10,10), roi_back=(390,260,10,10), mode="default", name="ab_floor_up")
 	# 普通地鬼 等级滑轨 手指向右滑动  
 	S_AB_LEVEL_RIGHT = RuleSwipe(roi_front=(0,0,10,10), roi_back=(570,270,10,10), mode="default", name="ab_level_right")
 
@@ -100,7 +98,7 @@ class AreaBossAssets:
 	# 极地鬼 一层 
 	I_AB_JI_FLOOR_ONE = RuleImage(roi_front=(390,150,60,290), roi_back=(390,150,60,290), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_one.png")
 	# 极地鬼 十层 
-	I_AB_JI_FLOOR_TEN = RuleImage(roi_front=(390,150,60,290), roi_back=(390,150,60,290), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_ten.png")
+	I_AB_JI_FLOOR_TEN = RuleImage(roi_front=(390,370,60,40), roi_back=(390,370,60,40), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_ten.png")
 	# 小组内未取得名次 
 	I_AB_GROUP_RANK_NONE = RuleImage(roi_front=(890,415,95,85), roi_back=(890,415,95,85), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_rank_none.png")
 

+ 2 - 2
tasks/AreaBoss/res/image.json

@@ -182,8 +182,8 @@
   {
     "itemName": "ab_ji_floor_ten",
     "imageName": "ab_ji_floor_ten.png",
-    "roiFront": "390,150,60,290",
-    "roiBack": "390,150,60,290",
+    "roiFront": "390,370,60,40",
+    "roiBack": "390,370,60,40",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "极地鬼 十层"

+ 3 - 5
tasks/AreaBoss/script_task.py

@@ -234,7 +234,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.screenshot()
             if self.appear(self.I_AB_JI_FLOOR_ONE):
                 self.click(self.I_AB_JI_FLOOR_ONE)
-                logger.info("switch to floor 1")
+                logger.info("Switch to floor 1")
                 break
             self.swipe(self.S_AB_FLOOR_DOWN, interval=1)
             # 等待滑动动画
@@ -250,10 +250,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.screenshot()
             if self.appear(self.I_AB_JI_FLOOR_TEN):
                 self.click(self.I_AB_JI_FLOOR_TEN)
-                logger.info("switch to floor 10")
+                logger.info("Switch to floor 10")
                 break
-            self.swipe(self.S_AB_FLOOR_UP, interval=1)
-            # 等待滑动动画
             self.wait_until_appear(self.I_AB_JI_FLOOR_TEN, False, 1)
 
     def fight_reward_boss(self):
@@ -261,7 +259,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.open_filter()
         # 滑动到最顶层
         if index < 3:
-            logger.info("swipe to top")
+            logger.info("Swipe to top")
             for i in range(random.randint(1, 3)):
                 self.swipe(self.S_AB_FILTER_DOWN)
         #

+ 0 - 7
tasks/AreaBoss/swipe.json

@@ -20,13 +20,6 @@
     "mode": "default",
     "description": "极地鬼 层数列表 手指向下滑动 "
   },
-  {
-    "itemName": "ab_floor_up",
-    "roiFront": "450,500,10,10",
-    "roiBack": "390,260,10,10",
-    "mode": "default",
-    "description": "极地鬼 层数列表 手指向上滑动 "
-  },
   {
     "itemName": "ab_level_right",
     "roiFront": "0,0,10,10",