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

feat(MetaDemon): battle individually

ryland 2 лет назад
Родитель
Сommit
10fb5e810f

+ 14 - 2
config/template.json

@@ -548,7 +548,7 @@
     "general_climb": {
     "general_climb": {
       "limit_time": "00:30:00",
       "limit_time": "00:30:00",
       "limit_count": 50,
       "limit_count": 50,
-      "ap_game_max": 999,
+      "ap_game_max": 300,
       "ap_mode": "ap_activity",
       "ap_mode": "ap_activity",
       "activity_toggle": false
       "activity_toggle": false
     },
     },
@@ -562,6 +562,17 @@
       "random_click_swipt_enable": false
       "random_click_swipt_enable": false
     }
     }
   },
   },
+  "meta_demon": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "interval": "00 03:00:00"
+    },
+    "meta_demon_config": {
+      "auto_tea": false,
+      "extreme_notify": false
+    }
+  },
   "bondling_fairyland": {
   "bondling_fairyland": {
     "scheduler": {
     "scheduler": {
       "enable": false,
       "enable": false,
@@ -860,7 +871,8 @@
       "server_update": "09:00:00"
       "server_update": "09:00:00"
     },
     },
     "missions_config": {
     "missions_config": {
-      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一"
+      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一 > 远远不够",
+      "setup_when_bondling": true
     }
     }
   },
   },
   "hunt": {
   "hunt": {

+ 1 - 1
module/config/config.py

@@ -340,7 +340,7 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         logger.info(f"Delay task `{task}` to {next_run} ({kv})")
         logger.info(f"Delay task `{task}` to {next_run} ({kv})")
 
 
         # 强制设定下一次的运行时间
         # 强制设定下一次的运行时间
-        if server and scheduler.server_update != time(hour=9):
+        if server and hasattr(scheduler, 'server_update') and scheduler.server_update != time(hour=9):
             next_run = parse_tomorrow_server(scheduler.server_update)
             next_run = parse_tomorrow_server(scheduler.server_update)
 
 
 
 

+ 4 - 0
tasks/MetaDemon/assets.py

@@ -29,6 +29,8 @@ class MetaDemonAssets:
 	I_MD_FIRE_COMMON = RuleImage(roi_front=(1065,499,100,36), roi_back=(1065,499,100,36), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_fire_common.png")
 	I_MD_FIRE_COMMON = RuleImage(roi_front=(1065,499,100,36), roi_back=(1065,499,100,36), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_fire_common.png")
 	# description 
 	# description 
 	I_MD_FIRE_POWER = RuleImage(roi_front=(1159,498,100,37), roi_back=(1159,498,100,37), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_fire_power.png")
 	I_MD_FIRE_POWER = RuleImage(roi_front=(1159,498,100,37), roi_back=(1159,498,100,37), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_fire_power.png")
+	# 失败 
+	I_MD_BATTLE_FAILURE = RuleImage(roi_front=(412,105,100,100), roi_back=(412,105,100,100), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_battle_failure.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
@@ -36,5 +38,7 @@ class MetaDemonAssets:
 	O_MD_EXHAUSTION = RuleOcr(roi=(1096,18,89,31), area=(1096,18,89,31), mode="DigitCounter", method="Default", keyword="", name="md_exhaustion")
 	O_MD_EXHAUSTION = RuleOcr(roi=(1096,18,89,31), area=(1096,18,89,31), mode="DigitCounter", method="Default", keyword="", name="md_exhaustion")
 	# Ocr-description 
 	# Ocr-description 
 	O_MD_TICKET = RuleOcr(roi=(923,18,82,30), area=(923,18,82,30), mode="DigitCounter", method="Default", keyword="", name="md_ticket")
 	O_MD_TICKET = RuleOcr(roi=(923,18,82,30), area=(923,18,82,30), mode="DigitCounter", method="Default", keyword="", name="md_ticket")
+	# Ocr-description 
+	O_MD_COUNT_INFO = RuleOcr(roi=(94,314,161,37), area=(94,314,161,37), mode="Single", method="Default", keyword="击败奖励结算中", name="md_count_info")
 
 
 
 

+ 2 - 1
tasks/MetaDemon/config.py

@@ -10,7 +10,8 @@ from enum import Enum
 class Scheduler(ConfigBase):
 class Scheduler(ConfigBase):
     enable: bool = Field(default=False, description='enable_help')
     enable: bool = Field(default=False, description='enable_help')
     next_run: DateTime = Field(default="2023-01-01 00:00:00", description='next_run_help')
     next_run: DateTime = Field(default="2023-01-01 00:00:00", description='next_run_help')
-    interval: TimeDelta = Field(default=TimeDelta(days=1), description='interval_help')
+    priority: int = Field(default=5, description='priority_help')
+    interval: TimeDelta = Field(default=TimeDelta(hours=3), description='interval_help')
 
 
 class MetaDemonConfig(ConfigBase):
 class MetaDemonConfig(ConfigBase):
     auto_tea: bool = Field(default=False, description='auto_tea_help')
     auto_tea: bool = Field(default=False, description='auto_tea_help')

+ 9 - 0
tasks/MetaDemon/md/image.json

@@ -79,5 +79,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "md_battle_failure",
+    "imageName": "md_md_battle_failure.png",
+    "roiFront": "412,105,100,100",
+    "roiBack": "412,105,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "失败"
   }
   }
 ]
 ]

BIN
tasks/MetaDemon/md/md_md_battle_failure.png


+ 9 - 0
tasks/MetaDemon/md/ocr.json

@@ -16,5 +16,14 @@
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "Ocr-description"
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "md_count_info",
+    "roiFront": "94,314,161,37",
+    "roiBack": "94,314,161,37",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "击败奖励结算中",
+    "description": "Ocr-description"
   }
   }
 ]
 ]

