Просмотр исходного кода

Merge pull request #499 from ohspecial/feat1

Feat(AbyssShadows):Done
huangrunheng 2 лет назад
Родитель
Сommit
4c3548293d
37 измененных файлов с 943 добавлено и 3 удалено
  1. 29 1
      config/template.json
  2. 1 1
      module/config/config_manual.py
  3. 1 1
      module/config/config_menu.py
  4. 2 0
      module/config/config_model.py
  5. BIN
      tasks/AbyssShadows/__pycache__/assets.cpython-310.pyc
  6. BIN
      tasks/AbyssShadows/__pycache__/config.cpython-310.pyc
  7. BIN
      tasks/AbyssShadows/__pycache__/script_task.cpython-310.pyc
  8. 105 0
      tasks/AbyssShadows/assets.py
  9. 18 0
      tasks/AbyssShadows/config.py
  10. 92 0
      tasks/AbyssShadows/res/click.json
  11. 209 0
      tasks/AbyssShadows/res/image.json
  12. 23 0
      tasks/AbyssShadows/res/list.json
  13. BIN
      tasks/AbyssShadows/res/res_abyss_dragon.png
  14. BIN
      tasks/AbyssShadows/res/res_abyss_fire.png
  15. BIN
      tasks/AbyssShadows/res/res_abyss_fox.png
  16. BIN
      tasks/AbyssShadows/res/res_abyss_goto_enemy.png
  17. BIN
      tasks/AbyssShadows/res/res_abyss_leopard.png
  18. BIN
      tasks/AbyssShadows/res/res_abyss_map.png
  19. BIN
      tasks/AbyssShadows/res/res_abyss_map_exit.png
  20. BIN
      tasks/AbyssShadows/res/res_abyss_navigation.png
  21. BIN
      tasks/AbyssShadows/res/res_abyss_peacock.png
  22. BIN
      tasks/AbyssShadows/res/res_abyss_shadows.png
  23. BIN
      tasks/AbyssShadows/res/res_abyss_shiki.png
  24. BIN
      tasks/AbyssShadows/res/res_change_area.png
  25. BIN
      tasks/AbyssShadows/res/res_dragon_area.png
  26. BIN
      tasks/AbyssShadows/res/res_ensure_button.png
  27. BIN
      tasks/AbyssShadows/res/res_fox_area.png
  28. BIN
      tasks/AbyssShadows/res/res_is_attack.png
  29. BIN
      tasks/AbyssShadows/res/res_leopard_area.png
  30. BIN
      tasks/AbyssShadows/res/res_open_abyss_shadows_abyss.png
  31. BIN
      tasks/AbyssShadows/res/res_peacock_area.png
  32. BIN
      tasks/AbyssShadows/res/res_ryou_shenshe.png
  33. BIN
      tasks/AbyssShadows/res/res_to_abyss_shadows.png
  34. BIN
      tasks/AbyssShadows/res/res_wait_to_start.png
  35. BIN
      tasks/AbyssShadows/res/scene_ryou.png
  36. 9 0
      tasks/AbyssShadows/res/swipe.json
  37. 454 0
      tasks/AbyssShadows/script_task.py

+ 29 - 1
config/template.json

@@ -902,6 +902,33 @@
       "netherworld_group_team": "-1,-1"
     }
   },
+  "abyss_shadows": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "general_battle_config": {
+      "lock_team_enable": false,
+      "preset_enable": false,
+      "preset_group": 1,
+      "preset_team": 1,
+      "green_enable": false,
+      "green_mark": "green_left1",
+      "random_click_swipt_enable": false
+    },
+    "switch_soul_config": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
+    }
+  },
   "dokan": {
     "scheduler": {
       "enable": true,
@@ -960,5 +987,6 @@
         "random_click_swipt_enable": false
       }
     }
-  } 
+    
+  }
 }

+ 1 - 1
module/config/config_manual.py

@@ -11,7 +11,7 @@ class ConfigManual:
         Restart > SoulsTidy
         > KekkaiUtilize > KekkaiActivation > DemonEncounter
         > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > Tako > RealmRaid > RyouToppa > DailyTrifles > Exploration
-        > Dokan > Hunt 
+        > Dokan > AbyssShadows > Hunt 
         > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea > SixRealms
         > ActivityShikigami > WantedQuests
         > BondlingFairyland > EvoZone > GoryouRealm > HeroTest

+ 1 - 1
module/config/config_menu.py

@@ -35,7 +35,7 @@ class ConfigMenu:
         ]
         # 阴阳寮
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'Dokan', 'CollectiveMissions',
-                              'Hunt']
+                              'Hunt' , 'AbyssShadows']
         # 每周任务
         self.menu["Weekly Task"] = ['TrueOrochi', 'RichMan', 'Secret', 'WeeklyTrifles', 'MysteryShop', 'Duel']
         # 活动的任务

+ 2 - 0
module/config/config_model.py

@@ -45,6 +45,7 @@ from tasks.SixRealms.config import SixRealms
 from tasks.RealmRaid.config import RealmRaid
 from tasks.CollectiveMissions.config import CollectiveMissions
 from tasks.Hunt.config import Hunt
