Browse Source

Merge branch 'runhey:dev' into dev

Jacky Wei 2 years ago
parent
commit
5cbed197c5

+ 61 - 4
tasks/AreaBoss/assets.py

@@ -11,10 +11,49 @@ class AreaBossAssets:
 
 
 	# Click Rule Assets
+	# 悬赏按钮 
+	C_AB_REWARD_BTN = RuleClick(roi_front=(1190,100,50,120), roi_back=(1190,100,50,120), name="ab_reward_btn")
 	# 热门按钮 
 	C_AB_FAMOUS_BTN = RuleClick(roi_front=(1190,220,50,120), roi_back=(1190,220,50,120), name="ab_famous_btn")
 	# 收藏按钮 
 	C_AB_COLLECTION_BTN = RuleClick(roi_front=(1190,580,50,120), roi_back=(1190,580,50,120), name="ab_collection_btn")
+	# 筛选中 除悬赏外 第一个boss的头像位置 
+	C_AB_BOSS_PHOTO_1 = RuleClick(roi_front=(940,210,95,70), roi_back=(940,210,95,70), name="ab_boss_photo_1")
+	# 筛选中 除悬赏外 第二个boss的头像位置 
+	C_AB_BOSS_PHOTO_2 = RuleClick(roi_front=(940,365,95,70), roi_back=(940,365,95,70), name="ab_boss_photo_2")
+	# 筛选中 除悬赏外 第三个boss的头像位置 
+	C_AB_BOSS_PHOTO_3 = RuleClick(roi_front=(940,520,95,70), roi_back=(940,520,95,70), name="ab_boss_photo_3")
+	# 筛选中 除悬赏外 滑动到最底部时 第一个boss的头像位置 即倒数第三个 
+	C_AB_BOSS_PHOTO_MINUS_3 = RuleClick(roi_front=(940,255,95,70), roi_back=(940,255,95,70), name="ab_boss_photo_minus_3")
+	# 筛选中 除悬赏外 滑动到最底部时 第二个boss的头像位置 即倒数第二个 
+	C_AB_BOSS_PHOTO_MINUS_2 = RuleClick(roi_front=(940,410,95,70), roi_back=(940,410,95,70), name="ab_boss_photo_minus_2")
+	# 筛选中 除悬赏外 滑动到最底部时 第三个boss的头像位置 即倒数第一个 
+	C_AB_BOSS_PHOTO_MINUS_1 = RuleClick(roi_front=(940,560,95,70), roi_back=(940,560,95,70), name="ab_boss_photo_minus_1")
+	# 筛选中 悬赏中 第一个boss的头像位置 
+	C_AB_BOSS_REWARD_PHOTO_1 = RuleClick(roi_front=(940,250,95,70), roi_back=(940,250,95,70), name="ab_boss_reward_photo_1")
+	# 筛选中 悬赏中 第二个boss的头像位置 
+	C_AB_BOSS_REWARD_PHOTO_2 = RuleClick(roi_front=(940,375,95,70), roi_back=(940,375,95,70), name="ab_boss_reward_photo_2")
+	# 筛选中 悬赏中 第三个boss的头像位置 
+	C_AB_BOSS_REWARD_PHOTO_3 = RuleClick(roi_front=(940,500,95,70), roi_back=(940,500,95,70), name="ab_boss_reward_photo_3")
+	# 筛选中 悬赏中 滑动到最底部时 第一个boss的头像位置 即倒数第三个 
+	C_AB_BOSS_REWARD_PHOTO_MINUS_3 = RuleClick(roi_front=(940,335,95,70), roi_back=(940,335,95,70), name="ab_boss_reward_photo_minus_3")
+	# 筛选中 悬赏中 滑动到最底部时 第二个boss的头像位置 即倒数第二个 
+	C_AB_BOSS_REWARD_PHOTO_MINUS_2 = RuleClick(roi_front=(940,460,95,70), roi_back=(940,460,95,70), name="ab_boss_reward_photo_minus_2")
+	# 筛选中 悬赏中 滑动到最底部时 第三个boss的头像位置 即倒数第一个 
+	C_AB_BOSS_REWARD_PHOTO_MINUS_1 = RuleClick(roi_front=(940,585,95,70), roi_back=(940,585,95,70), name="ab_boss_reward_photo_minus_1")
+	# 当前选择 的极地鬼层数 
+	C_AB_JI_FLOOR_SELECTED = RuleClick(roi_front=(380,120,70,30), roi_back=(380,120,70,30), name="ab_ji_floor_selected")
+
+
+	# Swipe Rule Assets
+	# 筛选列表 手指向上滑动 
+	S_AB_FILTER_UP = RuleSwipe(roi_front=(920,680,10,10), roi_back=(1130,230,10,10), mode="default", name="ab_filter_up")
+	# 筛选列表 手指向下滑动 
+	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_LEVEL_RIGHT = RuleSwipe(roi_front=(0,0,10,10), roi_back=(570,270,10,10), mode="default", name="ab_level_right")
 
 
 	# Image Rule Assets
