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

feat(task): add DemonEncounter but no test

runhey 3 лет назад
Родитель
Сommit
dc60de0a84
50 измененных файлов с 674 добавлено и 20 удалено
  1. 6 4
      module/config/config_menu.py
  2. 1 1
      tasks/Component/GeneralBattle/assets.py
  3. BIN
      tasks/Component/GeneralBattle/gb/gb_win.png
  4. 2 2
      tasks/Component/GeneralBattle/gb/image.json
  5. 80 1
      tasks/DemonEncounter/assets.py
  6. BIN
      tasks/DemonEncounter/boss/boss_boss_back_white.png
  7. BIN
      tasks/DemonEncounter/boss/boss_boss_confirm.png
  8. BIN
      tasks/DemonEncounter/boss/boss_boss_fire.png
  9. BIN
      tasks/DemonEncounter/boss/boss_boss_gather.png
  10. BIN
      tasks/DemonEncounter/boss/boss_boss_namazu.png
  11. BIN
      tasks/DemonEncounter/boss/boss_boss_no_select.png
  12. BIN
      tasks/DemonEncounter/boss/boss_boss_oboroguruma.png
  13. BIN
      tasks/DemonEncounter/boss/boss_boss_odokuro.png
  14. BIN
      tasks/DemonEncounter/boss/boss_boss_selected.png
  15. BIN
      tasks/DemonEncounter/boss/boss_boss_shinkiro.png
  16. BIN
      tasks/DemonEncounter/boss/boss_boss_songstress.png
  17. BIN
      tasks/DemonEncounter/boss/boss_boss_tsuchigumo.png
  18. BIN
      tasks/DemonEncounter/boss/boss_boss_win.png
  19. 119 0
      tasks/DemonEncounter/boss/image.json
  20. 1 1
      tasks/DemonEncounter/config.py
  21. 26 0
      tasks/DemonEncounter/demon/click.json
  22. BIN
      tasks/DemonEncounter/demon/demon_de_award.png
  23. BIN
      tasks/DemonEncounter/demon/demon_de_balloon.png
  24. BIN
      tasks/DemonEncounter/demon/demon_de_boss.png
  25. BIN
      tasks/DemonEncounter/demon/demon_de_boss_best.png
  26. BIN
      tasks/DemonEncounter/demon/demon_de_box.png
  27. BIN
      tasks/DemonEncounter/demon/demon_de_defeat_1.png
  28. BIN
      tasks/DemonEncounter/demon/demon_de_defeat_2.png
  29. BIN
      tasks/DemonEncounter/demon/demon_de_defeat_3.png
  30. BIN
      tasks/DemonEncounter/demon/demon_de_defeat_4.png
  31. BIN
      tasks/DemonEncounter/demon/demon_de_find.png
  32. BIN
      tasks/DemonEncounter/demon/demon_de_letter.png
  33. BIN
      tasks/DemonEncounter/demon/demon_de_location.png
  34. BIN
      tasks/DemonEncounter/demon/demon_de_red_dharma.png
  35. BIN
      tasks/DemonEncounter/demon/demon_de_shi_records.png
  36. 56 0
      tasks/DemonEncounter/demon/image.json
  37. 74 0
      tasks/DemonEncounter/demon/image_side.json
  38. 11 0
      tasks/DemonEncounter/demon/ocr.json
  39. 194 1
      tasks/DemonEncounter/script_task.py
  40. 6 2
      tasks/GlobalGame/assets.py
  41. 20 2
      tasks/GlobalGame/ui/image.json
  42. BIN
      tasks/GlobalGame/ui/ui_ui_cancel_samll.png
  43. BIN
      tasks/GlobalGame/ui/ui_ui_confirm_samll.png
  44. 12 0
      tasks/Pets/assets.py
  45. 12 0
      tasks/Pets/config.py
  46. 12 0
      tasks/SoulsTidy/assets.py
  47. 12 0
      tasks/SoulsTidy/config.py
  48. 12 0
      tasks/TalismanPass/assets.py
  49. 12 0
      tasks/TalismanPass/config.py
  50. 6 6
      tasks/Utils/config_enum.py

+ 6 - 4
module/config/config_menu.py

@@ -20,14 +20,16 @@ class ConfigMenu:
         # 刷御魂
         # 刷御魂
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         # 日常的任务
         # 日常的任务