+from tasks.AbyssShadows.config import AbyssShadows
 
 # 这一部分是活动的配置-----------------------------------------------------------------------------------------------------
 from tasks.ActivityShikigami.config import ActivityShikigami
@@ -131,6 +132,7 @@ class ConfigModel(ConfigBase):
     collective_missions: CollectiveMissions = Field(default_factory=CollectiveMissions)
     hunt: Hunt = Field(default_factory=Hunt)
     dokan: Dokan = Field(default_factory=Dokan)
+    abyss_shadows: AbyssShadows = Field(default_factory=AbyssShadows)
 
     # @validator('script')
     # def script_validator(cls, v):

BIN
tasks/AbyssShadows/__pycache__/assets.cpython-310.pyc


BIN
tasks/AbyssShadows/__pycache__/config.cpython-310.pyc


BIN
tasks/AbyssShadows/__pycache__/script_task.cpython-310.pyc


+ 105 - 0
tasks/AbyssShadows/assets.py

@@ -0,0 +1,105 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class AbyssShadowsAssets: 
+
+
+	# Click Rule Assets
+	# 首领 
+	C_BOSS_CLICK_AREA = RuleClick(roi_front=(679,164,83,54), roi_back=(679,164,83,54), name="boss_click_area")
+	# 副将1 
+	C_GENERAL_1_CLICK_AREA = RuleClick(roi_front=(539,306,64,56), roi_back=(539,306,64,56), name="general_1_click_area")
+	# 副将2 
+	C_GENERAL_2_CLICK_AREA = RuleClick(roi_front=(856,293,58,50), roi_back=(856,293,58,50), name="general_2_click_area")
+	# 精英1 
+	C_ELITE_1_CLICK_AREA = RuleClick(roi_front=(453,418,54,45), roi_back=(453,418,54,45), name="elite_1_click_area")
+	# 精英2 
+	C_ELITE_2_CLICK_AREA = RuleClick(roi_front=(694,420,58,44), roi_back=(694,420,58,44), name="elite_2_click_area")
+	# 精英3 
+	C_ELITE_3_CLICK_AREA = RuleClick(roi_front=(938,413,60,44), roi_back=(938,413,60,44), name="elite_3_click_area")
+	# 前往阵眼 
+	C_CHANGE_ZONE = RuleClick(roi_front=(1000,606,54,54), roi_back=(1000,606,54,54), name="change_zone")
+	# 神龙暗域 
+	C_DRAGON_AREA = RuleClick(roi_front=(123,150,75,66), roi_back=(123,150,75,66), name="dragon_area")
+	# 孔雀暗域 
+	C_PEACOCK_AREA = RuleClick(roi_front=(125,278,74,62), roi_back=(125,278,74,62), name="peacock_area")
+	# 白藏主暗域 
+	C_FOX_AREA = RuleClick(roi_front=(126,409,79,74), roi_back=(126,409,79,74), name="fox_area")
+	# 黑豹暗域 
+	C_LEOPARD_AREA = RuleClick(roi_front=(122,537,81,76), roi_back=(122,537,81,76), name="leopard_area")
+	# 狭间_神龙入口 
+	C_ABYSS_DRAGON = RuleClick(roi_front=(232.5,196,55,151), roi_back=(190,147,140,283), name="abyss_dragon")
+	# 狭间_孔雀入口 
+	C_ABYSS_PEACOCK = RuleClick(roi_front=(526,189,48,165), roi_back=(476,138,145,312), name="abyss_peacock")
+	# 狭间_白藏主入口 
+	C_ABYSS_FOX = RuleClick(roi_front=(822,184,49,144), roi_back=(789,130,148,249), name="abyss_fox")
+	# 狭间_黑豹入口 
+	C_ABYSS_LEOPARD = RuleClick(roi_front=(1140,190,50,162), roi_back=(1093,143,138,297), name="abyss_leopard")
+
+
+	# Image Rule Assets
+	# 阴阳竂->神社 
+	I_RYOU_SHENSHE = RuleImage(roi_front=(872,659,62,25), roi_back=(872,659,62,25), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_ryou_shenshe.png")
+	# 神社->狭间暗域 
+	I_RYOU_ABYSS_SHADOWS = RuleImage(roi_front=(707,492,110,27), roi_back=(707,492,110,27), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_ryou_abyss_shadows.png")
+	# 狭间_神龙入口 
+	I_ABYSS_DRAGON = RuleImage(roi_front=(227,211,55,151), roi_back=(190,147,140,283), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_dragon.png")
+	# 狭间_孔雀入口 
+	I_ABYSS_PEACOCK = RuleImage(roi_front=(521,152,48,165), roi_back=(465,104,145,312), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_peacock.png")
+	# 狭间_白藏主入口 
+	I_ABYSS_FOX = RuleImage(roi_front=(815,174,49,144), roi_back=(789,130,148,249), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_fox.png")
+	# 狭间_黑豹入口 
+	I_ABYSS_LEOPARD = RuleImage(roi_front=(1142,166,50,162), roi_back=(1093,143,138,297), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_leopard.png")
+	# 战报 
+	I_ABYSS_NAVIGATION = RuleImage(roi_front=(1200,372,50,44), roi_back=(1200,372,50,44), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_navigation.png")
+	# 式神录 
+	I_ABYSS_SHIKI = RuleImage(roi_front=(1199,462,47,53), roi_back=(1199,462,47,53), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_shiki.png")
+	# 狭间暗域 
+	I_ABYSS_SHADOWS = RuleImage(roi_front=(711,489,107,38), roi_back=(711,489,107,38), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_shadows.png")
+	# 开启狭间暗域 
+	I_OPEN_ABYSS_SHADOWS = RuleImage(roi_front=(1133,602,74,58), roi_back=(1133,602,74,58), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_open_abyss_shadows.png")
+	# 战报页面 
+	I_ABYSS_MAP = RuleImage(roi_front=(306,147,170,48), roi_back=(306,147,170,48), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_map.png")
+	# 战报退出按钮 
+	I_ABYSS_MAP_EXIT = RuleImage(roi_front=(1154,96,32,32), roi_back=(1154,96,32,32), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_map_exit.png")
+	# 挑战按钮 
+	I_ABYSS_FIRE = RuleImage(roi_front=(1121,605,77,50), roi_back=(1121,605,77,50), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_fire.png")
+	# 前往 
+	I_ABYSS_GOTO_ENEMY = RuleImage(roi_front=(1120,610,75,45), roi_back=(1120,610,75,45), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_abyss_goto_enemy.png")
+	# description 
+	I_CHANGE_AREA = RuleImage(roi_front=(993,610,63,61), roi_back=(993,610,63,61), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_change_area.png")
+	# description 
+	I_ENSURE_BUTTON = RuleImage(roi_front=(672,405,169,55), roi_back=(672,405,169,55), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_ensure_button.png")
+	# 进攻中 
+	I_IS_ATTACK = RuleImage(roi_front=(586,62,73,27), roi_back=(586,62,73,27), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_is_attack.png")
+	# description 
+	I_PEACOCK_AREA = RuleImage(roi_front=(577,14,127,36), roi_back=(577,14,127,36), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_peacock_area.png")
+	# 黑豹领域 
+	I_LEOPARD_AREA = RuleImage(roi_front=(589,13,104,39), roi_back=(589,13,104,39), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_leopard_area.png")
+	# 白藏主领域 
+	I_FOX_AREA = RuleImage(roi_front=(581,18,121,29), roi_back=(581,18,121,29), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_fox_area.png")
+	# 更换领域 
+	I_CHANGE_AREA = RuleImage(roi_front=(511,20,27,27), roi_back=(511,20,27,27), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_change_area.png")
+	# 神龙领域 
+	I_DRAGON_AREA = RuleImage(roi_front=(584,15,111,34), roi_back=(584,15,111,34), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_dragon_area.png")
+	# description 
+	I_WAIT_TO_START = RuleImage(roi_front=(588,64,70,26), roi_back=(588,64,70,26), threshold=0.8, method="Template matching", file="./tasks/AbyssShadows/res/res_wait_to_start.png")
+
+
+	# List Rule Assets
+	# 这个是当前活跃的竂活动列表界面 
+	L_RYOU_ACTIVITY_LIST = RuleList(folder="./tasks/AbyssShadows/res", direction="vertical", mode="ocr", roi_back=(35,157,37,250), size=(42, 27), 
+					 array=["道馆", "首领", "狭间"])
+
+
+	# Swipe Rule Assets
+	# 滑到狭间 
+	S_TO_ABBSY_SHADOWS = RuleSwipe(roi_front=(752,395,62,66), roi_back=(758,193,62,48), mode="default", name="to_abbsy_shadows")
+
+

+ 18 - 0
tasks/AbyssShadows/config.py

@@ -0,0 +1,18 @@
+# This Python file uses the following encoding: utf-8
+# @brief    Configurations for Ryou Dokan Toppa (阴阳竂道馆突破配置)
+# @author   jackyhwei
+# @note     draft version without full test
+# github    https://github.com/roarhill/oas
+
+from pydantic import BaseModel, Field
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
+from tasks.Component.config_base import ConfigBase, Time
+from tasks.Component.config_scheduler import Scheduler
+
+
+
+class AbyssShadows(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
+    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)

+ 92 - 0
tasks/AbyssShadows/res/click.json

@@ -0,0 +1,92 @@
+[
+  {
+    "itemName": "boss_click_area",
+    "roiFront": "679,164,83,54",
+    "roiBack": "679,164,83,54",
+    "description": "首领"
+  },
+  {
+    "itemName": "general_1_click_area",
+    "roiFront": "539,306,64,56",
+    "roiBack": "539,306,64,56",
+    "description": "副将1"
+  },
+  {
+    "itemName": "general_2_click_area",
+    "roiFront": "856,293,58,50",
+    "roiBack": "856,293,58,50",
+    "description": "副将2"
+  },
+  {
+    "itemName": "elite_1_click_area",
+    "roiFront": "453,418,54,45",
+    "roiBack": "453,418,54,45",
+    "description": "精英1"
+  },
+  {
+    "itemName": "elite_2_click_area",
+    "roiFront": "694,420,58,44",
+    "roiBack": "694,420,58,44",
+    "description": "精英2"
+  },
+  {
+    "itemName": "elite_3_click_area",
+    "roiFront": "938,413,60,44",
+    "roiBack": "938,413,60,44",
+    "description": "精英3"
+  },
+  {
+    "itemName": "change_zone",
+    "roiFront": "1000,606,54,54",
+    "roiBack": "1000,606,54,54",
+    "description": "前往阵眼"
+  },
+  {
+    "itemName": "dragon_area",
+    "roiFront": "123,150,75,66",
+    "roiBack": "123,150,75,66",
+    "description": "神龙暗域"
+  },
+  {
+    "itemName": "peacock_area",
+    "roiFront": "125,278,74,62",
+    "roiBack": "125,278,74,62",
+    "description": "孔雀暗域"
+  },
+  {
+    "itemName": "fox_area",
+    "roiFront": "126,409,79,74",
+    "roiBack": "126,409,79,74",
+    "description": "白藏主暗域"
+  },
+  {
+    "itemName": "leopard_area",
+    "roiFront": "122,537,81,76",
+    "roiBack": "122,537,81,76",
+    "description": "黑豹暗域"
+  },
+  {
+    "itemName": "abyss_dragon",
+    "roiFront": "232.5,196,55,151",
+    "roiBack": "190,147,140,283",
+    "description": "狭间_神龙入口"
+  },
+  {
+    "itemName": "abyss_peacock",
+    "roiFront": "526,189,48,165",
+    "roiBack": "476,138,145,312",
+    "description": "狭间_孔雀入口"
+  },
+  {
+    "itemName": "abyss_fox",
+    "roiFront": "822,184,49,144",
+    "roiBack": "789,130,148,249",
+    "description": "狭间_白藏主入口"
+  },
+  {
+    "itemName": "abyss_leopard",
+    "roiFront": "1140,190,50,162",
+    "roiBack": "1093,143,138,297",
+    "description": "狭间_黑豹入口"
+  }
+]

+ 209 - 0
tasks/AbyssShadows/res/image.json

@@ -0,0 +1,209 @@
+[
+  {
+    "itemName": "ryou_shenshe",
+    "imageName": "res_ryou_shenshe.png",
+    "roiFront": "872,659,62,25",
+    "roiBack": "872,659,62,25",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "阴阳竂->神社"
+  },
+  {
+    "itemName": "ryou_abyss_shadows",
+    "imageName": "res_ryou_abyss_shadows.png",
+    "roiFront": "707,492,110,27",
+    "roiBack": "707,492,110,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神社->狭间暗域"
+  },
+  {
+    "itemName": "abyss_dragon",
+    "imageName": "res_abyss_dragon.png",
+    "roiFront": "227,211,55,151",
+    "roiBack": "190,147,140,283",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "狭间_神龙入口"
+  },
+  {
+    "itemName": "abyss_peacock",
+    "imageName": "res_abyss_peacock.png",
+    "roiFront": "521,152,48,165",
+    "roiBack": "465,104,145,312",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "狭间_孔雀入口"
+  },
+  {
+    "itemName": "abyss_fox",
+    "imageName": "res_abyss_fox.png",
+    "roiFront": "815,174,49,144",
+    "roiBack": "789,130,148,249",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "狭间_白藏主入口"
+  },
+  {
+    "itemName": "abyss_leopard",
+    "imageName": "res_abyss_leopard.png",
+    "roiFront": "1142,166,50,162",
+    "roiBack": "1093,143,138,297",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "狭间_黑豹入口"
+  },
+  {
+    "itemName": "abyss_navigation",
+    "imageName": "res_abyss_navigation.png",
+    "roiFront": "1200,372,50,44",
+    "roiBack": "1200,372,50,44",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战报"
+  },
+  {
+    "itemName": "abyss_shiki",
+    "imageName": "res_abyss_shiki.png",
+    "roiFront": "1199,462,47,53",
+    "roiBack": "1199,462,47,53",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "式神录"
+  },
+  {
+    "itemName": "abyss_shadows",
+    "imageName": "res_abyss_shadows.png",
+    "roiFront": "711,489,107,38",
+    "roiBack": "711,489,107,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "狭间暗域"
+  },
+  {
+    "itemName": "open_abyss_shadows",
+    "imageName": "res_open_abyss_shadows.png",
+    "roiFront": "1133,602,74,58",
+    "roiBack": "1133,602,74,58",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "开启狭间暗域"
+  },
+  {
+    "itemName": "abyss_map",
+    "imageName": "res_abyss_map.png",
+    "roiFront": "306,147,170,48",
+    "roiBack": "306,147,170,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战报页面"
+  },
+  {
+    "itemName": "abyss_map_exit",
+    "imageName": "res_abyss_map_exit.png",
+    "roiFront": "1154,96,32,32",
+    "roiBack": "1154,96,32,32",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战报退出按钮"
+  },
+  {
+    "itemName": "abyss_fire",
+    "imageName": "res_abyss_fire.png",
+    "roiFront": "1121,605,77,50",
+    "roiBack": "1121,605,77,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "挑战按钮"
+  },
+  {
+    "itemName": "abyss_goto_enemy",
+    "imageName": "res_abyss_goto_enemy.png",
+    "roiFront": "1120,610,75,45",
+    "roiBack": "1120,610,75,45",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "前往"
+  },
+  {
+    "itemName": "change_area",
+    "imageName": "res_change_area.png",
+    "roiFront": "993,610,63,61",
+    "roiBack": "993,610,63,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "ensure_button",
+    "imageName": "res_ensure_button.png",
+    "roiFront": "672,405,169,55",
+    "roiBack": "672,405,169,55",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "is_attack",
+    "imageName": "res_is_attack.png",
+    "roiFront": "586,62,73,27",
+    "roiBack": "586,62,73,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进攻中"
+  },
+  {
+    "itemName": "peacock_area",
+    "imageName": "res_peacock_area.png",
+    "roiFront": "577,14,127,36",
+    "roiBack": "577,14,127,36",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "leopard_area",
+    "imageName": "res_leopard_area.png",
+    "roiFront": "589,13,104,39",
+    "roiBack": "589,13,104,39",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "黑豹领域"
+  },
+  {
+    "itemName": "fox_area",
+    "imageName": "res_fox_area.png",
+    "roiFront": "581,18,121,29",
+    "roiBack": "581,18,121,29",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "白藏主领域"
+  },
+  {
+    "itemName": "change_area",
+    "imageName": "res_change_area.png",
+    "roiFront": "511,20,27,27",
+    "roiBack": "511,20,27,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "更换领域"
+  },
+  {
+    "itemName": "dragon_area",
+    "imageName": "res_dragon_area.png",
+    "roiFront": "584,15,111,34",
+    "roiBack": "584,15,111,34",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神龙领域"
+  },
+  {
+    "itemName": "wait_to_start",
+    "imageName": "res_wait_to_start.png",
+    "roiFront": "588,64,70,26",
+    "roiBack": "588,64,70,26",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

+ 23 - 0
tasks/AbyssShadows/res/list.json

@@ -0,0 +1,23 @@
+{
+    "name": "ryou_activity_list",
+    "direction": "vertical",
+    "type": "ocr",
+    "roiBack": "35,157,37,250",
+    "description": "这个是当前活跃的竂活动列表界面",
+    "list": [
+      {
+        "itemName": "道馆",
+        "roiFront": "33,253,42,26"
+      },
+      {
+        "itemName": "首领",
+        "roiFront": "34,433,43,28",
+        "description": "首领退治"
+      },
+      {
+        "itemName": "狭间",
+        "roiFront": "34,523,43,28",
+        "description": "狭间暗域"
+      }
+    ]
+  }

BIN
tasks/AbyssShadows/res/res_abyss_dragon.png


BIN
tasks/AbyssShadows/res/res_abyss_fire.png


BIN
tasks/AbyssShadows/res/res_abyss_fox.png


BIN
tasks/AbyssShadows/res/res_abyss_goto_enemy.png


BIN
tasks/AbyssShadows/res/res_abyss_leopard.png


BIN
tasks/AbyssShadows/res/res_abyss_map.png


BIN
tasks/AbyssShadows/res/res_abyss_map_exit.png


BIN
tasks/AbyssShadows/res/res_abyss_navigation.png


BIN
tasks/AbyssShadows/res/res_abyss_peacock.png


BIN
tasks/AbyssShadows/res/res_abyss_shadows.png


BIN
tasks/AbyssShadows/res/res_abyss_shiki.png


BIN
tasks/AbyssShadows/res/res_change_area.png


BIN
tasks/AbyssShadows/res/res_dragon_area.png


BIN
tasks/AbyssShadows/res/res_ensure_button.png


BIN
tasks/AbyssShadows/res/res_fox_area.png


BIN
tasks/AbyssShadows/res/res_is_attack.png


BIN
tasks/AbyssShadows/res/res_leopard_area.png


BIN
tasks/AbyssShadows/res/res_open_abyss_shadows_abyss.png


BIN
tasks/AbyssShadows/res/res_peacock_area.png


BIN
tasks/AbyssShadows/res/res_ryou_shenshe.png


BIN
tasks/AbyssShadows/res/res_to_abyss_shadows.png


BIN
tasks/AbyssShadows/res/res_wait_to_start.png


BIN
tasks/AbyssShadows/res/scene_ryou.png


+ 9 - 0
tasks/AbyssShadows/res/swipe.json

@@ -0,0 +1,9 @@
+[
+  {
+    "itemName": "to_abbsy_shadows",
+    "roiFront": "752,395,62,66",
+    "roiBack": "758,193,62,48",
+    "mode": "default",
+    "description": "滑到狭间"
+  }
+]

+ 454 - 0
tasks/AbyssShadows/script_task.py

@@ -0,0 +1,454 @@
+# This Python file uses the following encoding: utf-8
+# @brief    Ryou Dokan Toppa (阴阳竂道馆突破功能)
+# @author   jackyhwei
+# @note     draft version without full test
+# github    https://github.com/roarhill/oas
+
+from datetime import datetime
+import random
+import numpy as np
+from enum import Enum
+from cached_property import cached_property
+from time import sleep
+
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.Component.config_base import ConfigBase, Time
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_kekkai_toppa, page_shikigami_records, page_guild
+from tasks.RealmRaid.assets import RealmRaidAssets
+
+from module.logger import logger
+from module.exception import TaskEnd
+from module.atom.image_grid import ImageGrid
+from module.base.utils import point2str
+from module.base.timer import Timer
+from module.exception import GamePageUnknownError
+from pathlib import Path
+from tasks.AbyssShadows.config import AbyssShadows
+from tasks.AbyssShadows.assets import AbyssShadowsAssets
+
+class AreaType:
+    """ 暗域类型 """
+    DRAGON = AbyssShadowsAssets.I_ABYSS_DRAGON  # 神龙暗域
+    PEACOCK = AbyssShadowsAssets.I_ABYSS_PEACOCK  # 孔雀暗域
+    FOX = AbyssShadowsAssets.I_ABYSS_FOX  # 白藏主暗域
+    LEOPARD = AbyssShadowsAssets.I_ABYSS_LEOPARD # 黑豹暗域
+
+    @cached_property
+    def name(self) -> str:
+        """
+
+        :return:
+        """
+        return Path(self.file).stem.upper()
+
+    def __str__(self):
+        return self.name
+
+    __repr__ = __str__
+
+class EmemyType(Enum):
+
+    """ 敌人类型 """
+    BOSS = 1  #  首领
+    GENERAL = 2  #  副将
+    ELITE = 3  #  精英
+
+
+class CilckArea:
+    """ 点击区域 """
+    GENERAL_1 = AbyssShadowsAssets.C_GENERAL_1_CLICK_AREA
+    GENERAL_2 = AbyssShadowsAssets.C_GENERAL_2_CLICK_AREA
+    ELITE_1 = AbyssShadowsAssets.C_ELITE_1_CLICK_AREA
+    ELITE_2 = AbyssShadowsAssets.C_ELITE_2_CLICK_AREA
+    ELITE_3 = AbyssShadowsAssets.C_ELITE_3_CLICK_AREA
+    BOSS= AbyssShadowsAssets.C_BOSS_CLICK_AREA
+
+    @cached_property
+    def name(self) -> str:
+        """
+
+        :return:
+        """
+        return Path(self.file).stem.upper()
+
+    def __str__(self):
+        return self.name
+
+    __repr__ = __str__
+
+
+class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AbyssShadowsAssets):
+    
+
+    boss_fight_count = 0  # 首领战斗次数
+    general_fight_count = 0  # 副将战斗次数
+    elite_fight_count = 0  # 精英战斗次数
+    
+    def run(self):
+        """ 狭间暗域主函数
+
+        :return:
+        """
+        cfg: AbyssShadows = self.config.abyss_shadows_config
+
+        if cfg.switch_soul_config.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(cfg.switch_soul_config.switch_group_team)
+        if cfg.switch_soul_config.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(cfg.switch_soul_config.group_name, cfg.switch_soul_config.team_name)
+        today = datetime.now().weekday()
+        if today not in [4, 5, 6]:
+            logger.info(f"Today is not abyss shadows day, exit")
+            self.set_next_run(task='AbyssShadows', finish=False, server=True, success=False)
+            raise TaskEnd
+        success = True
+        # 进入狭间
+        self.goto_abyss_shadows()
+        # 第一次默认选择神龙暗域
+        if not self.select_boss(AreaType.DRAGON):
+            logger.warning("Failed to enter abyss shadows")
+            self.goto_main()
+            self.set_next_run(task='AbyssShadows', finish=False, server=True, success=False)
+            raise TaskEnd
+        
+        # 等待可进攻时间  
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        # 集结中图片
+        self.wait_until_disappear(self.I_WAIT_TO_START)
+        self.device.stuck_record_clear()
+
+        # 准备攻打精英、副将、首领
+        while 1:
+            # 点击战报按钮
+            find_list = [EmemyType.BOSS, EmemyType.GENERAL, EmemyType.ELITE]
+            for enemy_type in find_list:
+                # 寻找敌人并开始战斗,
+                if not self.find_enemy(enemy_type):
+                    logger.warning(f"Failed to find {enemy_type.name} enemy, exit")
+                    break
+            logger.info(f"Current fight times: boss {self.boss_fight_count} times, general {self.general_fight_count}  times, elite {self.elite_fight_count} times")
+            # 正常应该打完一个区域了,检查攻打次数,如没打够则切换到下一个区域,默认神龙 -> 孔雀 -> 白藏主 -> 黑豹
+            if self.boss_fight_count >= 2 and self.general_fight_count >= 4 and self.elite_fight_count >= 6:
+                success = True
+                break
+            else:
+                current_area = self.check_current_area()
+                logger.info(f"Current area is {current_area}, switch to next area")
+                if current_area == AreaType.DRAGON:
+                    self.change_area(AreaType.PEACOCK)
+                    continue
+                elif current_area == AreaType.PEACOCK:
+                    self.change_area(AreaType.FOX)
+                    continue
+                elif current_area == AreaType.FOX:  
+                    self.change_area(AreaType.LEOPARD)
+                    continue
+                else:
+                    logger.warning("All enemy types have been defeated, but not enough emeny to fight, exit")
+                    break
+        
+
+        # 保持好习惯,一个任务结束了就返回到庭院,方便下一任务的开始
+        self.goto_main()
+
+        # 设置下次运行时间
+        if success:
+            self.set_next_run(task='AbyssShadows', finish=True, server=True, success=True)
+        else:
+            self.set_next_run(task='AbyssShadows', finish=True, server=True, success=False)
+        raise TaskEnd
+
+    def check_current_area(self) -> AreaType:
+        ''' 获取当前区域
+        :return AreaType
+        '''
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_PEACOCK_AREA):
+                return AreaType.PEACOCK
+            elif self.appear(self.I_DRAGON_AREA):
+                return AreaType.DRAGON
+            elif self.appear(self.I_FOX_AREA):
+                return AreaType.FOX
+            elif self.appear(self.I_LEOPARD_AREA):
+                return AreaType.LEOPARD
+            else:
+                continue
+
+    def change_area(self, area_name: AreaType) -> bool:
+        ''' 切换到下个区域
+        :return 
+        '''
+        while 1:
+            self.screenshot()
+            # 判断当前区域是否正确
+            current_area = self.check_current_area()
+            if current_area == area_name:
+                break
+            # 切换区域界面
+            if self.appear(self.I_ABYSS_DRAGON):
+                self.select_boss(area_name)
+                logger.info(f"Switch to {area_name.name}")
+                continue      
+            # 点击战报按钮
+            if self.appear_then_click(self.I_CHANGE_AREA,interval=4):
+                logger.info(f"Click {self.I_CHANGE_AREA.name}")
+                continue
+                  
+        return True
+    
+    def goto_main(self):
+        ''' 保持好习惯,一个任务结束了就返回庭院,方便下一任务的开始或者是出错重启
+        '''
+        self.ui_get_current_page()
+        logger.info("Exiting abyss_shadows")
+        self.ui_goto(page_main)
+
+       
+
+    def goto_abyss_shadows(self) -> bool:
+        ''' 进入狭间
+        :return bool
+        '''
+        self.ui_get_current_page()
+        logger.info("Entering abyss_shadows")
+        self.ui_goto(page_guild)
+        
+        while 1:
+            self.screenshot()
+            # 进入神社
+            if self.appear_then_click(self.I_RYOU_SHENSHE,interval=1):
+                logger.info("Enter Shenshe")
+                continue
+            # 查找狭间
+            if not self.appear(self.I_ABYSS_SHADOWS, threshold=0.8):
+                self.swipe(self.S_TO_ABBSY_SHADOWS,interval=3)
+                continue
+            # 进入狭间
+            if self.appear_then_click(self.I_ABYSS_SHADOWS):
+                logger.info("Enter abyss_shadows")
+                break
+        return True
+ 
+    def select_boss(self, area_name: AreaType) -> bool:
+        ''' 选择暗域类型
+        :return 
+        '''
+        click_times = 0
+        while 1:
+            self.screenshot()
+            # 区域图片与入口图片不一致,使用点击进去
+            
+            if self.appear(self.I_ABYSS_DRAGON):
+                match area_name:
+                    case AreaType.DRAGON: is_click = self.click(self.C_ABYSS_DRAGON,interval=2)
+                    case AreaType.PEACOCK: is_click = self.click(self.C_ABYSS_PEACOCK,interval=2)
+                    case AreaType.FOX: is_click = self.click(self.C_ABYSS_FOX,interval=2)
+                    case AreaType.LEOPARD: is_click = self.click(self.C_ABYSS_LEOPARD,interval=2)
+                if is_click:
+                    click_times += 1
+                    logger.info(f"Click {area_name.name} {click_times} times")
+                if click_times >= 3:
+                    logger.info(f"select boss: {area_name.name} failed")
+                    return False
+                continue
+            if self.appear(self.I_ABYSS_NAVIGATION):
+                break
+        return True
+
+    def find_enemy(self, enemy_type: EmemyType) -> bool:
+        ''' 寻找敌人,并开始寻路进入战斗
+        :return 是否找到敌人,若目标已死亡则返回False,否则返回True
+        True 找到敌人,并已经战斗完成
+        '''
+        print(f"Find enemy: {enemy_type}")
+        while 1:
+            self.screenshot()
+            # 点击战报按钮
+            if self.appear(self.I_ABYSS_MAP):
+                break
+            if self.appear_then_click(self.I_ABYSS_NAVIGATION,interval=1):
+                continue
+ 
+        match enemy_type:
+            case EmemyType.BOSS: success = self.run_boss_fight()
+            case EmemyType.GENERAL: success = self.run_general_fight()
+            case EmemyType.ELITE: success = self.run_elite_fight()
+            
+        return success    
+
+    def run_boss_fight(self) -> bool:
+        ''' 首领战斗
+        只要进入了战斗都返回成功
+        :return 
+        '''
+        if self.boss_fight_count >= 2:
+            logger.info(f"boss fight count {self.boss_fight_count} times, skip")
+            return True
+        success = True
+        logger.info(f"Run boss fight") 
+        if self.click_emeny_area(CilckArea.BOSS):
+            logger.info(f"Click {CilckArea.BOSS.name}")
+            self.run_general_battle_back()
+            self.boss_fight_count += 1
+            logger.info(f'Fight, boss_fight_count {self.boss_fight_count} times')
+        else:
+            success = False
+        return success
+
+    def run_general_fight(self) -> bool:
+        ''' 副将战斗
+        :return 
+        '''
+        general_list = [CilckArea.GENERAL_1, CilckArea.GENERAL_2]
+        logger.info(f"Run general fight") 
+        for general in general_list:
+            # 副将战斗次数达到4个时,退出循环
+            if self.general_fight_count >= 4:
+                logger.info(f"general fight count {self.general_fight_count} times, skip")
+                break
+            if self.click_emeny_area(general):
+                logger.info(f"Click {general.name}")
+                self.general_fight_count += 1
+                self.run_general_battle_back()
+                logger.info(f'Fight, general_fight_count {self.general_fight_count} times')
+        return True
+
+
+    def run_elite_fight(self) -> bool:
+        ''' 精英战斗
+        :return 
+        '''
+        elite_list = [CilckArea.ELITE_1, CilckArea.ELITE_2, CilckArea.ELITE_3]
+        logger.info(f"Run elite fight")  
+        for elite in elite_list:
+            # 精英战斗次数达到6个时,退出循环
+            if self.elite_fight_count >= 6:
+                logger.info(f"Elite fight count {self.elite_fight_count} times, skip")
+                break
+            if self.click_emeny_area(elite):
+                logger.info(f"Click {elite.name}")
+                self.elite_fight_count += 1
+                self.run_general_battle_back()
+                logger.info(f'Fight, elite_fight_count {self.elite_fight_count} times')
+        return True
+
+    def click_emeny_area(self, click_area: CilckArea) -> bool:
+        suceess = True
+        ''' 点击敌人区域
+        
+        :return 
+        '''
+        logger.info(f"Click emeny area: {click_area.name}")
+        # 点击战报
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_ABYSS_NAVIGATION, interval=1.5):
+                logger.info(f"Click {self.I_ABYSS_NAVIGATION.name}")
+                continue
+            if self.appear(self.I_ABYSS_MAP):
+                logger.info(f"Find abyss map, exit")
+                break
+        click_times = 0
+        # 点击攻打区域
+        while 1:
+            self.screenshot()
+            
+            # 如果点3次还没进去就表示目标已死亡,跳过
+            if click_times >= 3:
+                logger.warning(f"Failed to click {click_area}")
+                return 
+            # 出现前往按钮就退出
+            if self.appear(self.I_ABYSS_GOTO_ENEMY):
+                break
+            if self.click(click_area,interval=1.5):
+                click_times += 1
+                continue
+            if self.appear_then_click(self.I_ENSURE_BUTTON,interval=1):
+                continue
+            # TODO 有时出现bug,点了前往之后不动,需要再点一次,带解决
+
+        
+        # 点击前往按钮
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_ABYSS_GOTO_ENEMY,interval=1):
+                # 点击敌人后,如果是不同区域会确认框,点击确认                
+                if self.appear_then_click(self.I_ENSURE_BUTTON, interval=1):
+                    logger.info(f"Click {self.I_ENSURE_BUTTON.name}")
+                # 跑动画比较花时间
+                sleep(3)
+                continue
+            if self.appear(self.I_ABYSS_FIRE):
+                break
+        logger.info(f"Click {self.I_ABYSS_GOTO_ENEMY.name}")
+        
+        # 点击战斗按钮
+        self.wait_until_appear(self.I_ABYSS_FIRE)
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_ABYSS_FIRE,interval=1):
+                  
+                logger.info(f"Click {self.I_ABYSS_FIRE.name}")        
+                # 挑战敌人后,如果是奖励次数上限,会出现确认框   
+                if self.appear_then_click(self.I_ENSURE_BUTTON, interval=1):
+                    logger.info(f"Click {self.I_ENSURE_BUTTON.name}")
+                continue
+            if self.appear(self.I_PREPARE_HIGHLIGHT):
+                break
+            
+        return suceess
+
+    def run_general_battle_back(self) -> bool:
+        """
+        重写父类方法,因为狭间暗域的准备和战斗流程不一样
+        进入挑战然后直接返回
+        :param config:
+        :return:
+        """
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=1.5):
+                continue
+            if not self.appear(self.I_PRESET):
+                break
+        logger.info(f"Click {self.I_PREPARE_HIGHLIGHT.name}")
+
+        # 点击返回
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_EXIT, interval=1.5):
+                continue
+            if self.appear(self.I_EXIT_ENSURE):
+                break
+        logger.info(f"Click {self.I_EXIT.name}")
+
+        # 点击返回确认
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_EXIT_ENSURE, interval=1.5):
+                continue
+            if self.appear_then_click(self.I_WIN, interval=1.5):
+                continue
+            if self.appear(self.I_ABYSS_NAVIGATION):
+                break
+        logger.info(f"Click {self.I_EXIT_ENSURE.name}")
+
+        return True
+
+
+
+if __name__ == "__main__":
+    from module.config.config import Config
+    from module.device.device import Device
+
+    config = Config('zhu')
+    device = Device(config)
+    t = ScriptTask(config, device)
+    t.run()