@@ -26,11 +65,11 @@ class AreaBossAssets:
 	I_BACK_BLUE = RuleImage(roi_front=(51,30,51,52), roi_back=(4,1,128,110), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_back_blue.png")
 	# 右上边选中鬼王的 
 	I_FILTER = RuleImage(roi_front=(1116,33,35,31), roi_back=(1076,19,98,78), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_filter.png")
-	# 选中第一个鬼王的 
+	# 除悬赏外 选中第一个鬼王的 
 	I_BATTLE_1 = RuleImage(roi_front=(1066,210,100,100), roi_back=(1066,210,100,100), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_battle_1.png")
-	# 选中第二个鬼王的 
+	# 除悬赏外 选中第二个鬼王的 
 	I_BATTLE_2 = RuleImage(roi_front=(1068,364,100,100), roi_back=(1068,364,100,100), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_battle_2.png")
-	# 选中第三个鬼王的 
+	# 除悬赏外 选中第三个鬼王的 
 	I_BATTLE_3 = RuleImage(roi_front=(1071,521,100,100), roi_back=(1071,521,100,100), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_battle_3.png")
 	# 点击挑战 
 	I_FIRE = RuleImage(roi_front=(1109,490,100,73), roi_back=(1075,463,150,158), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_fire.png")
@@ -38,10 +77,26 @@ class AreaBossAssets:
 	I_CLOSE_RED = RuleImage(roi_front=(1190,24,37,38), roi_back=(1190,24,37,38), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_close_red.png")
 	# 红色关闭 
 	I_AB_CLOSE_RED = RuleImage(roi_front=(1194,24,38,37), roi_back=(1194,24,38,37), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_ab_close_red.png")
+	# 筛选中 选中悬赏标识 
+	I_AB_FILTER_TITLE_REWARD = RuleImage(roi_front=(920,110,190,70), roi_back=(920,110,190,70), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_filter_title_reward.png")
+	# 筛选中 选中热门标识 
+	I_AB_FILTER_TITLE_FAMOUS = RuleImage(roi_front=(920,110,190,70), roi_back=(920,110,190,70), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_filter_title_famous.png")
 	# 筛选中 选中收藏标识 
-	I_AB_FILTER_TITLE_COLLECTION = RuleImage(roi_front=(940,110,170,70), roi_back=(940,110,170,70), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_filter_title_collection.png")
+	I_AB_FILTER_TITLE_COLLECTION = RuleImage(roi_front=(920,110,190,70), roi_back=(920,110,190,70), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_filter_title_collection.png")
 	# 筛选界面打开标识 
 	I_AB_FILTER_OPENED = RuleImage(roi_front=(840,110,130,70), roi_back=(840,110,130,70), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_filter_opened.png")
+	# 极地鬼标识 出现此图片表明 是 极地鬼 
+	I_AB_DIFFICULTY_JI = RuleImage(roi_front=(260,100,70,70), roi_back=(260,100,70,70), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_difficulty_ji.png")
+	# 极地鬼标识 出现此图片表明 是 普通地鬼 
+	I_AB_DIFFICULTY_NORMAL = RuleImage(roi_front=(260,100,70,70), roi_back=(260,100,70,70), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_difficulty_normal.png")
+	# 普通地鬼 更改等级 的把手 
+	I_AB_LEVEL_HANDLE = RuleImage(roi_front=(170,250,400,75), roi_back=(170,250,400,75), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_level_handle.png")
+	# 普通地鬼 等级为60 标志 
+	I_AB_LEVEL_60 = RuleImage(roi_front=(300,160,110,100), roi_back=(300,160,110,100), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_level_60.png")
+	# 极地鬼 层数列表打开 标志 
+	I_AB_JI_FLOOR_LIST_CHECK = 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_list_check.png")
+	# 极地鬼 一层 
+	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")
 
 
 	# Ocr Rule Assets
@@ -53,5 +108,7 @@ class AreaBossAssets:
 	O_AB_FAMOUS = RuleOcr(roi=(1190,220,50,120), area=(1190,220,50,120), mode="Single", method="Default", keyword="热门", name="ab_famous")
 	# 收藏 
 	O_AB_COLLECTING = RuleOcr(roi=(1190,580,50,120), area=(1190,580,50,120), mode="Single", method="Default", keyword="收藏", name="ab_collecting")
+	# 挑战人数 
+	O_AB_NUM_OF_CHALLENGE = RuleOcr(roi=(270,630,150,36), area=(270,630,150,36), mode="Digit", method="Default", keyword="", name="ab_num_of_challenge")
 
 

+ 84 - 0
tasks/AreaBoss/click.json

@@ -1,4 +1,10 @@
 [
+  {
+    "itemName": "ab_reward_btn",
+    "roiFront": "1190,100,50,120",
+    "roiBack": "1190,100,50,120",
+    "description": "悬赏按钮"
+  },
   {
     "itemName": "ab_famous_btn",
     "roiFront": "1190,220,50,120",
@@ -10,5 +16,83 @@
     "roiFront": "1190,580,50,120",
     "roiBack": "1190,580,50,120",
     "description": "收藏按钮"
+  },
+  {
+    "itemName": "ab_boss_photo_1",
+    "roiFront": "940,210,95,70",
+    "roiBack": "940,210,95,70",
+    "description": "筛选中 除悬赏外 第一个boss的头像位置"
+  },
+  {
+    "itemName": "ab_boss_photo_2",
+    "roiFront": "940,365,95,70",
+    "roiBack": "940,365,95,70",
+    "description": "筛选中 除悬赏外 第二个boss的头像位置"
+  },
+  {
+    "itemName": "ab_boss_photo_3",
+    "roiFront": "940,520,95,70",
+    "roiBack": "940,520,95,70",
+    "description": "筛选中 除悬赏外 第三个boss的头像位置"
+  },
+  {
+    "itemName": "ab_boss_photo_minus_3",
+    "roiFront": "940,255,95,70",
+    "roiBack": "940,255,95,70",
+    "description": "筛选中 除悬赏外 滑动到最底部时 第一个boss的头像位置 即倒数第三个"
+  },
+  {
+    "itemName": "ab_boss_photo_minus_2",
+    "roiFront": "940,410,95,70",
+    "roiBack": "940,410,95,70",
+    "description": "筛选中 除悬赏外 滑动到最底部时 第二个boss的头像位置 即倒数第二个"
+  },
+  {
+    "itemName": "ab_boss_photo_minus_1",
+    "roiFront": "940,560,95,70",
+    "roiBack": "940,560,95,70",
+    "description": "筛选中 除悬赏外 滑动到最底部时 第三个boss的头像位置 即倒数第一个"
+  },
+  {
+    "itemName": "ab_boss_reward_photo_1",
+    "roiFront": "940,250,95,70",
+    "roiBack": "940,250,95,70",
+    "description": "筛选中 悬赏中 第一个boss的头像位置"
+  },
+  {
+    "itemName": "ab_boss_reward_photo_2",
+    "roiFront": "940,375,95,70",
+    "roiBack": "940,375,95,70",
+    "description": "筛选中 悬赏中 第二个boss的头像位置"
+  },
+  {
+    "itemName": "ab_boss_reward_photo_3",
+    "roiFront": "940,500,95,70",
+    "roiBack": "940,500,95,70",
+    "description": "筛选中 悬赏中 第三个boss的头像位置"
+  },
+  {
+    "itemName": "ab_boss_reward_photo_minus_3",
+    "roiFront": "940,335,95,70",
+    "roiBack": "940,335,95,70",
+    "description": "筛选中 悬赏中 滑动到最底部时 第一个boss的头像位置 即倒数第三个"
+  },
+  {
+    "itemName": "ab_boss_reward_photo_minus_2",
+    "roiFront": "940,460,95,70",
+    "roiBack": "940,460,95,70",
+    "description": "筛选中 悬赏中 滑动到最底部时 第二个boss的头像位置 即倒数第二个"
+  },
+  {
+    "itemName": "ab_boss_reward_photo_minus_1",
+    "roiFront": "940,585,95,70",
+    "roiBack": "940,585,95,70",
+    "description": "筛选中 悬赏中 滑动到最底部时 第三个boss的头像位置 即倒数第一个"
+  },
+  {
+    "itemName": "ab_ji_floor_selected",
+    "roiFront": "380,120,70,30",
+    "roiBack": "380,120,70,30",
+    "description": "当前选择 的极地鬼层数"
   }
 ]

+ 1 - 0
tasks/AreaBoss/config.py

@@ -16,3 +16,4 @@ class AreaBoss(ConfigBase):
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     switch_soul: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
 
+

+ 5 - 0
tasks/AreaBoss/config_boss.py

@@ -5,9 +5,14 @@ from enum import Enum
 from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
+
 class Boss(BaseModel):
     boss_number: int = Field(title='Boss Number',
                              default=3,
                              description='默认为3 可选[1-3], 当你设置为三时默认你拥有全部的挑战资格,会挑战热门的前三个,\n'
                                          '如果不是请将你可以挑战的boss进行收藏',
                              ge=1, le=3)
+    # 是否查找当日悬赏鬼王
+    boss_reward: bool = Field(default=False, description='boss_reward_help')
+    # 是否使用收藏的
+    use_collect: bool = Field(default=False, description='use_collect_help')

BIN
tasks/AreaBoss/res/ab_difficulty_ji.png


BIN
tasks/AreaBoss/res/ab_difficulty_normal.png


BIN
tasks/AreaBoss/res/ab_filter_title_famous.png


BIN
tasks/AreaBoss/res/ab_filter_title_reward.png


BIN
tasks/AreaBoss/res/ab_ji_floor_list_check.png


BIN
tasks/AreaBoss/res/ab_ji_floor_one.png


BIN
tasks/AreaBoss/res/ab_level_60.png


BIN
tasks/AreaBoss/res/ab_level_handle.png


+ 78 - 6
tasks/AreaBoss/res/image.json

@@ -42,7 +42,7 @@
     "roiBack": "1066,210,100,100",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "选中第一个鬼王的"
+    "description": "除悬赏外 选中第一个鬼王的"
   },
   {
     "itemName": "battle_2",
@@ -51,7 +51,7 @@
     "roiBack": "1068,364,100,100",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "选中第二个鬼王的"
+    "description": "除悬赏外 选中第二个鬼王的"
   },
   {
     "itemName": "battle_3",
@@ -60,7 +60,7 @@
     "roiBack": "1071,521,100,100",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "选中第三个鬼王的"
+    "description": "除悬赏外 选中第三个鬼王的"
   },
   {
     "itemName": "fire",
@@ -89,11 +89,29 @@
     "threshold": 0.8,
     "description": "红色关闭"
   },
+  {
+    "itemName": "ab_filter_title_reward",
+    "imageName": "ab_filter_title_reward.png",
+    "roiFront": "920,110,190,70",
+    "roiBack": "920,110,190,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "筛选中 选中悬赏标识"
+  },
+  {
+    "itemName": "ab_filter_title_famous",
+    "imageName": "ab_filter_title_famous.png",
+    "roiFront": "920,110,190,70",
+    "roiBack": "920,110,190,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "筛选中 选中热门标识"
+  },
   {
     "itemName": "ab_filter_title_collection",
     "imageName": "ab_filter_title_collection.png",
-    "roiFront": "940,110,170,70",
-    "roiBack":  "940,110,170,70",
+    "roiFront": "920,110,190,70",
+    "roiBack": "920,110,190,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "筛选中 选中收藏标识"
@@ -102,9 +120,63 @@
     "itemName": "ab_filter_opened",
     "imageName": "ab_filter_opened.png",
     "roiFront": "840,110,130,70",
-    "roiBack":  "840,110,130,70",
+    "roiBack": "840,110,130,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "筛选界面打开标识"
+  },
+  {
+    "itemName": "ab_difficulty_ji",
+    "imageName": "ab_difficulty_ji.png",
+    "roiFront": "260,100,70,70",
+    "roiBack": "260,100,70,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "极地鬼标识 出现此图片表明 是 极地鬼"
+  },
+  {
+    "itemName": "ab_difficulty_normal",
+    "imageName": "ab_difficulty_normal.png",
+    "roiFront": "260,100,70,70",
+    "roiBack": "260,100,70,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "极地鬼标识 出现此图片表明 是 普通地鬼"
+  },
+  {
+    "itemName": "ab_level_handle",
+    "imageName": "ab_level_handle.png",
+    "roiFront": "170,250,400,75",
+    "roiBack": "170,250,400,75",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "普通地鬼 更改等级 的把手"
+  },
+  {
+    "itemName": "ab_level_60",
+    "imageName": "ab_level_60.png",
+    "roiFront": "300,160,110,100",
+    "roiBack": "300,160,110,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "普通地鬼 等级为60 标志"
+  },
+  {
+    "itemName": "ab_ji_floor_list_check",
+    "imageName": "ab_ji_floor_list_check.png",
+    "roiFront": "390,150,60,290",
+    "roiBack": "390,150,60,290",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "极地鬼 层数列表打开 标志"
+  },
+    {
+    "itemName": "ab_ji_floor_one",
+    "imageName": "ab_ji_floor_one.png",
+    "roiFront": "390,150,60,290",
+    "roiBack": "390,150,60,290",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "极地鬼 一层"
   }
 ]

+ 9 - 0
tasks/AreaBoss/res/ocr.json

@@ -34,5 +34,14 @@
     "method": "Default",
     "keyword": "收藏",
     "description": "收藏"
+  },
+  {
+    "itemName": "ab_num_of_challenge",
+    "roiFront": "270,630,150,36",
+    "roiBack": "270,630,150,36",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "挑战人数"
   }
 ]

+ 241 - 20
tasks/AreaBoss/script_task.py

@@ -4,6 +4,7 @@
 import time
 
 import cv2
+import numpy as np
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.GameUi.game_ui import GameUi
@@ -14,6 +15,7 @@ from tasks.AreaBoss.assets import AreaBossAssets
 from module.logger import logger
 from module.exception import TaskEnd
 from module.atom.image import RuleImage
+from typing import List
 
 
 class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
@@ -41,15 +43,29 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.ui_get_current_page()
         self.ui_goto(page_area_boss)
 
-        if con.boss_number == 3:
-            self.boss(self.I_BATTLE_1)
-            self.boss(self.I_BATTLE_2)
-            self.boss(self.I_BATTLE_3)
-        elif con.boss_number == 2:
-            self.boss(self.I_BATTLE_1, collect=True)
-            self.boss(self.I_BATTLE_2, collect=True)
-        elif con.boss_number == 1:
-            self.boss(self.I_BATTLE_1, collect=True)
+        self.open_filter()
+        # 以挑战鬼王数量
+        boss_fought = 0
+        if con.boss_reward:
+            self.fight_reward_boss()
+            boss_fought += 1
+
+        self.open_filter()
+        # 切换到对应集合(热门/收藏)
+        if con.use_collect:
+            self.switch_to_collect()
+        else:
+            self.switch_to_famous()
+
+        if con.boss_number - boss_fought == 3:
+            self.boss_fight(self.I_BATTLE_1)
+            self.boss_fight(self.I_BATTLE_2)
+            self.boss_fight(self.I_BATTLE_3)
+        elif con.boss_number - boss_fought == 2:
+            self.boss_fight(self.I_BATTLE_1)
+            self.boss_fight(self.I_BATTLE_2)
+        elif con.boss_number - boss_fought == 1:
+            self.boss_fight(self.I_BATTLE_1)
 
         # 退出
         self.go_back()
@@ -73,14 +89,6 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                 break
 
     def boss(self, battle: RuleImage, collect: bool = False):
-        def switch2mycollect():
-            while 1:
-                self.screenshot()
-                if self.appear(self.I_AB_FILTER_TITLE_COLLECTION):
-                    break
-                if self.appear(self.I_AB_FILTER_OPENED):
-                    self.click(self.C_AB_COLLECTION_BTN, 1.5)
-                    continue
 
         # 点击右上角的鬼王选择
         logger.info("Script filter")
@@ -94,7 +102,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                 continue
 
         if collect:
-            switch2mycollect()
+            self.switch_to_collect()
         # 页面没有可挑战的BOSS
         if not (self.appear(self.I_BATTLE_1) or self.appear(self.I_BATTLE_2) or self.appear(self.I_BATTLE_3)):
             logger.error("There is no boss could be challenged")
@@ -117,13 +125,226 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.wait_until_appear(self.I_AB_CLOSE_RED)
         self.ui_click(self.I_AB_CLOSE_RED, self.I_FILTER)
 
+    def boss_fight(self, battle: RuleImage, ultra: bool = False) -> bool:
+        """
+            完成挑战一个鬼王的全流程
+            从打开筛选界面开始 到关闭鬼王详情界面结束
+        @param battle: 挑战按钮,鬼王头像也可,只要点击能进入详情界面
+        @type battle:
+        @param ultra: 是否需要切换到极地鬼
+        @type ultra:
+        @return:    True        挑战成功
+                    False       挑战失败
+        @rtype:
+        """
+        if not self.appear(self.I_AB_FILTER_OPENED):
+            self.open_filter()
+        self.ui_click(battle, self.I_AB_CLOSE_RED)
+
+        if ultra:
+            if not self.get_difficulty():
+                # 判断是否能切换到极地鬼
+                if not self.appear(self.I_AB_DIFFICULTY_NORMAL):
+                    self.switch_to_level_60()
+                    if not self.start_fight():
+                        logger.warning("you are so weakness!")
+                        self.wait_until_appear(self.I_AB_CLOSE_RED)
+                        self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=1)
+                        return False
+                # 切换到 极地鬼
+                self.switch_difficulty(True)
+
+            self.switch_to_floor_1()
+        result = True
+        if not self.start_fight():
+            result = False
+            logger.warning("Area Boss Fight Failed ")
+        self.wait_until_appear(self.I_AB_CLOSE_RED)
+        self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=1)
+        return result
+
+    def start_fight(self) -> bool:
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_FIRE, interval=1):
+                continue
+            if not self.appear(self.I_AB_CLOSE_RED):  # 如果这个红色的关闭不见了才可以进行继续
+                break
+
+        return self.run_general_battle(self.config.area_boss.general_battle)
+
+    def switch_to_level_60(self):
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_AB_LEVEL_60):
+                break
+            if self.appear(self.I_AB_LEVEL_HANDLE):
+                x, y = self.I_AB_LEVEL_HANDLE.front_center()
+                self.S_AB_LEVEL_RIGHT.roi_front = (x, y, 10, 10)
+                self.swipe(self.S_AB_LEVEL_RIGHT)
+
+    def get_difficulty(self) -> bool:
+        """
+        @return:    True           极地鬼
+                    False           普通地鬼
+        @rtype: bool
+        """
+        self.screenshot()
+        return self.appear(self.I_AB_DIFFICULTY_JI)
+
+    def switch_difficulty(self, ultra: bool = True):
+        """
+            切换普通地鬼/极地鬼
+        @param ultra:  是否切换到极地鬼
+                    True        切换到极地鬼
+                    False       切换到普通地鬼
+        @type ultra:
+        """
+        _from = self.I_AB_DIFFICULTY_NORMAL if ultra else self.I_AB_DIFFICULTY_JI
+        _to = self.I_AB_DIFFICULTY_JI if ultra else self.I_AB_DIFFICULTY_NORMAL
+        while 1:
+            self.screenshot()
+            if self.appear(_to):
+                break
+            if self.appear(_from):
+                self.click(_from, interval=1)
+                continue
+
+    def switch_to_floor_1(self):
+        """
+            更改层数为一层
+        """
+        _Floor = ["壹星", "贰星", "叁星", "肆星", "伍星", "陆星", "柒星", "捌星", "玖星", "拾星"]
+        # 打开选择列表
+        self.ui_click(self.C_AB_JI_FLOOR_SELECTED, self.I_AB_JI_FLOOR_LIST_CHECK, interval=1)
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_AB_JI_FLOOR_ONE):
+                self.click(self.I_AB_JI_FLOOR_ONE)
+                break
+            self.swipe(self.S_AB_FLOOR_DOWN, interval=1)
+
+    def fight_reward_boss(self):
+        index = self.get_hot_in_reward()
+        # 滑动到最顶层
+        if index < 3:
+            logger.info("swipe to top")
+            for i in range(3):
+                self.swipe(self.S_AB_FILTER_DOWN)
+        #
+        if index == 0:
+            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_1, True)
+        elif index == 1:
+            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_2, True)
+        elif index == 2:
+            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_3, True)
+        # 保证滑动到最底部
+        for i in range(3):
+            self.swipe(self.S_AB_FILTER_UP)
+        if index == 3:
+            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, True)
+        elif index == 4:
+            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, True)
+
+    def get_hot_in_reward(self):
+        """
+            返回挑战人数最多的悬赏鬼王
+        @return:    index
+        @rtype:
+        """
+        self.switch_to_reward()
+        lst = []
+        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
+        lst.append(num)
+        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        self.open_filter()
+        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
+        lst.append(num)
+        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        self.open_filter()
+        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
+        lst.append(num)
+        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        self.open_filter()
+        for i in range(3):
+            self.swipe(self.S_AB_FILTER_UP)
+
+        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
+        lst.append(num)
+        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        self.open_filter()
+        num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
+        lst.append(num)
+        self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+        self.open_filter()
+        index = 0
+        num = 0
+        for idx, val in enumerate(lst):
+            if val > num:
+                index = idx
+                num = val
+        return index
+
+    def get_num_challenge(self, click_area):
+        """
+            获取鬼王挑战人数
+        @param click_area: 鬼王相应的挑战按钮
+        @type click_area:
+        @return:
+        @rtype:
+        """
+        # 如果鬼王不可挑战(未解锁),限制3次尝试打开鬼王详情界面
+        numTry = 0
+        while numTry < 3:
+            self.screenshot()
+            if self.appear(self.I_AB_CLOSE_RED):
+                break
+            if self.click(click_area, interval=2):
+                numTry += 1
+        if numTry >= 3:
+            return 0
+        return self.O_AB_NUM_OF_CHALLENGE.ocr_digit(self.device.image)
+
+    def open_filter(self):
+        logger.info("openFilter")
+        self.ui_click(self.I_FILTER, self.I_AB_FILTER_OPENED, interval=1)
+
+    def switch_to_collect(self):
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_AB_FILTER_TITLE_COLLECTION):
+                break
+            if self.appear(self.I_AB_FILTER_OPENED):
+                self.click(self.C_AB_COLLECTION_BTN, 1.5)
+                continue
+
+    def switch_to_famous(self):
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_AB_FILTER_TITLE_FAMOUS):
+                break
+            if self.appear(self.I_AB_FILTER_OPENED):
+                self.click(self.C_AB_FAMOUS_BTN, 1.5)
+                continue
+
+    def switch_to_reward(self):
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_AB_FILTER_TITLE_REWARD):
+                break
+            if self.appear(self.I_AB_FILTER_OPENED):
+                self.click(self.C_AB_REWARD_BTN, 1.5)
+                continue
+
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas1')
+    c = Config('oas2')
     d = Device(c)
     t = ScriptTask(c, d)