-        self.menu["Daily Task"] = ['AreaBoss', 'GoldYoukai', 'ExperienceYoukai', 'Nian', 'RealmRaid', 'RyouToppa',
-                                   'KekkaiUtilize', 'KekkaiActivation', 'DemonEncounter', 'DailyTrifles']
-        # 活动的任务
-        self.menu["Activity Task"] = ['ActivityShikigami']
+        self.menu["Daily Task"] = ['DailyTrifles', 'AreaBoss', 'GoldYoukai', 'ExperienceYoukai', 'Nian',
+                                   'TalismanPass', 'DemonEncounter', 'Pets', 'SoulsTidy']
         # 很肝的任务
         # 很肝的任务
         self.menu["Liver Emperor Exclusive"] = ['BondlingFairyland']
         self.menu["Liver Emperor Exclusive"] = ['BondlingFairyland']
+        # 阴阳寮
+        self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa']
         # 每周任务
         # 每周任务
         self.menu["Weekly Task"] = ['TrueOrochi', 'RichMan']
         self.menu["Weekly Task"] = ['TrueOrochi', 'RichMan']
+        # 活动的任务
+        self.menu["Activity Task"] = ['ActivityShikigami']
         # 开发工具
         # 开发工具
         self.menu["Tools"] = ['Image Rule', 'Ocr Rule', 'Click Rule', 'Long Click Rule', 'Swipe Rule', 'List Rule']
         self.menu["Tools"] = ['Image Rule', 'Ocr Rule', 'Click Rule', 'Long Click Rule', 'Swipe Rule', 'List Rule']
 
 

+ 1 - 1
tasks/Component/GeneralBattle/assets.py

