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

Merge pull request #437 from runhey/dev

Dev
huangrunheng 2 лет назад
Родитель
Сommit
9993c763bb
63 измененных файлов с 892 добавлено и 123 удалено
  1. 3 0
      .gitignore
  2. 40 1
      config/template.json
  3. 3 3
      dev_tools/assets_test.py
  4. 1 1
      module/atom/image.py
  5. 1 3
      module/config/config_manual.py
  6. 8 2
      module/config/config_menu.py
  7. 5 6
      module/config/config_model.py
  8. 5 1
      module/ocr/sub_ocr.py
  9. BIN
      tasks/ActivityShikigami/as/as_ap.png
  10. BIN
      tasks/ActivityShikigami/as/as_ap_activity.png
  11. BIN
      tasks/ActivityShikigami/as/as_battle.png
  12. BIN
      tasks/ActivityShikigami/as/as_fire.png
  13. BIN
      tasks/ActivityShikigami/as/as_shi.png
  14. BIN
      tasks/ActivityShikigami/as/as_switch.png
  15. 7 7
      tasks/ActivityShikigami/as/image.json
  16. 2 2
      tasks/ActivityShikigami/as/ocr.json
  17. 6 6
      tasks/ActivityShikigami/assets.py
  18. 2 0
      tasks/ActivityShikigami/config.py
  19. 48 35
      tasks/ActivityShikigami/script_task.py
  20. 9 9
      tasks/Component/GeneralInvite/general_invite.py
  21. 24 3
      tasks/DemonEncounter/config.py
  22. 31 2
      tasks/DemonEncounter/script_task.py
  23. 22 0
      tasks/Exploration/base.py
  24. 9 19
      tasks/Exploration/solo.py
  25. 2 2
      tasks/GameUi/assets.py
  26. 3 3
      tasks/GameUi/page/page_img.json
  27. BIN
      tasks/HeroTest/as/as_back.png
  28. BIN
      tasks/HeroTest/as/as_battle.png
  29. BIN
      tasks/HeroTest/as/as_bcmj.png
  30. BIN
      tasks/HeroTest/as/as_bcmj__defalut_attribute.png
  31. BIN
      tasks/HeroTest/as/as_bcmj_battle.png
  32. BIN
      tasks/HeroTest/as/as_bcmj_bless.png
  33. BIN
      tasks/HeroTest/as/as_bcmj_lock.png
  34. BIN
      tasks/HeroTest/as/as_bcmj_property_add_critical.png
  35. BIN
      tasks/HeroTest/as/as_bcmj_reset_close.png
  36. BIN
      tasks/HeroTest/as/as_bcmj_reset_confirm.png
  37. BIN
      tasks/HeroTest/as/as_bcmj_skill_add1.png
  38. BIN
      tasks/HeroTest/as/as_bcmj_skill_add2.png
  39. BIN
      tasks/HeroTest/as/as_bcmj_skill_add_confirm.png
  40. BIN
      tasks/HeroTest/as/as_bcmj_unlock.png
  41. BIN
      tasks/HeroTest/as/as_bcmj_win.png
  42. BIN
      tasks/HeroTest/as/as_gbb.png
  43. BIN
      tasks/HeroTest/as/as_gbb_back.png
  44. BIN
      tasks/HeroTest/as/as_gbb_back2.png
  45. BIN
      tasks/HeroTest/as/as_lock.png
  46. BIN
      tasks/HeroTest/as/as_one.png
  47. BIN
      tasks/HeroTest/as/as_two.png
  48. BIN
      tasks/HeroTest/as/as_unlock.png
  49. 191 0
      tasks/HeroTest/as/image.json
  50. 29 0
      tasks/HeroTest/as/ocr.json
  51. 66 0
      tasks/HeroTest/assets.py
  52. 39 0
      tasks/HeroTest/config.py
  53. 310 0
      tasks/HeroTest/script_task.py
  54. 2 2
      tasks/KekkaiActivation/script_task.py
  55. 1 1
      tasks/KekkaiUtilize/assets.py
  56. 1 1
      tasks/KekkaiUtilize/realm/image.json
  57. 8 4
      tasks/KekkaiUtilize/script_task.py
  58. 3 3
      tasks/WeeklyTrifles/assets.py
  59. BIN
      tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_enter.png
  60. 2 2
      tasks/WeeklyTrifles/broken_amulet/image.json
  61. 4 4
      tasks/WeeklyTrifles/broken_amulet/ocr.json
  62. 2 1
      tasks/WeeklyTrifles/script_task.py
  63. 3 0
      tasks/base_task.py

+ 3 - 0
.gitignore

@@ -38,6 +38,9 @@ hya
 deploy/launcher/oas-backend.bat
 deploy/launcher/oas-server.bat
 oas-backend.bat
+.eslintignore
+.eslintrc.js
+.prettierrc.js
 
 
 

+ 40 - 1
config/template.json

@@ -245,7 +245,19 @@
       "priority": 2,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "demon_soul_config": {
+      "enable": false,
+      "demon_kiryou_utahime": "-1,-1",
+      "demon_kiryou_utahime_supplementary": "-1,-1",
+      "demon_shinkirou": "-1,-1",
+      "demon_tsuchigumo": "-1,-1",
+      "demon_gashadokuro": "-1,-1",
+      "demon_namazu": "-1,-1",
+      "demon_oboroguruma": "-1,-1",
+      "demon_nightly_aramitama": "-1,-1"
     }
   },
   "daily_trifles": {
@@ -920,6 +932,33 @@
       "enable_switch_by_name": false,
       "group_name": "",
       "team_name": ""
+    },
+    "hero_test": {
+      "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": "19:00:00",
+        "float_time": "00:00:00"
+      },
+      "herotest_config": {
+        "layer": "鬼兵演武",
+        "limit_time": "00:30:00",
+        "limit_count": 30,
+        "exp_50_buff_enable_help": false,
+        "exp_100_buff_enable_help": false
+      },
+      "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
+      }
     }
   } 
 }

+ 3 - 3
dev_tools/assets_test.py

@@ -34,10 +34,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = r"C:\Users\萌萌哒\Desktop\2024-08-15_23-01-04-220349.png"
+IMAGE_FILE = r"C:\Users\Ryland\Desktop\363385164-41fa341c-3efc-43f8-91b5-0cdd065ed8cf.png"
 if __name__ == '__main__':
-    from tasks.GlobalGame.assets import GlobalGameAssets
-    targe = GlobalGameAssets.I_G_ACCEPT
+    from tasks.KekkaiUtilize.assets import KekkaiUtilizeAssets
+    targe = KekkaiUtilizeAssets.I_SHI_CARD
     print(detect_image(IMAGE_FILE, targe))
 
     # ocr demo

+ 1 - 1
module/atom/image.py