-
+    time.sleep(3)
+    # t.switchFloor2One()
+    # t.switch2Level60()
     t.run()

+ 30 - 0
tasks/AreaBoss/swipe.json

@@ -0,0 +1,30 @@
+[
+  {
+    "itemName": "ab_filter_up",
+    "roiFront": "920,680,10,10",
+    "roiBack": "1130,230,10,10",
+    "mode": "default",
+    "description": "筛选列表 手指向上滑动"
+  },
+  {
+    "itemName": "ab_filter_down",
+    "roiFront": "1130,230,10,10",
+    "roiBack": "920,680,10,10",
+    "mode": "default",
+    "description": "筛选列表 手指向下滑动"
+  },
+  {
+    "itemName": "ab_floor_down",
+    "roiFront": "390,260,10,10",
+    "roiBack": "450,500,10,10",
+    "mode": "default",
+    "description": "极地鬼 层数列表 手指向下滑动 "
+  },
+  {
+    "itemName": "ab_level_right",
+    "roiFront": "0,0,10,10",
+    "roiBack": "570,270,10,10",
+    "mode": "default",
+    "description": "普通地鬼 等级滑轨 手指向右滑动 "
+  }
+]

+ 7 - 4
tasks/Hunt/script_task.py

@@ -28,10 +28,13 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
         if con.kirin_group_team != '-1,-1' or con.netherworld_group_team != '-1,-1':
             self.ui_get_current_page()
             self.ui_goto(page_shikigami_records)