+ 29 - 6
tasks/MetaDemon/script_task.py

@@ -2,7 +2,8 @@
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
 from cached_property import cached_property
 from cached_property import cached_property
-from datetime import datetime, time
+from datetime import datetime
+from time import sleep
 
 
 from tasks.Component.config_base import ConfigBase, TimeDelta, DateTime, Time
 from tasks.Component.config_base import ConfigBase, TimeDelta, DateTime, Time
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
@@ -61,8 +62,30 @@ class ScriptTask(GeneralBattle, SwitchSoul, GameUi, MetaDemonAssets):
             if self.appear_then_click(self.I_MD_FIND, interval=1.5):
             if self.appear_then_click(self.I_MD_FIND, interval=1.5):
                 continue
                 continue
             #
             #
-            if self.appear(self.I_MD_FIRE):
-                self.click_fire()
+            if self.appear(self.I_MD_FIRE) and self.appear(self.I_MD_FIRE_COMMON):
+                if self.ocr_appear(self.O_MD_COUNT_INFO):
+                    # 结算中
+                    logger.info('Waiting for settlement')
+                    sleep(1)
+                    continue
+                # 是否为极
+                if self.appear(self.I_MD_EXTREME):
+                    logger.info('Find extreme Demon')
+                    if config.meta_demon_config.extreme_notify:
+                        self.config.notifier.push(title='超鬼王', content=f"发现极鬼王")
+                        self.set_next_run('MetaDemon', finish=True,
+                                          target=config.scheduler.interval + datetime.now().replace(second=0, microsecond=0))
+                        break
+                    else:
+                        pass
+                while 1:
+                    self.screenshot()
+                    if self.appear(self.I_MD_FIRE) and self.appear(self.I_MD_FIRE_COMMON):
+                        pass
+                    else:
+                        break
+                    if self.appear_then_click(self.I_MD_FIRE, interval=2):
+                        continue
                 self.run_general_battle(config=self.battle_config)
                 self.run_general_battle(config=self.battle_config)
         # exit
         # exit
         while 1:
         while 1:
@@ -113,7 +136,7 @@ class ScriptTask(GeneralBattle, SwitchSoul, GameUi, MetaDemonAssets):
                 self.screenshot()
                 self.screenshot()
                 if not self.appear(self.I_MD_FIRE):
                 if not self.appear(self.I_MD_FIRE):
                     break
                     break
-            if self.appear_then_click(self.I_MD_FIRE, interval=1.5):
+            if self.appear_then_click(self.I_MD_FIRE, interval=2):
                 continue
                 continue
 
 
     def buy_tea(self):
     def buy_tea(self):
@@ -133,9 +156,9 @@ class ScriptTask(GeneralBattle, SwitchSoul, GameUi, MetaDemonAssets):
                 self.ui_click_until_disappear(self.I_WIN)
                 self.ui_click_until_disappear(self.I_WIN)
                 return True
                 return True
 
 
-            if self.appear(self.I_FALSE):
+            if self.appear(self.I_MD_BATTLE_FAILURE):
                 logger.warning('False battle')
                 logger.warning('False battle')
-                self.ui_click_until_disappear(self.I_FALSE)
+                self.ui_click_until_disappear(self.I_MD_BATTLE_FAILURE)
                 return False
                 return False
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':