@@ -291,7 +291,7 @@ class RuleImage:
         """
         image = self.corp(image)
         average_color = cv2.mean(image)
-        logger.info(f'{self.name} average_color: {average_color}')
+        # logger.info(f'{self.name} average_color: {average_color}')
         for i in range(3):
             if abs(average_color[i] - color[i]) > bias:
                 return False

+ 1 - 3
module/config/config_manual.py

@@ -14,7 +14,7 @@ class ConfigManual:
         > Dokan > Hunt 
         > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea > SixRealms
         > ActivityShikigami > WantedQuests
-        > BondlingFairyland > EvoZone > GoryouRealm
+        > BondlingFairyland > EvoZone > GoryouRealm > HeroTest
         > TrueOrochi > RichMan
         > CollectiveMissions
         > Pets > TalismanPass > SoulsTidy > Delegation > Hyakkiyakou
@@ -36,5 +36,3 @@ class ConfigManual:
     MINITOUCH_FILEPATH_REMOTE = '/data/local/tmp/minitouch'
 
     HERMIT_FILEPATH_LOCAL = './bin/hermit/hermit.apk'
-
-

+ 8 - 2
module/config/config_menu.py

@@ -25,8 +25,14 @@ class ConfigMenu:
                                    'TalismanPass', 'DemonEncounter', 'Pets', 'SoulsTidy', 'Delegation', 'WantedQuests',
                                    'Tako']
         # 很肝的任务
-        self.menu["Liver Emperor Exclusive"] = ['BondlingFairyland', 'EvoZone', 'GoryouRealm', 'Exploration',
-                                                'Hyakkiyakou']
+        self.menu["Liver Emperor Exclusive"] = [
+            "BondlingFairyland",
+            "EvoZone",
+            "GoryouRealm",
+            "Exploration",
+            "Hyakkiyakou",
+            "HeroTest",
+        ]
         # 阴阳寮
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'Dokan', 'CollectiveMissions',
                               'Hunt']

+ 5 - 6
module/config/config_model.py

@@ -59,6 +59,8 @@ from tasks.BondlingFairyland.config import BondlingFairyland
 from tasks.EvoZone.config import EvoZone
 from tasks.GoryouRealm.config import GoryouRealm
 from tasks.Hyakkiyakou.config import Hyakkiyakou
+from tasks.HeroTest.config import HeroTest
+
 # ----------------------------------------------------------------------------------------------------------------------
 
 # 每周任务---------------------------------------------------------------------------------------------------------------
@@ -115,6 +117,7 @@ class ConfigModel(ConfigBase):
     evo_zone: EvoZone = Field(default_factory=EvoZone)
     goryou_realm: GoryouRealm = Field(default_factory=GoryouRealm)
     hyakkiyakou: Hyakkiyakou = Field(default_factory=Hyakkiyakou)
+    hero_test: HeroTest = Field(default_factory=HeroTest)
 
     # 这些是每周任务
     true_orochi: TrueOrochi = Field(default_factory=TrueOrochi)
@@ -157,8 +160,6 @@ class ConfigModel(ConfigBase):
         logger.info("auto save config")
         self.save()
 
-
-
     @staticmethod
     def read_json(config_name: str) -> dict:
         """
@@ -282,7 +283,7 @@ class ConfigModel(ConfigBase):
         except (AttributeError, KeyError):
             return False
 