-            if con.kirin_group_team != '-1,-1':
-                self.run_switch_soul(con.kirin_group_team)
-            if con.netherworld_group_team != '-1,-1':
-                self.run_switch_soul(con.netherworld_group_team)
+
+            if self.kirin_day:
+                if con.kirin_group_team != '-1,-1':
+                    self.run_switch_soul(con.kirin_group_team)
+            else:
+                if con.netherworld_group_team != '-1,-1':
+                    self.run_switch_soul(con.netherworld_group_team)
         self.ui_get_current_page()
         self.ui_goto(page_hunt)
 

+ 26 - 23
tasks/Restart/login.py

@@ -152,29 +152,32 @@ class LoginHandler(BaseTask, RestartAssets):
                 timer_harvest.reset()
                 continue
             # 邮件
-            if self.appear_then_click(self.I_HARVEST_MAIL, interval=1.2):
-                timer_harvest.reset()
-                continue
-            if self.appear(self.I_HARVEST_MAIL_TITLE, interval=0.2):
-                while 1:
-                    self.screenshot()
-                    if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=2):
-                        timer_harvest.reset()
-                        pass
-                    if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=1):
-                        continue
-
-                    # 如果一直出现收取全部,那就说明还在进行中
-                    if self.appear(self.I_HARVEST_MAIL_ALL):
-                        pass
-                    # 如果没有出现 ‘收取全部’ 也没有出现 ‘还未读的邮件’ 那就可以退出了
-                    if not self.appear(self.I_HARVEST_MAIL_ALL) and not self.appear(self.I_HARVEST_MAIL_OPEN):
-                        logger.info('Mail has been harvested')
-                        logger.info('Exit mail')
-                        break
-                    if self.appear_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
-                        timer_harvest.reset()
-                        continue
+            # 判断是否勾选了收取邮件(不收取邮件可以查看每日收获)
+            if self.config.restart.harvest_config.enable_mail:
+
+                if self.appear_then_click(self.I_HARVEST_MAIL, interval=1.2):
+                    timer_harvest.reset()
+                    continue
+                if self.appear(self.I_HARVEST_MAIL_TITLE, interval=0.2):
+                    while 1:
+                        self.screenshot()
+                        if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=2):
+                            timer_harvest.reset()
+                            pass
+                        if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=1):
+                            continue
+
+                        # 如果一直出现收取全部,那就说明还在进行中
+                        if self.appear(self.I_HARVEST_MAIL_ALL):
+                            pass
+                        # 如果没有出现 ‘收取全部’ 也没有出现 ‘还未读的邮件’ 那就可以退出了
+                        if not self.appear(self.I_HARVEST_MAIL_ALL) and not self.appear(self.I_HARVEST_MAIL_OPEN):
+                            logger.info('Mail has been harvested')
+                            logger.info('Exit mail')
+                            break
+                        if self.appear_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
+                            timer_harvest.reset()
+                            continue
             # 体力
             if self.appear_then_click(self.I_HARVEST_AP, interval=1, threshold=0.7):
                 timer_harvest.reset()