@@ -72,7 +72,7 @@ class GeneralBattleAssets:
 	# 准备 
 	# 准备 
 	I_PREPARE_HIGHLIGHT = RuleImage(roi_front=(1128,536,100,100), roi_back=(1128,536,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png")
 	I_PREPARE_HIGHLIGHT = RuleImage(roi_front=(1128,536,100,100), roi_back=(1128,536,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png")
 	# 战斗胜利 
 	# 战斗胜利 
-	I_WIN = RuleImage(roi_front=(425,141,100,100), roi_back=(296,41,414,216), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_win.png")
+	I_WIN = RuleImage(roi_front=(385,47,100,100), roi_back=(296,33,414,224), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_win.png")
 	# 准备但是界面还未加载这个时候是黑色的 
 	# 准备但是界面还未加载这个时候是黑色的 
 	I_PREPARE_DARK = RuleImage(roi_front=(1131,538,100,100), roi_back=(1131,538,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_dark.png")
 	I_PREPARE_DARK = RuleImage(roi_front=(1131,538,100,100), roi_back=(1131,538,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_dark.png")
 	# 失败 
 	# 失败 

BIN
tasks/Component/GeneralBattle/gb/gb_win.png


+ 2 - 2
tasks/Component/GeneralBattle/gb/image.json

@@ -29,8 +29,8 @@
   {
   {
     "itemName": "win",
     "itemName": "win",
     "imageName": "gb_win.png",
     "imageName": "gb_win.png",
-    "roiFront": "425,141,100,100",
-    "roiBack": "296,41,414,216",
+    "roiFront": "385,47,100,100",
+    "roiBack": "296,33,414,224",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "战斗胜利"
     "description": "战斗胜利"

+ 80 - 1
tasks/DemonEncounter/assets.py

@@ -8,5 +8,84 @@ from module.atom.list import RuleList
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 # Don't modify it manually.
 class DemonEncounterAssets: 
 class DemonEncounterAssets: 
-	pass
+
+
+	# Image Rule Assets
+	# 地震鲇 
+	I_BOSS_NAMAZU = RuleImage(roi_front=(589,294,100,100), roi_back=(589,294,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_namazu.png")
+	# 蜃气楼 
+	I_BOSS_SHINKIRO = RuleImage(roi_front=(587,279,100,100), roi_back=(587,279,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_shinkiro.png")
+	# 荒骷髅 
+	I_BOSS_ODOKURO = RuleImage(roi_front=(596,287,100,100), roi_back=(596,287,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_odokuro.png")
+	# 胧车 
+	I_BOSS_OBOROGURUMA = RuleImage(roi_front=(588,285,100,100), roi_back=(588,285,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_oboroguruma.png")
+	# 土蜘蛛 
+	I_BOSS_TSUCHIGUMO = RuleImage(roi_front=(603,294,100,66), roi_back=(603,294,100,66), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_tsuchigumo.png")
+	# 歌姬 
+	I_BOSS_SONGSTRESS = RuleImage(roi_front=(592,323,67,61), roi_back=(592,323,67,61), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_songstress.png")
+	# 集结挑战 
+	I_BOSS_FIRE = RuleImage(roi_front=(1062,549,100,100), roi_back=(1062,549,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_fire.png")
+	# description 
+	I_BOSS_CONFIRM = RuleImage(roi_front=(671,400,175,61), roi_back=(671,400,175,61), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_confirm.png")
+	# 已选中 
+	I_BOSS_SELECTED = RuleImage(roi_front=(543,339,37,41), roi_back=(543,339,37,41), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_selected.png")
+	# 还没选中 
+	I_BOSS_NO_SELECT = RuleImage(roi_front=(544,337,37,43), roi_back=(544,337,37,43), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_no_select.png")
+	# 集结 
+	I_BOSS_GATHER = RuleImage(roi_front=(801,589,100,100), roi_back=(801,589,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_gather.png")
+	# 战斗胜利 
+	I_BOSS_WIN = RuleImage(roi_front=(380,43,100,100), roi_back=(380,43,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_win.png")
+	# 白色退出 
+	I_BOSS_BACK_WHITE = RuleImage(roi_front=(16,12,39,40), roi_back=(16,12,39,40), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/boss/boss_boss_back_white.png")
+
+
+	# Click Rule Assets
+	# 从下开始数第一个 
+	C_DE_1 = RuleClick(roi_front=(1211,478,61,58), roi_back=(1211,478,61,58), name="de_1")
+	# 2 
+	C_DE_2 = RuleClick(roi_front=(1196,409,55,56), roi_back=(1196,409,55,56), name="de_2")
+	# 3 
+	C_DE_3 = RuleClick(roi_front=(1225,344,53,55), roi_back=(1225,344,53,55), name="de_3")
+	# 第四个 
+	C_DE_4 = RuleClick(roi_front=(1200,282,56,53), roi_back=(1200,282,56,53), name="de_4")
+
+
+	# Image Rule Assets
+	# 红色达摩 
+	I_DE_RED_DHARMA = RuleImage(roi_front=(1209,208,51,50), roi_back=(1209,208,51,50), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_red_dharma.png")
+	# 点击右下角的寻找封魔 
+	I_DE_FIND = RuleImage(roi_front=(1136,593,100,100), roi_back=(1136,593,100,100), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_find.png")
+	# 点击首领 
+	I_DE_BOSS = RuleImage(roi_front=(1001,645,45,45), roi_back=(1001,645,45,45), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_boss.png")
+	# 点击封魔极 
+	I_DE_BOSS_BEST = RuleImage(roi_front=(900,644,45,50), roi_back=(900,644,45,50), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_boss_best.png")
+	# 式神录 
+	I_DE_SHI_RECORDS = RuleImage(roi_front=(789,639,48,48), roi_back=(789,639,48,48), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_shi_records.png")
+	# 左下角小指针 
+	I_DE_LOCATION = RuleImage(roi_front=(26,653,44,47), roi_back=(26,653,44,47), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_location.png")
+
+
+	# Image Rule Assets
+	# 右侧的气球 
+	I_DE_BALLOON = RuleImage(roi_front=(1214,295,28,27), roi_back=(1198,269,81,266), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_balloon.png")
+	# 右侧的宝箱 
+	I_DE_BOX = RuleImage(roi_front=(1210,295,34,33), roi_back=(1183,278,96,277), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_box.png")
+	# 挑战某一个后的封印图片 
+	I_DE_DEFEAT_2 = RuleImage(roi_front=(1211,422,28,35), roi_back=(1211,422,28,35), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_2.png")
+	# description 
+	I_DE_DEFEAT_1 = RuleImage(roi_front=(1223,489,42,41), roi_back=(1223,489,42,41), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_1.png")
+	# description 
+	I_DE_DEFEAT_3 = RuleImage(roi_front=(1231,358,38,35), roi_back=(1231,358,38,35), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_3.png")
+	# description 
+	I_DE_DEFEAT_4 = RuleImage(roi_front=(1215,295,35,35), roi_back=(1215,295,35,35), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_4.png")
+	# 已领取四次的奖励 
+	I_DE_AWARD = RuleImage(roi_front=(1214,210,43,41), roi_back=(1214,210,43,41), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_award.png")
+	# 信 
+	I_DE_LETTER = RuleImage(roi_front=(1236,358,33,35), roi_back=(1177,261,100,294), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_letter.png")
+
+
+	# Ocr Rule Assets
+	# 计数已经开启多少的 
+	O_DE_COUNTER = RuleOcr(roi=(1204,685,48,34), area=(1204,685,48,34), mode="DigitCounter", method="Default", keyword="", name="de_counter")
+
 
 

BIN
tasks/DemonEncounter/boss/boss_boss_back_white.png


BIN
tasks/DemonEncounter/boss/boss_boss_confirm.png


BIN
tasks/DemonEncounter/boss/boss_boss_fire.png


BIN
tasks/DemonEncounter/boss/boss_boss_gather.png


BIN
tasks/DemonEncounter/boss/boss_boss_namazu.png


BIN
tasks/DemonEncounter/boss/boss_boss_no_select.png


BIN
tasks/DemonEncounter/boss/boss_boss_oboroguruma.png


BIN
tasks/DemonEncounter/boss/boss_boss_odokuro.png


BIN
tasks/DemonEncounter/boss/boss_boss_selected.png


BIN
tasks/DemonEncounter/boss/boss_boss_shinkiro.png


BIN
tasks/DemonEncounter/boss/boss_boss_songstress.png


BIN
tasks/DemonEncounter/boss/boss_boss_tsuchigumo.png


BIN
tasks/DemonEncounter/boss/boss_boss_win.png


+ 119 - 0
tasks/DemonEncounter/boss/image.json

@@ -0,0 +1,119 @@
+[
+  {
+    "itemName": "boss_namazu",
+    "imageName": "boss_boss_namazu.png",
+    "roiFront": "589,294,100,100",
+    "roiBack": "589,294,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "地震鲇"
+  },
+  {
+    "itemName": "boss_shinkiro",
+    "imageName": "boss_boss_shinkiro.png",
+    "roiFront": "587,279,100,100",
+    "roiBack": "587,279,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "蜃气楼"
+  },
+  {
+    "itemName": "boss_odokuro",
+    "imageName": "boss_boss_odokuro.png",
+    "roiFront": "596,287,100,100",
+    "roiBack": "596,287,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "荒骷髅"
+  },
+  {
+    "itemName": "boss_oboroguruma",
+    "imageName": "boss_boss_oboroguruma.png",
+    "roiFront": "588,285,100,100",
+    "roiBack": "588,285,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "胧车"
+  },
+  {
+    "itemName": "boss_tsuchigumo",
+    "imageName": "boss_boss_tsuchigumo.png",
+    "roiFront": "603,294,100,66",
+    "roiBack": "603,294,100,66",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "土蜘蛛"
+  },
+  {
+    "itemName": "boss_songstress",
+    "imageName": "boss_boss_songstress.png",
+    "roiFront": "592,323,67,61",
+    "roiBack": "592,323,67,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "歌姬"
+  },
+  {
+    "itemName": "boss_fire",
+    "imageName": "boss_boss_fire.png",
+    "roiFront": "1062,549,100,100",
+    "roiBack": "1062,549,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "集结挑战"
+  },
+  {
+    "itemName": "boss_confirm",
+    "imageName": "boss_boss_confirm.png",
+    "roiFront": "671,400,175,61",
+    "roiBack": "671,400,175,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "boss_selected",
+    "imageName": "boss_boss_selected.png",
+    "roiFront": "543,339,37,41",
+    "roiBack": "543,339,37,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已选中"
+  },
+  {
+    "itemName": "boss_no_select",
+    "imageName": "boss_boss_no_select.png",
+    "roiFront": "544,337,37,43",
+    "roiBack": "544,337,37,43",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "还没选中"
+  },
+  {
+    "itemName": "boss_gather",
+    "imageName": "boss_boss_gather.png",
+    "roiFront": "801,589,100,100",
+    "roiBack": "801,589,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "集结"
+  },
+  {
+    "itemName": "boss_win",
+    "imageName": "boss_boss_win.png",
+    "roiFront": "380,43,100,100",
+    "roiBack": "380,43,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "战斗胜利"
+  },
+  {
+    "itemName": "boss_back_white",
+    "imageName": "boss_boss_back_white.png",
+    "roiFront": "16,12,39,40",
+    "roiBack": "16,12,39,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "白色退出"
+  }
+]

+ 1 - 1
tasks/DemonEncounter/config.py

@@ -15,6 +15,6 @@ class UtilizeScheduler(Scheduler):
 
 
 class DemonEncounter(ConfigBase):
 class DemonEncounter(ConfigBase):
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
-    general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
+    # general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
 
 
 
 

+ 26 - 0
tasks/DemonEncounter/demon/click.json

@@ -0,0 +1,26 @@
+[
+  {
+    "itemName": "de_1",
+    "roiFront": "1211,478,61,58",
+    "roiBack": "1211,478,61,58",
+    "description": "从下开始数第一个"
+  },
+  {
+    "itemName": "de_2",
+    "roiFront": "1196,409,55,56",
+    "roiBack": "1196,409,55,56",
+    "description": "2"
+  },
+  {
+    "itemName": "de_3",
+    "roiFront": "1225,344,53,55",
+    "roiBack": "1225,344,53,55",
+    "description": "3"
+  },
+  {
+    "itemName": "de_4",
+    "roiFront": "1200,282,56,53",
+    "roiBack": "1200,282,56,53",
+    "description": "第四个"
+  }
+]

BIN
tasks/DemonEncounter/demon/demon_de_award.png


BIN
tasks/DemonEncounter/demon/demon_de_balloon.png


BIN
tasks/DemonEncounter/demon/demon_de_boss.png


BIN
tasks/DemonEncounter/demon/demon_de_boss_best.png


BIN
tasks/DemonEncounter/demon/demon_de_box.png


BIN
tasks/DemonEncounter/demon/demon_de_defeat_1.png


BIN
tasks/DemonEncounter/demon/demon_de_defeat_2.png


BIN
tasks/DemonEncounter/demon/demon_de_defeat_3.png


BIN
tasks/DemonEncounter/demon/demon_de_defeat_4.png


BIN
tasks/DemonEncounter/demon/demon_de_find.png


BIN
tasks/DemonEncounter/demon/demon_de_letter.png


BIN
tasks/DemonEncounter/demon/demon_de_location.png


BIN
tasks/DemonEncounter/demon/demon_de_red_dharma.png


BIN
tasks/DemonEncounter/demon/demon_de_shi_records.png


+ 56 - 0
tasks/DemonEncounter/demon/image.json

@@ -0,0 +1,56 @@
+[
+  {
+    "itemName": "de_red_dharma",
+    "imageName": "demon_de_red_dharma.png",
+    "roiFront": "1209,208,51,50",
+    "roiBack": "1209,208,51,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "红色达摩"
+  },
+  {
+    "itemName": "de_find",
+    "imageName": "demon_de_find.png",
+    "roiFront": "1136,593,100,100",
+    "roiBack": "1136,593,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击右下角的寻找封魔"
+  },
+  {
+    "itemName": "de_boss",
+    "imageName": "demon_de_boss.png",
+    "roiFront": "1001,645,45,45",
+    "roiBack": "1001,645,45,45",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击首领"
+  },
+  {
+    "itemName": "de_boss_best",
+    "imageName": "demon_de_boss_best.png",
+    "roiFront": "900,644,45,50",
+    "roiBack": "900,644,45,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击封魔极"
+  },
+  {
+    "itemName": "de_shi_records",
+    "imageName": "demon_de_shi_records.png",
+    "roiFront": "789,639,48,48",
+    "roiBack": "789,639,48,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "式神录"
+  },
+  {
+    "itemName": "de_location",
+    "imageName": "demon_de_location.png",
+    "roiFront": "26,653,44,47",
+    "roiBack": "26,653,44,47",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "左下角小指针"
+  }
+]

+ 74 - 0
tasks/DemonEncounter/demon/image_side.json

@@ -0,0 +1,74 @@
+[
+  {
+    "itemName": "de_balloon",
+    "imageName": "demon_de_balloon.png",
+    "roiFront": "1214,295,28,27",
+    "roiBack": "1198,269,81,266",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "右侧的气球"
+  },
+  {
+    "itemName": "de_box",
+    "imageName": "demon_de_box.png",
+    "roiFront": "1210,295,34,33",
+    "roiBack": "1183,278,96,277",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "右侧的宝箱"
+  },
+  {
+    "itemName": "de_defeat_2",
+    "imageName": "demon_de_defeat_2.png",
+    "roiFront": "1211,422,28,35",
+    "roiBack": "1211,422,28,35",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "挑战某一个后的封印图片"
+  },
+  {
+    "itemName": "de_defeat_1",
+    "imageName": "demon_de_defeat_1.png",
+    "roiFront": "1223,489,42,41",
+    "roiBack": "1223,489,42,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "de_defeat_3",
+    "imageName": "demon_de_defeat_3.png",
+    "roiFront": "1231,358,38,35",
+    "roiBack": "1231,358,38,35",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "de_defeat_4",
+    "imageName": "demon_de_defeat_4.png",
+    "roiFront": "1215,295,35,35",
+    "roiBack": "1215,295,35,35",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "de_award",
+    "imageName": "demon_de_award.png",
+    "roiFront": "1214,210,43,41",
+    "roiBack": "1214,210,43,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已领取四次的奖励"
+  },
+  {
+    "itemName": "de_letter",
+    "imageName": "demon_de_letter.png",
+    "roiFront": "1236,358,33,35",
+    "roiBack": "1177,261,100,294",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "信"
+  }
+]

+ 11 - 0
tasks/DemonEncounter/demon/ocr.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "de_counter",
+    "roiFront": "1204,685,48,34",
+    "roiBack": "1204,685,48,34",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "计数已经开启多少的"
+  }
+]

+ 194 - 1
tasks/DemonEncounter/script_task.py

@@ -1,17 +1,210 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+import time
 
 
+from enum import Enum
+from cached_property import cached_property
 
 
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 
 
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
+from tasks.DemonEncounter.assets import DemonEncounterAssets
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
 
+class LanternClass(Enum):
+    BATTLE = 0  # 打怪  --> 无法判断因为怪的图片不一样,用排除法
+    BOX = 1  # 开宝箱
+    MAIL = 2  # 邮件答题
+    REALM = 3  # 打结界
+    EMPTY = 4  # 空
 
 
-class ScriptTask(GameUi):
+
+class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
 
 
     def run(self):
     def run(self):
+        self.execute_lantern()
+        self.execute_boss()
+
+        self.set_next_run(task='DemonEncounter', success=True, finish=False)
+        raise TaskEnd('DemonEncounter')
+
+
+    def execute_boss(self):
+        """
+        打boss
+        :return:
+        """
+        logger.hr('Start boss battle', 1)
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_BOSS_FIRE):
+                break
+
+            if self.appear_then_click(self.I_BOSS_NAMAZU, interval=1):
+                continue
+            if self.appear_then_click(self.I_BOSS_SHINKIRO, interval=1):
+                continue
+            if self.appear_then_click(self.I_BOSS_ODOKURO, interval=1):
+                continue
+            if self.appear_then_click(self.I_BOSS_OBOROGURUMA, interval=1):
+                continue
+            if self.appear_then_click(self.I_BOSS_TSUCHIGUMO, interval=1):
+                continue
+            if self.appear_then_click(self.I_BOSS_SONGSTRESS, interval=1):
+                continue
+            if self.appear_then_click(self.I_DE_BOSS, interval=2.5):
+                continue
+        logger.info('Boss battle start')
+        # 点击集结挑战
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_BOSS_CONFIRM):
+                self.ui_click(self.I_BOSS_NO_SELECT, self.I_BOSS_SELECTED)
+                self.ui_click(self.I_BOSS_CONFIRM, self.I_BOSS_GATHER)
+                break
+            if self.appear(self.I_BOSS_GATHER):
+                break
+            if self.appear_then_click(self.I_BOSS_FIRE, interval=1):
+                continue
+        logger.info('Boss battle confirm and enter')
+        # 等待挑战
+        self.wait_until_disappear(self.I_BOSS_GATHER)
+        config = self.con
+        self.run_general_battle(config)
+
+        # 等待回到挑战boss主界面
+        self.wait_until_appear(self.I_BOSS_GATHER)
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_DE_LOCATION):
+                break
+            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                continue
+            if self.appear_then_click(self.I_BOSS_BACK_WHITE, interval=1):
+                continue
+        # 返回到封魔主界面
+
+    def execute_lantern(self):
+        """
+        点灯笼 四次
+        :return:
+        """
+        # 先点四次
+        while 1:
+            self.screenshot()
+            cu, re, total = self.O_DE_COUNTER.count(self.device.image)
+            if cu + re != total:
+                logger.warning('Lantern count error')
+                continue
+            if cu == 0 and re == 4:
+                break
+            if self.appear_then_click(self.I_DE_FIND, interval=1):
+                continue
+        # 然后领取红色达摩
+        self.ui_get_reward(self.I_DE_RED_DHARMA)
+        self.wait_until_appear(self.I_DE_AWARD)
+        # 然后到四个灯笼
+        match_click = {
+            1: self.C_DE_1,
+            2: self.C_DE_1,
+            3: self.C_DE_1,
+            4: self.C_DE_1,
+        }
+        for i in range(1, 5):
+            logger.hr(f'Check lantern {i}', 3)
+            lantern_type = self.check_lantern(i)
+            match lantern_type:
+                case LanternClass.BOX:
+                    self._box()
+                case LanternClass.MAIL:
+                    self._mail()
+                case LanternClass.REALM:
+                    self._realm()
+                case LanternClass.EMPTY:
+                    logger.warning(f'Lantern {i} is empty')
+                case LanternClass.BATTLE:
+                    self._battle()
+            time.sleep(1)
+
+    @cached_property
+    def con(self) -> GeneralBattleConfig:
+        return GeneralBattleConfig()
+
+    def check_lantern(self, index: int=1):
+        """
+        检查灯笼的类型
+        :param index: 四个灯笼,从1开始
+        :return:
+        """
+        match_roi = {
+            1: self.C_DE_1.roi_front,
+            2: self.C_DE_2.roi_front,
+            3: self.C_DE_3.roi_front,
+            4: self.C_DE_4.roi_front,
+        }
+        match_empty = {
+            1: self.I_DE_DEFEAT_1,
+            2: self.I_DE_DEFEAT_2,
+            3: self.I_DE_DEFEAT_3,
+            4: self.I_DE_DEFEAT_4,
+        }
+        self.I_DE_BOX.roi_back = match_roi[index]
+        self.I_DE_LETTER.roi_back = match_roi[index]
+        target_box = self.I_DE_BOX
+        target_letter = self.I_DE_LETTER
+        target_empty = match_empty[index]
+
+        # 开始判断
+        self.screenshot()
+        if self.appear(target_box):
+            logger.info(f'Lantern {index} is box')
+            return LanternClass.BOX
+        elif self.appear(target_letter):
+            logger.info(f'Lantern {index} is letter')
+            return LanternClass.MAIL
+        elif self.appear(target_empty):
+            logger.info(f'Lantern {index} is empty')
+            return LanternClass.EMPTY
+        else:
+            # 无法判断是否是战斗的还是结界的
+            logger.info(f'Lantern {index} is battle')
+            return LanternClass.BATTLE
+
+    def _box(self):
+        # 宝箱不领
         pass
         pass
 
 
+    def _mail(self):
+        # 答题,还没有碰到过答题的
+        pass
+
+    def _battle(self, target_click):
+        config = self.con
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_DE_LOCATION):
+                logger.info('Battle Start')
+                break
+            if self.click(target_click, interval=target_click):
+                continue
+        if self.run_general_battle(config):
+            logger.info('Battle End')
+
+    def _realm(self):
+        # 结界
+        pass
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    from memory_profiler import profile
+
+    c = Config('oas1')
+    d = Device(c)
+    t = ScriptTask(c, d)
 
 
+    t.run()

+ 6 - 2
tasks/GlobalGame/assets.py

@@ -31,9 +31,9 @@ class GlobalGameAssets:
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
-	# description 
+	# 长一点的确认 
 	I_UI_CONFIRM = RuleImage(roi_front=(667,398,179,66), roi_back=(667,398,179,66), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm.png")
 	I_UI_CONFIRM = RuleImage(roi_front=(667,398,179,66), roi_back=(667,398,179,66), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm.png")
-	# description 
+	# 长一点的取消 
 	I_UI_CANCEL = RuleImage(roi_front=(432,403,177,62), roi_back=(432,403,177,62), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_cancel.png")
 	I_UI_CANCEL = RuleImage(roi_front=(432,403,177,62), roi_back=(432,403,177,62), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_cancel.png")
 	# '获得奖励' 四个大字 
 	# '获得奖励' 四个大字 
 	I_UI_REWARD = RuleImage(roi_front=(481,185,317,42), roi_back=(464,142,350,129), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_reward.png")
 	I_UI_REWARD = RuleImage(roi_front=(481,185,317,42), roi_back=(464,142,350,129), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_reward.png")
@@ -45,5 +45,9 @@ class GlobalGameAssets:
 	I_UI_BACK_BLUE = RuleImage(roi_front=(32,37,51,45), roi_back=(2,1,133,119), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_back_blue.png")
 	I_UI_BACK_BLUE = RuleImage(roi_front=(32,37,51,45), roi_back=(2,1,133,119), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_back_blue.png")
 	# description 
 	# description 
 	I_UI_AWARD = RuleImage(roi_front=(577,499,100,100), roi_back=(530,408,199,220), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_award.png")
 	I_UI_AWARD = RuleImage(roi_front=(577,499,100,100), roi_back=(530,408,199,220), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_award.png")
+	# 短一点的确认 
+	I_UI_CONFIRM_SAMLL = RuleImage(roi_front=(677,390,130,62), roi_back=(677,390,130,62), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm_samll.png")
+	# 短一点的取消 
+	I_UI_CANCEL_SAMLL = RuleImage(roi_front=(472,389,128,62), roi_back=(472,389,128,62), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_cancel_samll.png")
 
 
 
 

+ 20 - 2
tasks/GlobalGame/ui/image.json

@@ -6,7 +6,7 @@
     "roiBack": "667,398,179,66",
     "roiBack": "667,398,179,66",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
-    "description": "description"
+    "description": "长一点的确认"
   },
   },
   {
   {
     "itemName": "ui_cancel",
     "itemName": "ui_cancel",
@@ -15,7 +15,7 @@
     "roiBack": "432,403,177,62",
     "roiBack": "432,403,177,62",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
-    "description": "description"
+    "description": "长一点的取消"
   },
   },
   {
   {
     "itemName": "ui_reward",
     "itemName": "ui_reward",
@@ -61,5 +61,23 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "ui_confirm_samll",
+    "imageName": "ui_ui_confirm_samll.png",
+    "roiFront": "677,390,130,62",
+    "roiBack": "677,390,130,62",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "短一点的确认"
+  },
+  {
+    "itemName": "ui_cancel_samll",
+    "imageName": "ui_ui_cancel_samll.png",
+    "roiFront": "472,389,128,62",
+    "roiBack": "472,389,128,62",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "短一点的取消"
   }
   }
 ]
 ]

BIN
tasks/GlobalGame/ui/ui_ui_cancel_samll.png


BIN
tasks/GlobalGame/ui/ui_ui_confirm_samll.png


+ 12 - 0
tasks/Pets/assets.py

@@ -0,0 +1,12 @@
+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 PetsAssets: 
+	pass
+

+ 12 - 0
tasks/Pets/config.py

@@ -0,0 +1,12 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import timedelta
+from pydantic import BaseModel, Field
+
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
+
+class Pets(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+

+ 12 - 0
tasks/SoulsTidy/assets.py

@@ -0,0 +1,12 @@
+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 SoulsTidyAssets: 
+	pass
+

+ 12 - 0
tasks/SoulsTidy/config.py

@@ -0,0 +1,12 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import timedelta
+from pydantic import BaseModel, Field
+
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
+
+class SoulsTidy(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+

+ 12 - 0
tasks/TalismanPass/assets.py

@@ -0,0 +1,12 @@
+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 TalismanPassAssets: 
+	pass
+

+ 12 - 0
tasks/TalismanPass/config.py

@@ -0,0 +1,12 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import timedelta
+from pydantic import BaseModel, Field
+
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
+
+class TailsmanPass(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+

+ 6 - 6
tasks/Utils/config_enum.py

@@ -14,17 +14,17 @@ class ShikigamiClass(str, Enum):
 
 
 
 
 class DemonClass(str, Enum):
 class DemonClass(str, Enum):
-    # Tsuchigumo 土蜘蛛
+    # tsuchigumo 土蜘蛛
     TSUCHIGUMO = '土蜘蛛'
     TSUCHIGUMO = '土蜘蛛'
-    # Oboroguruma 胧车
+    # oboroguruma 胧车
     OBOROGURUMA = '胧车'
     OBOROGURUMA = '胧车'
-    # Odokuro 荒骷髅
+    # odokuro 荒骷髅
     ODOKURO = '荒骷髅'
     ODOKURO = '荒骷髅'
-    # Namazu 地震鲇
+    # namazu 地震鲇
     NAMAZU = '地震鲇'
     NAMAZU = '地震鲇'
-    # Shinkiro 蜃气楼
+    # shinkiro 蜃气楼
     SHINKIRO = '蜃气楼'
     SHINKIRO = '蜃气楼'
-    # Ghostly Songstress 鬼灵歌伎
+    # ghostly songstress 鬼灵歌伎
     GHOSTLY_SONGSTRESS = '鬼灵歌伎'
     GHOSTLY_SONGSTRESS = '鬼灵歌伎'