-# ----------------------------------- fastapi -----------------------------------
+    # ----------------------------------- fastapi -----------------------------------
     def script_task(self, task: str) -> dict:
         """
 
@@ -377,7 +378,7 @@ class ConfigModel(ConfigBase):
         if argument_object is None:
             logger.error(f'Set arg {task}.{group}.{argument}.{value} failed')
             return False
-        
+
         # XXX temp implementation to enable oasx control the datetime configuration globally rather than a single task
         if task == "restart" and group == "task_config" and argument == "reset_task_datetime_enable" and value == True:
             date_time = self.restart.task_config.reset_task_datetime
@@ -432,5 +433,3 @@ if __name__ == "__main__":
 
     # c.save()
     print(c.script_task('Orochi'))
-
-

+ 5 - 1
module/ocr/sub_ocr.py

@@ -97,6 +97,7 @@ class Digit(Single):
         result = super().after_process(result)
         result = result.replace('I', '1').replace('D', '0').replace('S', '5')
         result = result.replace('B', '8').replace('?', '2').replace('?', '2')
+        result = result.replace('d', '6')
         result = [char for char in result if char.isdigit()]
         result = ''.join(result)
 
@@ -124,7 +125,10 @@ class DigitCounter(Single):
     def after_process(self, result):
         result = super().after_process(result)
         result = result.replace('I', '1').replace('D', '0').replace('S', '5')
-        result = result.replace('B', '8')
+        result = result.replace('B', '8').replace('?', '2').replace('?', '2')
+        result = result.replace('d', '6')
+        result = [char for char in result if char.isdigit() or char == '/']
+        result = ''.join(result)
         return result
 
     @classmethod

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_switch.png


+ 7 - 7
tasks/ActivityShikigami/as/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "438,415,26,54",
-    "roiBack": "64,216,1110,326",
+    "roiFront": "443,169,33,34",
+    "roiBack": "64,115,1110,427",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "456,151,35,165",
-    "roiBack": "393,81,138,315",
+    "roiFront": "896,202,35,165",
+    "roiBack": "844,129,138,315",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入爬塔"
@@ -65,7 +65,7 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1122,516,29,26",
+    "roiFront": "1133,505,23,24",
     "roiBack": "1092,487,103,71",
     "method": "Template matching",
     "threshold": 0.8,
@@ -74,7 +74,7 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1128,517,21,25",
+    "roiFront": "1133,509,21,21",
     "roiBack": "1090,500,84,54",
     "method": "Template matching",
     "threshold": 0.8,
@@ -83,7 +83,7 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1211,518,23,23",
+    "roiFront": "1226,511,23,23",
     "roiBack": "1200,497,69,56",
     "method": "Template matching",
     "threshold": 0.8,

+ 2 - 2
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1160,673,87,25",
-    "roiBack": "1160,673,87,25",
+    "roiFront": "1178,679,87,25",
+    "roiBack": "1178,679,87,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 6 - 6
tasks/ActivityShikigami/assets.py

@@ -34,11 +34,11 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(438,415,26,54), roi_back=(64,216,1110,326), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(443,169,33,34), roi_back=(64,115,1110,427), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(23,27,44,44), roi_back=(23,27,44,44), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(456,151,35,165), roi_back=(393,81,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(896,202,35,165), roi_back=(844,129,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(885,310,29,145), roi_back=(860,244,87,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
@@ -48,11 +48,11 @@ class ActivityShikigamiAssets:
 	# 点击战斗 
 	I_FIRE = RuleImage(roi_front=(1134,587,84,78), roi_back=(1107,522,142,174), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1122,516,29,26), roi_back=(1092,487,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1133,505,23,24), roi_back=(1092,487,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1128,517,21,25), roi_back=(1090,500,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1133,509,21,21), roi_back=(1090,500,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1211,518,23,23), roi_back=(1200,497,69,56), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1226,511,23,23), roi_back=(1200,497,69,56), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
 	# 购买活动的体力 
 	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
 	# 增加到最大 
@@ -63,7 +63,7 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1160,673,87,25), area=(1160,673,87,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1178,679,87,25), area=(1178,679,87,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(714,24,95,30), area=(714,24,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 

+ 2 - 0
tasks/ActivityShikigami/config.py

@@ -5,6 +5,7 @@ from datetime import time, timedelta
 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_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.BaseActivity.config_activity import GeneralClimb
@@ -19,6 +20,7 @@ class ActivityShikigami(ConfigBase):
     # shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
     general_climb: GeneralClimb = Field(default_factory=GeneralClimb)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
+    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
 
 
 

+ 48 - 35
tasks/ActivityShikigami/script_task.py

@@ -7,17 +7,18 @@ from datetime import datetime, timedelta, time
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.AreaBoss.assets import AreaBossAssets
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
-from tasks.GameUi.page import page_main
+from tasks.GameUi.page import page_main, page_shikigami_records
 from tasks.GameUi.game_ui import GameUi
 
 from module.logger import logger
 from module.exception import TaskEnd
 
 
-class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
+class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
 
     def run(self) -> None:
 
@@ -28,6 +29,18 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
                                         seconds=self.limit_time.second)
         self.limit_count = config.general_climb.limit_count
 
+        if config.switch_soul_config.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(config.switch_soul_config.switch_group_team)
+        if config.switch_soul_config.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(
+                config.switch_soul_config.group_name,
+                config.switch_soul_config.team_name
+            )
+
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.home_main()
@@ -199,39 +212,39 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                     self.appear_then_click(self.I_SWITCH, interval=2)
 
-    # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-    #     # 重写
-    #     self.device.stuck_record_add('BATTLE_STATUS_S')
-    #     self.device.click_record_clear()
-    #     logger.info("Start battle process")
-    #     self.C_RANDOM_LEFT.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_RIGHT.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_TOP.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_BOTTOM.name = "BATTLE_RANDOM"
-    #     while 1:
-    #         self.screenshot()
-    #         # 如果出现了 “获得奖励”
-    #         reward_click = random.choice([self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM])
-    #         if self.appear_then_click(self.I_UI_REWARD, action=reward_click, interval=1.3):
-    #             continue
-    #         # 如果出现了 “鼓”
-    #         if self.appear(self.I_WIN):
-    #             logger.info("Win")
-    #             while 1:
-    #                 self.screenshot()
-    #                 if not self.appear(self.I_WIN):
-    #                     break
-    #                 if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
-    #                     continue
-    #             return True
-    #         # 失败 -> 正常人不会失败
-    #         if self.appear(self.I_FALSE):
-    #             logger.warning('False battle')
-    #             self.ui_click_until_disappear(self.I_FALSE)
-    #             return False
-    #         # 如果开启战斗过程随机滑动
-    #         if random_click_swipt_enable:
-    #             self.random_click_swipt()
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        # 重写
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        logger.info("Start battle process")
+        self.C_RANDOM_LEFT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_RIGHT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_TOP.name = "BATTLE_RANDOM"
+        self.C_RANDOM_BOTTOM.name = "BATTLE_RANDOM"
+        while 1:
+            self.screenshot()
+            # 如果出现了 “获得奖励”
+            reward_click = random.choice([self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM])
+            if self.appear_then_click(self.I_UI_REWARD, action=reward_click, interval=1.3):
+                continue
+            # 如果出现了 “鼓”
+            if self.appear(self.I_WIN):
+                logger.info("Win")
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_WIN):
+                        break
+                    if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
+                        continue
+                return True
+            # 失败 -> 正常人不会失败
+            if self.appear(self.I_FALSE):
+                logger.warning('False battle')
+                self.ui_click_until_disappear(self.I_FALSE)
+                return False
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
 
 
 if __name__ == '__main__':

+ 9 - 9
tasks/Component/GeneralInvite/general_invite.py

@@ -75,14 +75,6 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             if self.timer_wait.reached():
                 logger.warning('Wait timeout')
                 return False
-            if self.timer_invite and self.timer_invite.reached():
-                if is_first:
-                    logger.info('Invitation is triggered every 20s')
-                    self.timer_invite.reset()
-                else:
-                    logger.info('Wait for 30s and invite again')
-                    self.timer_invite = None
-                self.invite_friends(config)
             if self.appear(self.I_MATCHING):
                 logger.warning('Timeout, now is no room')
                 return False
@@ -95,7 +87,6 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                 self.appear_then_click(self.I_GI_EMOJI_1)
                 self.appear_then_click(self.I_GI_EMOJI_2)
 
-
             fire = False  # 是否开启挑战
             # 如果这个房间最多只容纳两个人(意思是只可以邀请一个人),且已经邀请一个人了,那就开启挑战
             if self.room_type == RoomType.NORMAL_2 and not self.appear(self.I_ADD_2):
@@ -130,6 +121,15 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                 self.click_fire()
                 return True
 
+            if self.timer_invite and self.timer_invite.reached():
+                if is_first:
+                    logger.info('Invitation is triggered every 20s')
+                    self.timer_invite.reset()
+                else:
+                    logger.info('Wait for 30s and invite again')
+                    self.timer_invite = None
+                self.invite_friends(config)
+
     def ensure_enter(self) -> bool:
         """
         确认是否进入了组队界面

+ 24 - 3
tasks/DemonEncounter/config.py

@@ -10,11 +10,32 @@ from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Utils.config_enum import ShikigamiClass
 
+
+# 不同封魔boss的御魂配置
+class DemonConfig(BaseModel):
+    enable: bool = Field(default=False)
+    # 周一
+    demon_kiryou_utahime: str = Field(default="-1,-1", description="鬼灵歌姬御魂1")
+    demon_kiryou_utahime_supplementary: str = Field(
+        default="-1,-1", description="鬼灵歌姬御魂补充"
+    )
+    # 周二
+    demon_shinkirou: str = Field(default="-1,-1", description="蜃气楼御魂")
+    # 周三 土蜘蛛
+    demon_tsuchigumo: str = Field(default="-1,-1", description="土蜘蛛御魂")
+    # 周四 荒骷髅
+    demon_gashadokuro: str = Field(default="-1,-1", description="荒骷髅御魂")
+    # 周五 地震鲇
+    demon_namazu: str = Field(default="-1,-1", description="地震鲇御魂")
+    # 周六 胧车
+    demon_oboroguruma: str = Field(default="-1,-1", description="胧车御魂")
+    # 周日 夜荒魂
+    demon_nightly_aramitama: str = Field(default="-1,-1", description="夜荒魂御魂")
+
+
 class UtilizeScheduler(Scheduler):
     priority = Field(default=2, description='priority_help')
 
 class DemonEncounter(ConfigBase):
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
-    # general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
-
-
+    demon_soul_config: DemonConfig = Field(default_factory=DemonConfig)

+ 31 - 2
tasks/DemonEncounter/script_task.py

@@ -11,8 +11,9 @@ from module.logger import logger
 from module.exception import TaskEnd
 from module.base.timer import Timer
 
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_demon_encounter
+from tasks.GameUi.page import page_demon_encounter, page_shikigami_records
 from tasks.DemonEncounter.assets import DemonEncounterAssets
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
@@ -27,13 +28,18 @@ class LanternClass(Enum):
     MYSTERY = 5  # 神秘任务
 
 
-class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
+class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 
     def run(self):
         if not self.check_time():
             logger.warning('Time is not right')
             raise TaskEnd('DemonEncounter')
         self.ui_get_current_page()
+        # 切换御魂
+        soul_config = self.config.demon_encounter.demon_soul_config
+        if soul_config.enable:
+            self.ui_goto(page_shikigami_records)
+            self.checkout_soul()
         self.ui_goto(page_demon_encounter)
         self.execute_lantern()
         self.execute_boss()
@@ -41,6 +47,28 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         raise TaskEnd('DemonEncounter')
 
+    def checkout_soul(self):
+        """
+        切换御魂
+        """
+        # 判断今天是周几
+        today = datetime.now().weekday()
+        soul_config = self.config.demon_encounter.demon_soul_config
+        if today == 0:
+            self.run_switch_soul(soul_config.demon_kiryou_utahime)
+            self.run_switch_soul(soul_config.demon_kiryou_utahime_supplementary)
+        elif today == 1:
+            self.run_switch_soul(soul_config.demon_shinkirou)
+        elif today == 2:
+            self.run_switch_soul(soul_config.demon_tsuchigumo)
+        elif today == 3:
+            self.run_switch_soul(soul_config.demon_gashadokuro)
+        elif today == 4:
+            self.run_switch_soul(soul_config.demon_namazu)
+        elif today == 5:
+            self.run_switch_soul(soul_config.demon_oboroguruma)
+        elif today == 6:
+            self.run_switch_soul(soul_config.demon_nightly_aramitama)
 
     def execute_boss(self):
         """
@@ -405,6 +433,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
                 logger.warning('Obtain battle timeout')
                 return True
 
+
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device

+ 22 - 0
tasks/Exploration/base.py

@@ -135,6 +135,10 @@ class BaseExploration(GeneralBattle, GeneralRoom, GeneralInvite, ReplaceShikigam
             # 有则跳出检测
             if self.appear(self.I_E_EXPLORATION_CLICK) or result and len(result) > 0:
                 break
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                continue
+            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                continue
             self.device.click_record_clear()
             self.swipe(self.S_SWIPE_LEVEL_UP)
             swipeCount += 1
@@ -144,11 +148,17 @@ class BaseExploration(GeneralBattle, GeneralRoom, GeneralInvite, ReplaceShikigam
         # 选中对应章节
         while 1:
             self.screenshot()
+            if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                continue
+            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                continue
             self.O_E_EXPLORATION_LEVEL_NUMBER.keyword = explorationConfig.exploration_config.exploration_level
             if self.ocr_appear_click(self.O_E_EXPLORATION_LEVEL_NUMBER):
                 self.wait_until_appear(self.I_E_EXPLORATION_CLICK, wait_time=3)
             if self.appear(self.I_E_EXPLORATION_CLICK):
                 break
+            if self.is_in_room():
+                break
 
         return True
 
@@ -330,6 +340,18 @@ class BaseExploration(GeneralBattle, GeneralRoom, GeneralInvite, ReplaceShikigam
             if self.appear_then_click(self.I_UI_BACK_BLUE, interval=1.5):
                 continue
 
+    def fire(self, button) -> bool:
+        self.ui_click_until_disappear(button, interval=3)
+        if (self.appear(self.I_E_SETTINGS_BUTTON) or
+                self.appear(self.I_E_AUTO_ROTATE_ON) or
+                self.appear(self.I_E_AUTO_ROTATE_OFF)):
+            # 如果还在探索说明,这个是显示滑动导致挑战按钮不在范围内
+            logger.warning('Fire button disappear, but still in exploration')
+            return False
+        self.run_general_battle(self._config.general_battle_config)
+        self.minions_cnt += 1
+        return True
+
 
 if __name__ == "__main__":
     from module.config.config import Config

+ 9 - 19
tasks/Exploration/solo.py

@@ -68,18 +68,14 @@ class SoloExploration(BaseExploration):
                         continue
                 # boss
                 if self.appear(self.I_BOSS_BATTLE_BUTTON):
-                    self.ui_click_until_disappear(self.I_BOSS_BATTLE_BUTTON)
-                    self.run_general_battle(self._config.general_battle_config)
-                    self.minions_cnt += 1
-                    logger.info(f'Boss battle, minions cnt {self.minions_cnt}')
+                    if self.fire(self.I_BOSS_BATTLE_BUTTON):
+                        logger.info(f'Boss battle, minions cnt {self.minions_cnt}')
                     continue
                 # 小怪
                 fight_button = self.search_up_fight()
                 if fight_button is not None:
-                    self.ui_click_until_disappear(fight_button)
-                    self.run_general_battle(self._config.general_battle_config)
-                    self.minions_cnt += 1
-                    logger.info(f'Fight, minions cnt {self.minions_cnt}')
+                    if self.fire(fight_button):
+                        logger.info(f'Fight, minions cnt {self.minions_cnt}')
                     continue
                 # 向后拉,寻找怪
                 if search_fail_cnt >= 4:
@@ -158,7 +154,7 @@ class SoloExploration(BaseExploration):
                 if self.appear(self.I_FIRE, threshold=0.8) and not self.appear(self.I_ADD_2):
                     self.ui_click_until_disappear(self.I_FIRE, interval=1)
                     continue
-                if self.run_invite(config=self._invite_config, is_first=True):
+                if self.appear(self.I_ADD_2) and self.run_invite(config=self._invite_config, is_first=True):
                     continue
                 else:
                     logger.warning('Invite failed, quit')
@@ -199,19 +195,14 @@ class SoloExploration(BaseExploration):
                         continue
                 # boss
                 if self.appear(self.I_BOSS_BATTLE_BUTTON):
-                    self.ui_click_until_disappear(self.I_BOSS_BATTLE_BUTTON, interval=4)
-                    self.run_general_battle(self._config.general_battle_config)
-                    self.minions_cnt += 1
-                    friend_leave_timer = Timer(10)
-                    logger.info(f'Boss battle, minions cnt {self.minions_cnt}')
+                    if self.fire(self.I_BOSS_BATTLE_BUTTON):
+                        logger.info(f'Boss battle, minions cnt {self.minions_cnt}')
                     continue
                 # 小怪
                 fight_button = self.search_up_fight()
                 if fight_button is not None:
-                    self.ui_click_until_disappear(fight_button, interval=3)
-                    self.run_general_battle(self._config.general_battle_config)
-                    self.minions_cnt += 1
-                    logger.info(f'Fight, minions cnt {self.minions_cnt}')
+                    if self.fire(fight_button):
+                        logger.info(f'Fight, minions cnt {self.minions_cnt}')
                     continue
                 # 向后拉,寻找怪
                 if search_fail_cnt >= 4:
@@ -451,7 +442,6 @@ class ScriptTask(SoloExploration):
             case UserStatus.MEMBER: self.run_member()
             case _: self.run_solo()
 
-
         self.post_process()
 
 

+ 2 - 2
tasks/GameUi/assets.py

@@ -53,9 +53,9 @@ class GameUiAssets:
 	# 平安奇谭 
 	I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(739,643,52,44), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
 	# 六道之门 
-	I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(838,640,60,49), roi_back=(793,632,143,66), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
+	I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(838,640,60,49), roi_back=(818,631,200,66), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
 	# 器灵 
-	I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(937,639,61,54), roi_back=(937,639,61,54), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
+	I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(937,639,56,49), roi_back=(928,633,203,64), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
 	# description 
 	I_BACK_BLUE = RuleImage(roi_front=(32,37,54,52), roi_back=(3,2,130,114), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_blue.png")
 	# description 

+ 3 - 3
tasks/GameUi/page/page_img.json

@@ -102,7 +102,7 @@
     "itemName": "exploration_goto_six_gates",
     "imageName": "page_exploration_goto_six_gates.png",
     "roiFront": "838,640,60,49",
-    "roiBack": "793,632,143,66",
+    "roiBack": "818,631,200,66",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "六道之门"
@@ -110,8 +110,8 @@
   {
     "itemName": "exploration_goto_bondling_fairyland",
     "imageName": "page_exploration_goto_bondling_fairyland.png",
-    "roiFront": "937,639,61,54",
-    "roiBack": "937,639,61,54",
+    "roiFront": "937,639,56,49",
+    "roiBack": "928,633,203,64",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "器灵"

BIN
tasks/HeroTest/as/as_back.png


BIN
tasks/HeroTest/as/as_battle.png


BIN
tasks/HeroTest/as/as_bcmj.png


BIN
tasks/HeroTest/as/as_bcmj__defalut_attribute.png


BIN
tasks/HeroTest/as/as_bcmj_battle.png


BIN
tasks/HeroTest/as/as_bcmj_bless.png


BIN
tasks/HeroTest/as/as_bcmj_lock.png


BIN
tasks/HeroTest/as/as_bcmj_property_add_critical.png


BIN
tasks/HeroTest/as/as_bcmj_reset_close.png


BIN
tasks/HeroTest/as/as_bcmj_reset_confirm.png


BIN
tasks/HeroTest/as/as_bcmj_skill_add1.png


BIN
tasks/HeroTest/as/as_bcmj_skill_add2.png


BIN
tasks/HeroTest/as/as_bcmj_skill_add_confirm.png


BIN
tasks/HeroTest/as/as_bcmj_unlock.png


BIN
tasks/HeroTest/as/as_bcmj_win.png


BIN
tasks/HeroTest/as/as_gbb.png


BIN
tasks/HeroTest/as/as_gbb_back.png


BIN
tasks/HeroTest/as/as_gbb_back2.png


BIN
tasks/HeroTest/as/as_lock.png


BIN
tasks/HeroTest/as/as_one.png


BIN
tasks/HeroTest/as/as_two.png


BIN
tasks/HeroTest/as/as_unlock.png


+ 191 - 0
tasks/HeroTest/as/image.json

@@ -0,0 +1,191 @@
+[
+  {
+    "itemName": "one",
+    "imageName": "as_one.png",
+    "roiFront": "633,106,88,105",
+    "roiBack": "633,106,88,105",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "进入活动第一步"
+  },
+  {
+    "itemName": "two",
+    "imageName": "as_two.png",
+    "roiFront": "819,685,95,26",
+    "roiBack": "819,685,95,26",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入活动第二步"
+  },
+  {
+    "itemName": "gbb",
+    "imageName": "as_gbb.png",
+    "roiFront": "95,344,37,131",
+    "roiBack": "95,344,37,131",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击鬼兵演武"
+  },
+  {
+    "itemName": "gbb_back",
+    "imageName": "as_gbb_back.png",
+    "roiFront": "11,13,63,56",
+    "roiBack": "11,13,63,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "爬塔返回按钮"
+  },
+  {
+    "itemName": "back",
+    "imageName": "as_back.png",
+    "roiFront": "20,24,75,76",
+    "roiBack": "20,24,75,76",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "鬼兵演武返回按钮"
+  },
+  {
+    "itemName": "battle",
+    "imageName": "as_battle.png",
+    "roiFront": "1129,588,99,49",
+    "roiBack": "1129,588,99,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "挑战按钮"
+  },
+  {
+    "itemName": "unlock",
+    "imageName": "as_unlock.png",
+    "roiFront": "817,648,33,31",
+    "roiBack": "817,648,33,31",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "解锁阵容"
+  },
+  {
+    "itemName": "lock",
+    "imageName": "as_lock.png",
+    "roiFront": "816,644,36,38",
+    "roiBack": "816,644,36,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "bcmj",
+    "imageName": "as_bcmj.png",
+    "roiFront": "1086,350,45,131",
+    "roiBack": "1086,350,45,131",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境"
+  },
+  {
+    "itemName": "bcmj_lock",
+    "imageName": "as_bcmj_lock.png",
+    "roiFront": "901,159.5,36,26",
+    "roiBack": "901,650,36,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境阵容锁"
+  },
+  {
+    "itemName": "bcmj_battle",
+    "imageName": "as_bcmj_battle.png",
+    "roiFront": "1131,598,92,50",
+    "roiBack": "1131,598,92,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境挑战"
+  },
+  {
+    "itemName": "bcmj_win",
+    "imageName": "as_bcmj_win.png",
+    "roiFront": "431,141,100,100",
+    "roiBack": "431,141,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境胜利"
+  },
+  {
+    "itemName": "bcmj_skill_add1",
+    "imageName": "as_bcmj_skill_add1.png",
+    "roiFront": "109,361,90,32",
+    "roiBack": "103,359,1076,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境选择八华斩"
+  },
+  {
+    "itemName": "bcmj_skill_add2",
+    "imageName": "as_bcmj_skill_add2.png",
+    "roiFront": "728,359,61,32",
+    "roiBack": "106,356,1068,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "技能选择 无畏"
+  },
+  {
+    "itemName": "bcmj_skill_add_confirm",
+    "imageName": "as_bcmj_skill_add_confirm.png",
+    "roiFront": "608,633,64,36",
+    "roiBack": "608,633,64,36",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "技能祝福确定"
+  },
+  {
+    "itemName": "bcmj_property_add_critical",
+    "imageName": "as_bcmj_property_add_critical.png",
+    "roiFront": "704,359,115,34",
+    "roiBack": "120,356,1038,39",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境的暴击伤害属性奖励"
+  },
+  {
+    "itemName": "bcmj_bless",
+    "imageName": "as_bcmj_bless.png",
+    "roiFront": "261,159,21,20",
+    "roiBack": "256,156,939,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境默认祝福"
+  },
+  {
+    "itemName": "bcmj__defalut_attribute",
+    "imageName": "as_bcmj__defalut_attribute.png",
+    "roiFront": "1168,159,21,22",
+    "roiBack": "255,155,944,31",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "默认属性"
+  },
+  {
+    "itemName": "bcmj_unlock",
+    "imageName": "as_bcmj_unlock.png",
+    "roiFront": "906,652,22,30",
+    "roiBack": "906,652,22,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境的阵容未锁"
+  },
+  {
+    "itemName": "bcmj_reset_confirm",
+    "imageName": "as_bcmj_reset_confirm.png",
+    "roiFront": "668,399,180,70",
+    "roiBack": "668,399,180,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "通过兵藏秘境确认重置按钮"
+  },
+  {
+    "itemName": "bcmj_reset_close",
+    "imageName": "as_bcmj_reset_close.png",
+    "roiFront": "429,397,186,71",
+    "roiBack": "429,397,186,71",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "通过兵藏秘境取消重置按钮"
+  }
+]

+ 29 - 0
tasks/HeroTest/as/ocr.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "remain_ap",
+    "roiFront": "1095,24,123,33",
+    "roiBack": "1095,24,123,33",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "投喂的体力"
+  },
+  {
+    "itemName": "art_war_card",
+    "roiFront": "712,21,98,36",
+    "roiBack": "712,21,98,36",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "兵藏秘境兵道帖"
+  },
+  {
+    "itemName": "art_war_card_plus",
+    "roiFront": "916,25,90,29",
+    "roiBack": "916,25,90,29",
+    "mode": "SINGLE",
+    "method": "Default",
+    "keyword": "",
+    "description": "兵道帖机密"
+  }
+]

+ 66 - 0
tasks/HeroTest/assets.py

@@ -0,0 +1,66 @@
+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 HeroTestAssets: 
+
+
+	# Image Rule Assets
+	# 进入活动第一步 
+	I_ONE = RuleImage(roi_front=(633,106,88,105), roi_back=(633,106,88,105), threshold=0.7, method="Template matching", file="./tasks/HeroTest/as/as_one.png")
+	# 进入活动第二步 
+	I_TWO = RuleImage(roi_front=(819,685,95,26), roi_back=(819,685,95,26), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_two.png")
+	# 点击鬼兵演武 
+	I_GBB = RuleImage(roi_front=(95,344,37,131), roi_back=(95,344,37,131), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_gbb.png")
+	# 爬塔返回按钮 
+	I_GBB_BACK = RuleImage(roi_front=(11,13,63,56), roi_back=(11,13,63,56), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_gbb_back.png")
+	# 鬼兵演武返回按钮 
+	I_BACK = RuleImage(roi_front=(20,24,75,76), roi_back=(20,24,75,76), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_back.png")
+	# 挑战按钮 
+	I_BATTLE = RuleImage(roi_front=(1129,588,99,49), roi_back=(1129,588,99,49), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_battle.png")
+	# 解锁阵容 
+	I_UNLOCK = RuleImage(roi_front=(817,648,33,31), roi_back=(817,648,33,31), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_unlock.png")
+	# description 
+	I_LOCK = RuleImage(roi_front=(816,644,36,38), roi_back=(816,644,36,38), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_lock.png")
+	# 兵藏秘境 
+	I_BCMJ = RuleImage(roi_front=(1086,350,45,131), roi_back=(1086,350,45,131), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj.png")
+	# 兵藏秘境阵容锁 
+	I_BCMJ_LOCK = RuleImage(roi_front=(901,159.5,36,26), roi_back=(901,650,36,38), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_lock.png")
+	# 兵藏秘境挑战 
+	I_BCMJ_BATTLE = RuleImage(roi_front=(1131,598,92,50), roi_back=(1131,598,92,50), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_battle.png")
+	# 兵藏秘境胜利 
+	I_BCMJ_WIN = RuleImage(roi_front=(431,141,100,100), roi_back=(431,141,100,100), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_win.png")
+	# 兵藏秘境选择八华斩 
+	I_BCMJ_SKILL_ADD1 = RuleImage(roi_front=(109,361,90,32), roi_back=(103,359,1076,37), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_skill_add1.png")
+	# 技能选择 无畏 
+	I_BCMJ_SKILL_ADD2 = RuleImage(roi_front=(728,359,61,32), roi_back=(106,356,1068,38), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_skill_add2.png")
+	# 技能祝福确定 
+	I_BCMJ_SKILL_ADD_CONFIRM = RuleImage(roi_front=(608,633,64,36), roi_back=(608,633,64,36), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_skill_add_confirm.png")
+	# 兵藏秘境的暴击伤害属性奖励 
+	I_BCMJ_PROPERTY_ADD_CRITICAL = RuleImage(roi_front=(704,359,115,34), roi_back=(120,356,1038,39), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_property_add_critical.png")
+	# 兵藏秘境默认祝福 
+	I_BCMJ_BLESS = RuleImage(roi_front=(261,159,21,20), roi_back=(256,156,939,27), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_bless.png")
+	# 默认属性 
+	I_BCMJ__DEFALUT_ATTRIBUTE = RuleImage(roi_front=(1168,159,21,22), roi_back=(255,155,944,31), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj__defalut_attribute.png")
+	# 兵藏秘境的阵容未锁 
+	I_BCMJ_UNLOCK = RuleImage(roi_front=(906,652,22,30), roi_back=(906,652,22,30), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_unlock.png")
+	# 通过兵藏秘境确认重置按钮 
+	I_BCMJ_RESET_CONFIRM = RuleImage(roi_front=(668,399,180,70), roi_back=(668,399,180,70), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_reset_confirm.png")
+	# 通过兵藏秘境取消重置按钮 
+	I_BCMJ_RESET_CLOSE = RuleImage(roi_front=(429,397,186,71), roi_back=(429,397,186,71), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_reset_close.png")
+
+
+	# Ocr Rule Assets
+	# 投喂的体力 
+	O_REMAIN_AP = RuleOcr(roi=(1095,24,123,33), area=(1095,24,123,33), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	# 兵藏秘境兵道帖 
+	O_ART_WAR_CARD = RuleOcr(roi=(712,21,98,36), area=(712,21,98,36), mode="DigitCounter", method="Default", keyword="", name="art_war_card")
+	# 兵道帖机密 
+	O_ART_WAR_CARD_PLUS = RuleOcr(roi=(916,25,90,29), area=(916,25,90,29), mode="SINGLE", method="Default", keyword="", name="art_war_card_plus")
+
+

+ 39 - 0
tasks/HeroTest/config.py

@@ -0,0 +1,39 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from enum import Enum  # type: ignore
+from datetime import datetime, time  # type: ignore
+from pydantic import BaseModel, Field
+
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase, Time, TimeDelta
+from tasks.Component.BaseActivity.config_activity import GeneralClimb
+
+
+class Layer(str, Enum):
+    YANWU: str = "鬼兵演武"
+    MIJING: str = "兵藏秘境"
+
+
+class HeroTestConfig(BaseModel):
+    # 副本选择
+    layer: Layer = Field(
+        default=Layer.YANWU,
+        description="选择要打的关卡,兵藏秘境默认不开经验加成。\n升级顺序八华斩->无畏 -> 暴击伤害 -> 默认祝福 -> 默认属性",
+    )
+    # 限制时间
+    limit_time: Time = Field(default=Time(minute=30), description="limit_time_help")
+    # 限制次数
+    limit_count: int = Field(default=100, description="limit_count_help")
+    # 是否开启经验加成
+    exp_50_buff_enable_help: bool = Field(default=False, description="打开经验50%加成")
+    exp_100_buff_enable_help: bool = Field(
+        default=False, description="打开经验100%加成"
+    )
+
+
+class HeroTest(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    herotest: HeroTestConfig = Field(default_factory=HeroTestConfig)
+    general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)

+ 310 - 0
tasks/HeroTest/script_task.py

@@ -0,0 +1,310 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import datetime, timedelta, time
+import random  # type: ignore
+
+from tasks.Component.BaseActivity.base_activity import BaseActivity
+from tasks.HeroTest.assets import HeroTestAssets
+from tasks.GameUi.page import page_main
+from tasks.GameUi.game_ui import GameUi
+
+from module.logger import logger
+from module.exception import TaskEnd
+
+
+class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
+
+    is_update = False
+    is_skill = False
+
+    def run(self) -> None:
+
+        config = self.config.hero_test
+        global is_update
+        global is_skill
+        if config.herotest.layer.value == "鬼兵演武":
+            is_update = True
+            is_skill = False
+        if config.herotest.layer.value == "兵藏秘境":
+            is_skill = True
+            is_update = False
+
+        self.limit_time: timedelta = config.herotest.limit_time
+        if isinstance(self.limit_time, time):
+            self.limit_time = timedelta(
+                hours=self.limit_time.hour,
+                minutes=self.limit_time.minute,
+                seconds=self.limit_time.second,
+            )
+        self.limit_count = config.herotest.limit_count
+
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+        self.home_main()
+        # 设定是否锁定阵容
+        if is_update:
+            if config.general_battle.lock_team_enable:
+                logger.info("Lock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_UNLOCK, interval=1):
+                        continue
+                    if self.appear(self.I_LOCK):
+                        break
+            else:
+                logger.info("Unlock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_LOCK, interval=1):
+                        continue
+                    if self.appear(self.I_UNLOCK):
+                        break
+        elif is_skill:
+            if config.general_battle.lock_team_enable:
+                logger.info("Lock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_BCMJ_UNLOCK, interval=1):
+                        continue
+                    if self.appear(self.I_BCMJ_LOCK):
+                        break
+            else:
+                logger.info("Unlock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_BCMJ_LOCK, interval=1):
+                        continue
+                    if self.appear(self.I_BCMJ_UNLOCK):
+                        break
+
+        while 1:
+            # 1
+            if (
+                self.limit_time is not None
+                and self.limit_time + self.start_time < datetime.now()
+            ):
+                logger.info("Time out")
+                break
+            if self.current_count >= self.limit_count:
+                logger.info("Count out")
+                break
+            # 2
+            if is_update:
+                self.wait_until_appear(self.I_BATTLE)
+            if is_skill:
+                self.wait_until_appear(self.I_BCMJ_BATTLE)
+
+            # 如果是兵藏秘境 看看是否有兵道帖
+            if is_skill:
+                if not self.check_art_war_card():
+                    logger.info("Art war card is enough")
+                    break
+            # 点击战斗
+            logger.info("Click battle")
+            while 1:
+                self.screenshot()
+                if is_update:
+                    if self.appear_then_click(self.I_BATTLE, interval=2):
+                        self.device.stuck_record_clear()
+                        continue
+                    if not self.appear(self.I_BATTLE):
+                        break
+                elif is_skill:
+                    if self.appear_then_click(self.I_BCMJ_RESET_CONFIRM, interval=1):
+                        continue
+                    if self.appear_then_click(self.I_BCMJ_BATTLE, interval=2):
+                        self.device.stuck_record_clear()
+                        continue
+                    if not self.appear(self.I_BCMJ_BATTLE):
+                        break
+
+            if self.run_general_battle(config=config.general_battle):
+                logger.info("General battle success")
+
+        self.main_home()
+        self.set_next_run(task="HeroTest", success=True)
+        raise TaskEnd
+
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        self.device.stuck_record_add("BATTLE_STATUS_S")
+        self.device.click_record_clear()
+        logger.info("Start battle process")
+        win: bool = False
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_WIN, threshold=0.8) or self.appear(self.I_DE_WIN):
+                logger.info("Battle result is win")
+                if self.appear(self.I_DE_WIN):
+                    self.ui_click_until_disappear(self.I_DE_WIN)
+                win = True
+                break
+
+            # 如果出现失败 就点击,返回False
+            if self.appear(self.I_FALSE, threshold=0.8):
+                logger.info("Battle result is false")
+                win = False
+                break
+
+            # 如果领奖励
+            if self.appear(self.I_REWARD, threshold=0.6):
+                win = True
+                break
+
+            # 如果领奖励出现金币
+            if self.appear(self.I_REWARD_GOLD, threshold=0.8):
+                win = True
+                break
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
+
+        # 再次确认战斗结果
+        logger.info("Reconfirm the results of the battle")
+        while 1:
+            self.screenshot()
+            if win:
+                # 点击赢了
+                action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
+                if self.appear_then_click(
+                    self.I_WIN, action=action_click, interval=0.5
+                ):
+                    continue
+                if not self.appear(self.I_WIN):
+                    break
+            else:
+                # 如果失败且 点击失败后
+                if self.appear_then_click(self.I_FALSE, threshold=0.6):
+                    continue
+                if not self.appear(self.I_FALSE, threshold=0.6):
+                    return False
+        # 最后保证能点击 获得奖励
+        if not is_skill and not self.wait_until_appear(self.I_REWARD, wait_time=2):
+            # 有些的战斗没有下面的奖励,所以直接返回
+            logger.info("There is no reward, Exit battle")
+            return win
+        else:
+            if self.wait_until_appear(self.I_BCMJ_SKILL_ADD_CONFIRM, wait_time=2):
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_BCMJ_SKILL_ADD1, interval=1):
+                        break
+                    if self.appear_then_click(self.I_BCMJ_SKILL_ADD2, interval=1):
+                        break
+                    if self.appear_then_click(
+                        self.I_BCMJ_PROPERTY_ADD_CRITICAL, interval=1
+                    ):
+                        break
+                    if self.appear_then_click(self.I_BCMJ_BLESS, interval=1):
+                        break
+                    if self.appear_then_click(
+                        self.I_BCMJ__DEFALUT_ATTRIBUTE, interval=1
+                    ):
+                        break
+                if self.appear_then_click(self.I_BCMJ_SKILL_ADD_CONFIRM, interval=1):
+                    return win
+
+        logger.info("Get reward")
+        while 1:
+            self.screenshot()
+            # 如果出现领奖励
+            action_click = random.choice(
+                [self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3]
+            )
+            if self.appear_then_click(
+                self.I_REWARD, action=action_click, interval=1.5
+            ) or self.appear_then_click(
+                self.I_REWARD_GOLD, action=action_click, interval=1.5
+            ):
+                continue
+            if not self.appear(self.I_REWARD) and not self.appear(self.I_REWARD_GOLD):
+                break
+
+        return win
+
+    def check_art_war_card(self):
+        self.screenshot()
+        cu = self.O_ART_WAR_CARD.ocr(image=self.device.image)
+        if cu[0] >= 1:
+            logger.info("Art war card is enough")
+            return True
+        cu = self.O_ART_WAR_CARD_PLUS.ocr(image=self.device.image)
+        # 转换为int
+        if cu != "":
+            cu = int(cu)
+        else:
+            cu = 0
+        if cu >= 1:
+            logger.info("Art war card is not enough, but plus card is enough")
+            return True
+        return False
+
+    def home_main(self) -> bool:
+        """
+        从庭院到活动的爬塔界面
+        :return:
+        """
+        logger.hr("Enter HeroTest", 2)
+        global is_update
+        global is_skill
+        # 启动经验加成
+        if is_update:
+            self.open_buff()
+            self.exp_100(True)
+            self.exp_50(True)
+            self.close_buff()
+        while 1:
+            self.screenshot()
+            if is_update:
+                if self.appear(self.I_BATTLE):
+                    break
+            if is_skill:
+                if self.appear(self.I_BCMJ_BATTLE):
+                    break
+            if self.appear_then_click(self.I_ONE, interval=1):
+                continue
+            if self.appear_then_click(self.I_TWO, interval=1):
+                continue
+            if is_update:
+                if self.appear_then_click(self.I_GBB, interval=1):
+                    continue
+            if is_skill:
+                if self.appear_then_click(self.I_BCMJ, interval=1):
+                    continue
+
+    def main_home(self) -> bool:
+        """
+        从活动的爬塔界面到庭院
+        :return:
+        """
+        logger.hr("Exit HeroTest", 2)
+        global is_update
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_ONE):
+                if is_update:
+                    # 关闭经验加成
+                    self.open_buff()
+                    self.exp_100(False)
+                    self.exp_50(False)
+                    self.close_buff()
+                break
+            if self.appear_then_click(self.I_UI_BACK_RED, interval=2):
+                continue
+            if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=2):
+                continue
+            if self.appear_then_click(self.I_BACK, interval=2):
+                continue
+            if self.appear_then_click(self.I_GBB_BACK, interval=2):
+                continue
+
+
+if __name__ == "__main__":
+    from module.config.config import Config
+    from module.device.device import Device
+
+    c = Config("oas1")
+    d = Device(c)
+    t = ScriptTask(c, d)
+
+    t.run()

+ 2 - 2
tasks/KekkaiActivation/script_task.py

@@ -317,8 +317,8 @@ class ScriptTask(KU, KekkaiActivationAssets):
         if last_best is not None:
             last_index = self.order_cards.index(last_best)
             current_index = self.order_cards.index(current_card)
-            if current_index > last_index:
-                # 不比上一张卡好就退出不执行操作
+            if current_index >= last_index:
+                # 不比上一张卡好就退出不执行操作,相同星级卡亦跳过
                 logger.info('Current card is not better than last best card')
                 return last_best
 

+ 1 - 1
tasks/KekkaiUtilize/assets.py

@@ -31,7 +31,7 @@ class KekkaiUtilizeAssets:
 	# 育成 
 	I_SHI_GROWN = RuleImage(roi_front=(595,291,35,38), roi_back=(530,254,181,198), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_grown.png")
 	# 结界卡 
-	I_SHI_CARD = RuleImage(roi_front=(886,290,38,56), roi_back=(870,276,75,86), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_card.png")
+	I_SHI_CARD = RuleImage(roi_front=(886,290,38,56), roi_back=(870,276,75,86), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_card.png")
 	# description 
 	I_SHI_DEFENSE = RuleImage(roi_front=(294,298,49,56), roi_back=(215,207,208,221), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_shi_defense.png")
 	# 收取经验(没有满的图) 

+ 1 - 1
tasks/KekkaiUtilize/realm/image.json

@@ -14,7 +14,7 @@
     "roiFront": "886,290,38,56",
     "roiBack": "870,276,75,86",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "结界卡"
   },
   {

+ 8 - 4
tasks/KekkaiUtilize/script_task.py

@@ -365,8 +365,8 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             if last_best is not None:
                 last_index = self.order_cards.index(last_best)
                 current_index = self.order_cards.index(card_class)
-                if current_index > last_index:
-                    # 不比上一张卡好就退出不执行操作
+                if current_index >= last_index:
+                    # 不比上一张卡好就退出不执行操作,相同星级卡亦跳过
                     logger.info('Current card is not better than last best card')
                     return last_best
             logger.info('Current select card: %s', card_class)
@@ -418,8 +418,12 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
             return
         while 1:
             self.screenshot()
-            if self.appear(self.I_CHECK_FRIEND_REALM_1) \
-                    or self.appear(self.I_CHECK_FRIEND_REALM_3):
+            if self.appear(self.I_CHECK_FRIEND_REALM_1):
+                self.wait_until_stable(self.I_CHECK_FRIEND_REALM_1)
+                logger.info('Appear enter friend realm button')
+                break
+            if self.appear(self.I_CHECK_FRIEND_REALM_3):
+                self.wait_until_stable(self.I_CHECK_FRIEND_REALM_3)
                 logger.info('Appear enter friend realm button')
                 break
 

+ 3 - 3
tasks/WeeklyTrifles/assets.py

@@ -30,7 +30,7 @@ class WeeklyTriflesAssets:
 
 	# Image Rule Assets
 	# 进入普通召唤 
-	I_BM_ENTER = RuleImage(roi_front=(399,601,62,68), roi_back=(399,601,62,68), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_enter.png")
+	I_BM_ENTER = RuleImage(roi_front=(437,600,62,68), roi_back=(437,600,62,68), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_enter.png")
 	# 确定 
 	I_BM_CONFIRM = RuleImage(roi_front=(418,620,173,59), roi_back=(418,620,173,59), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_confirm.png")
 	# 再次召唤 
@@ -39,9 +39,9 @@ class WeeklyTriflesAssets:
 
 	# Ocr Rule Assets
 	# 左上角的数量 
-	O_BA_AMOUNT_1 = RuleOcr(roi=(360,11,86,36), area=(360,11,86,36), mode="Digit", method="Default", keyword="", name="ba_amount_1")
+	O_BA_AMOUNT_1 = RuleOcr(roi=(535,11,124,36), area=(535,11,124,36), mode="Digit", method="Default", keyword="", name="ba_amount_1")
 	# 召唤的时候的数量 
-	O_BA_AMOUNT_2 = RuleOcr(roi=(762,570,118,35), area=(762,570,118,35), mode="DigitCounter", method="Default", keyword="", name="ba_amount_2")
+	O_BA_AMOUNT_2 = RuleOcr(roi=(762,570,125,35), area=(762,570,125,35), mode="DigitCounter", method="Default", keyword="", name="ba_amount_2")
 
 
 	# Click Rule Assets

BIN
tasks/WeeklyTrifles/broken_amulet/broken_amulet_bm_enter.png


+ 2 - 2
tasks/WeeklyTrifles/broken_amulet/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "bm_enter",
     "imageName": "broken_amulet_bm_enter.png",
-    "roiFront": "399,601,62,68",
-    "roiBack": "399,601,62,68",
+    "roiFront": "437,600,62,68",
+    "roiBack": "437,600,62,68",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入普通召唤"

+ 4 - 4
tasks/WeeklyTrifles/broken_amulet/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "ba_amount_1",
-    "roiFront": "360,11,86,36",
-    "roiBack": "360,11,86,36",
+    "roiFront": "535,11,124,36",
+    "roiBack": "535,11,124,36",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "ba_amount_2",
-    "roiFront": "762,570,118,35",
-    "roiBack": "762,570,118,35",
+    "roiFront": "762,570,125,35",
+    "roiBack": "762,570,125,35",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 2 - 1
tasks/WeeklyTrifles/script_task.py

@@ -273,7 +273,8 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t._share_collect()
+    t.run()
+    # t._share_collect()
     # t.click_share(t.I_WT_SE_WECHAT)
 
 

+ 3 - 0
tasks/base_task.py

@@ -114,6 +114,9 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 continue
         # 有的时候长战斗 点击后会取消战斗状态
         self.device.detect_record = detect_record
+        # 如果接受邀请则立即执行悬赏任务
+        if click_button == self.I_G_ACCEPT:
+            self.set_next_run(task='WantedQuests', target=datetime.now())
         return True
 
     def screenshot(self):